Skip to content

G
gitlab-ce
Commit 2674b548 authored by Felipe Artur's avatar Felipe Artur
Browse files
Options

merge master into issue_3359_3

parents 8447c6b1 6f6c6f68
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 30411 additions and 5129 deletions
.gitlab-ci.yml
View file @ 2674b548
......@@ -92,9 +92,7 @@ update-knapsack:
- export KNAPSACK_REPORT_PATH=knapsack/spinach_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
- export KNAPSACK_GENERATE_REPORT=true
- cp knapsack/spinach_report.json ${KNAPSACK_REPORT_PATH}
- knapsack spinach "-r rerun"
# retry failed tests 3 times
- retry '[ ! -e tmp/spinach-rerun.txt ] || bin/spinach -r rerun $(cat tmp/spinach-rerun.txt)'
- knapsack spinach "-r rerun" || retry '[ ! -e tmp/spinach-rerun.txt ] || bundle exec spinach -r rerun $(cat tmp/spinach-rerun.txt)'
artifacts:
paths:
- knapsack/
......@@ -131,56 +129,51 @@ spinach 7 10: *spinach-knapsack
spinach 8 10: *spinach-knapsack
spinach 9 10: *spinach-knapsack
# Execute all testing suites against Ruby 2.2
.ruby-22: &ruby-22
image: "ruby:2.2"
# Execute all testing suites against Ruby 2.3
.ruby-23: &ruby-23
image: "ruby:2.3"
only:
- master
cache:
key: "ruby22"
paths:
- vendor
.rspec-knapsack-ruby22: &rspec-knapsack-ruby22
.rspec-knapsack-ruby23: &rspec-knapsack-ruby23
<<: *rspec-knapsack
<<: *ruby-22
<<: *ruby-23
.spinach-knapsack-ruby22: &spinach-knapsack-ruby22
.spinach-knapsack-ruby23: &spinach-knapsack-ruby23
<<: *spinach-knapsack
<<: *ruby-22
<<: *ruby-23
rspec 0 20 ruby22: *rspec-knapsack-ruby22
rspec 1 20 ruby22: *rspec-knapsack-ruby22
rspec 2 20 ruby22: *rspec-knapsack-ruby22
rspec 3 20 ruby22: *rspec-knapsack-ruby22
rspec 4 20 ruby22: *rspec-knapsack-ruby22
rspec 5 20 ruby22: *rspec-knapsack-ruby22
rspec 6 20 ruby22: *rspec-knapsack-ruby22
rspec 7 20 ruby22: *rspec-knapsack-ruby22
rspec 8 20 ruby22: *rspec-knapsack-ruby22
rspec 9 20 ruby22: *rspec-knapsack-ruby22
rspec 10 20 ruby22: *rspec-knapsack-ruby22
rspec 11 20 ruby22: *rspec-knapsack-ruby22
rspec 12 20 ruby22: *rspec-knapsack-ruby22
rspec 13 20 ruby22: *rspec-knapsack-ruby22
rspec 14 20 ruby22: *rspec-knapsack-ruby22
rspec 15 20 ruby22: *rspec-knapsack-ruby22
rspec 16 20 ruby22: *rspec-knapsack-ruby22
rspec 17 20 ruby22: *rspec-knapsack-ruby22
rspec 18 20 ruby22: *rspec-knapsack-ruby22
rspec 19 20 ruby22: *rspec-knapsack-ruby22
spinach 0 10 ruby22: *spinach-knapsack-ruby22
spinach 1 10 ruby22: *spinach-knapsack-ruby22
spinach 2 10 ruby22: *spinach-knapsack-ruby22
spinach 3 10 ruby22: *spinach-knapsack-ruby22
spinach 4 10 ruby22: *spinach-knapsack-ruby22
spinach 5 10 ruby22: *spinach-knapsack-ruby22
spinach 6 10 ruby22: *spinach-knapsack-ruby22
spinach 7 10 ruby22: *spinach-knapsack-ruby22
spinach 8 10 ruby22: *spinach-knapsack-ruby22
spinach 9 10 ruby22: *spinach-knapsack-ruby22
rspec 0 20 ruby23: *rspec-knapsack-ruby23
rspec 1 20 ruby23: *rspec-knapsack-ruby23
rspec 2 20 ruby23: *rspec-knapsack-ruby23
rspec 3 20 ruby23: *rspec-knapsack-ruby23
rspec 4 20 ruby23: *rspec-knapsack-ruby23
rspec 5 20 ruby23: *rspec-knapsack-ruby23
rspec 6 20 ruby23: *rspec-knapsack-ruby23
rspec 7 20 ruby23: *rspec-knapsack-ruby23
rspec 8 20 ruby23: *rspec-knapsack-ruby23
rspec 9 20 ruby23: *rspec-knapsack-ruby23
rspec 10 20 ruby23: *rspec-knapsack-ruby23
rspec 11 20 ruby23: *rspec-knapsack-ruby23
rspec 12 20 ruby23: *rspec-knapsack-ruby23
rspec 13 20 ruby23: *rspec-knapsack-ruby23
rspec 14 20 ruby23: *rspec-knapsack-ruby23
rspec 15 20 ruby23: *rspec-knapsack-ruby23
rspec 16 20 ruby23: *rspec-knapsack-ruby23
rspec 17 20 ruby23: *rspec-knapsack-ruby23
rspec 18 20 ruby23: *rspec-knapsack-ruby23
rspec 19 20 ruby23: *rspec-knapsack-ruby23
spinach 0 10 ruby23: *spinach-knapsack-ruby23
spinach 1 10 ruby23: *spinach-knapsack-ruby23
spinach 2 10 ruby23: *spinach-knapsack-ruby23
spinach 3 10 ruby23: *spinach-knapsack-ruby23
spinach 4 10 ruby23: *spinach-knapsack-ruby23
spinach 5 10 ruby23: *spinach-knapsack-ruby23
spinach 6 10 ruby23: *spinach-knapsack-ruby23
spinach 7 10 ruby23: *spinach-knapsack-ruby23
spinach 8 10 ruby23: *spinach-knapsack-ruby23
spinach 9 10 ruby23: *spinach-knapsack-ruby23
# Other generic tests
......
CHANGELOG
View file @ 2674b548
This diff is collapsed.
Gemfile
View file @ 2674b548
......@@ -48,11 +48,11 @@ gem 'attr_encrypted', '~> 3.0.0'
gem 'u2f', '~> 0.2.1'
# Browser detection
gem "browser", '~> 2.0.3'
gem "browser", '~> 2.2'
# Extracting information from a git repository
# Provide access to Gitlab::Git library
gem "gitlab_git", '~> 10.0'
gem "gitlab_git", '~> 10.2'
# LDAP Auth
# GitLab fork with several improvements to original library. For full list of changes
......@@ -210,6 +210,9 @@ gem 'mousetrap-rails', '~> 1.4.6'
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.3'
# Parse duration
gem 'chronic_duration', '~> 0.10.6'
gem "sass-rails", '~> 5.0.0'
gem "coffee-rails", '~> 4.1.0'
gem "uglifier", '~> 2.7.2'
......@@ -218,13 +221,12 @@ gem 'jquery-turbolinks', '~> 2.1.0'
gem 'addressable', '~> 2.3.8'
gem 'bootstrap-sass', '~> 3.3.0'
gem 'font-awesome-rails', '~> 4.2'
gem 'font-awesome-rails', '~> 4.6.1'
gem 'gitlab_emoji', '~> 0.3.0'
gem 'gon', '~> 6.0.1'
gem 'jquery-atwho-rails', '~> 1.3.2'
gem 'jquery-rails', '~> 4.1.0'
gem 'jquery-ui-rails', '~> 5.0.0'
gem 'raphael-rails', '~> 2.1.2'
gem 'request_store', '~> 1.3.0'
gem 'select2-rails', '~> 3.5.9'
gem 'virtus', '~> 1.0.1'
......@@ -328,7 +330,7 @@ gem "newrelic_rpm", '~> 3.14'
gem 'octokit', '~> 4.3.0'
gem "mail_room", "~> 0.7"
gem "mail_room", "~> 0.8"
gem 'email_reply_parser', '~> 0.5.8'
......
Gemfile.lock
View file @ 2674b548
......@@ -50,7 +50,7 @@ GEM
after_commit_queue (1.3.0)
activerecord (>= 3.0)
akismet (2.0.0)
allocations (1.0.4)
allocations (1.0.5)
arel (6.0.3)
asana (0.4.0)
faraday (~> 0.9)
......@@ -98,7 +98,7 @@ GEM
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
brakeman (3.3.2)
browser (2.0.3)
browser (2.2.0)
builder (3.2.2)
bullet (5.0.0)
activesupport (>= 3.0.0)
......@@ -124,6 +124,8 @@ GEM
mime-types (>= 1.16)
cause (0.1)
charlock_holmes (0.7.3)
chronic_duration (0.10.6)
numerizer (~> 0.1.1)
chunky_png (1.3.5)
cliver (0.3.2)
coderay (1.1.0)
......@@ -244,7 +246,7 @@ GEM
fog-xml (0.1.2)
fog-core
nokogiri (~> 1.5, >= 1.5.11)
font-awesome-rails (4.5.0.1)
font-awesome-rails (4.6.1.0)
railties (>= 3.2, < 5.1)
foreman (0.78.0)
thor (~> 0.19.1)
......@@ -275,7 +277,7 @@ GEM
posix-spawn (~> 0.3)
gitlab_emoji (0.3.1)
gemojione (~> 2.2, >= 2.2.1)
gitlab_git (10.1.0)
gitlab_git (10.2.0)
activesupport (~> 4.0)
charlock_holmes (~> 0.7.3)
github-linguist (~> 4.7.0)
......@@ -396,9 +398,9 @@ GEM
systemu (~> 2.6.2)
mail (2.6.4)
mime-types (>= 1.16, < 4)
mail_room (0.7.0)
mail_room (0.8.0)
method_source (0.8.2)
mime-types (2.99.1)
mime-types (2.99.2)
mimemagic (0.3.0)
mini_portile2 (2.1.0)
minitest (5.7.0)
......@@ -414,6 +416,7 @@ GEM
nokogiri (1.6.8)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
numerizer (0.1.1)
oauth (0.4.7)
oauth2 (1.0.0)
faraday (>= 0.8, < 0.10)
......@@ -553,7 +556,6 @@ GEM
rainbow (2.1.0)
raindrops (0.15.0)
rake (10.5.0)
raphael-rails (2.1.2)
rb-fsevent (0.9.6)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
......@@ -831,7 +833,7 @@ DEPENDENCIES
binding_of_caller (~> 0.7.2)
bootstrap-sass (~> 3.3.0)
brakeman (~> 3.3.0)
browser (~> 2.0.3)
browser (~> 2.2)
bullet
bundler-audit
byebug
......@@ -839,6 +841,7 @@ DEPENDENCIES
capybara-screenshot (~> 1.0.0)
carrierwave (~> 0.10.0)
charlock_holmes (~> 0.7.3)
chronic_duration (~> 0.10.6)
coffee-rails (~> 4.1.0)
connection_pool (~> 2.0)
coveralls (~> 0.8.2)
......@@ -863,7 +866,7 @@ DEPENDENCIES
fog-google (~> 0.3)
fog-local (~> 0.3)
fog-openstack (~> 0.1)
font-awesome-rails (~> 4.2)
font-awesome-rails (~> 4.6.1)
foreman
fuubar (~> 2.0.0)
gemnasium-gitlab-service (~> 0.2)
......@@ -871,7 +874,7 @@ DEPENDENCIES
github-markup (~> 1.3.1)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab_emoji (~> 0.3.0)
gitlab_git (~> 10.0)
gitlab_git (~> 10.2)
gitlab_meta (= 7.0)
gitlab_omniauth-ldap (~> 1.2.1)
gollum-lib (~> 4.1.0)
......@@ -896,7 +899,7 @@ DEPENDENCIES
license_finder
licensee (~> 8.0.0)
loofah (~> 2.0.3)
mail_room (~> 0.7)
mail_room (~> 0.8)
method_source (~> 0.8)
minitest (~> 5.7.0)
mousetrap-rails (~> 1.4.6)
......@@ -934,7 +937,6 @@ DEPENDENCIES
rails (= 4.2.6)
rails-deprecated_sanitizer (~> 1.0.3)
rainbow (~> 2.1.0)
raphael-rails (~> 2.1.2)
rblineprof
rdoc (~> 3.6)
recaptcha (~> 3.0)
......
app/assets/javascripts/LabelManager.js.coffee
View file @ 2674b548
......@@ -27,6 +27,11 @@ class @LabelManager
$btn = $(e.currentTarget)
$label = $("##{$btn.data('domId')}")
action = if $btn.parents('.js-prioritized-labels').length then 'remove' else 'add'
# Make sure tooltip will hide
$tooltip = $ "##{$btn.find('.has-tooltip:visible').attr('aria-describedby')}"
$tooltip.tooltip 'destroy'
_this.toggleLabelPriority($label, action)
toggleLabelPriority: ($label, action, persistState = true) ->
......@@ -42,10 +47,10 @@ class @LabelManager
$from = @prioritizedLabels
if $from.find('li').length is 1
$from.find('.empty-message').show()
$from.find('.empty-message').removeClass('hidden')
if not $target.find('li').length
$target.find('.empty-message').hide()
$target.find('.empty-message').addClass('hidden')
$label.detach().appendTo($target)
......@@ -54,6 +59,9 @@ class @LabelManager
if action is 'remove'
xhr = $.ajax url: url, type: 'DELETE'
# Restore empty message
$from.find('.empty-message').removeClass('hidden') unless $from.find('li').length
else
xhr = @savePrioritySort($label, action)
......
app/assets/javascripts/api.js.coffee
View file @ 2674b548
......@@ -7,6 +7,7 @@
labelsPath: "/api/:version/projects/:id/labels"
licensePath: "/api/:version/licenses/:key"
gitignorePath: "/api/:version/gitignores/:key"
gitlabCiYmlPath: "/api/:version/gitlab_ci_ymls/:key"
group: (group_id, callback) ->
url = Api.buildUrl(Api.groupPath)
......@@ -110,6 +111,12 @@
$.get url, (gitignore) ->
callback(gitignore)
gitlabCiYml: (key, callback) ->
url = Api.buildUrl(Api.gitlabCiYmlPath).replace(':key', key)
$.get url, (file) ->
callback(file)
buildUrl: (url) ->
url = gon.relative_url_root + url if gon.relative_url_root?
return url.replace(':version', gon.api_version)
app/assets/javascripts/application.js.coffee
View file @ 2674b548
......@@ -32,10 +32,6 @@
#= require bootstrap/tooltip
#= require bootstrap/popover
#= require select2
#= require raphael
#= require g.raphael
#= require g.bar
#= require branch-graph
#= require ace/ace
#= require ace/ext-searchbox
#= require underscore
......@@ -125,9 +121,15 @@ window.onload = ->
setTimeout shiftWindow, 100
$ ->
$document = $(document)
$window = $(window)
$body = $('body')
gl.utils.preventDisabledButtons()
bootstrapBreakpoint = bp.getBreakpointSize()
$(".nicescroll").niceScroll(cursoropacitymax: '0.4', cursorcolor: '#FFF', cursorborder: "1px solid #FFF")
$(".nav-sidebar").niceScroll(cursoropacitymax: '0.4', cursorcolor: '#FFF', cursorborder: "1px solid #FFF")
# Click a .js-select-on-focus field, select the contents
$(".js-select-on-focus").on "focusin", ->
......@@ -155,7 +157,7 @@ $ ->
), 1
# Initialize tooltips
$('body').tooltip(
$body.tooltip(
selector: '.has-tooltip, [data-toggle="tooltip"]'
placement: (_, el) ->
$el = $(el)
......@@ -174,7 +176,7 @@ $ ->
flash.show()
# Disable form buttons while a form is submitting
$('body').on 'ajax:complete, ajax:beforeSend, submit', 'form', (e) ->
$body.on 'ajax:complete, ajax:beforeSend, submit', 'form', (e) ->
buttons = $('[type="submit"]', @)
switch e.type
......@@ -187,7 +189,7 @@ $ ->
$('.account-box').hover -> $(@).toggleClass('hover')
# Commit show suppressed diff
$(document).on 'click', '.diff-content .js-show-suppressed-diff', ->
$document.on 'click', '.diff-content .js-show-suppressed-diff', ->
$container = $(@).parent()
$container.next('table').show()
$container.remove()
......@@ -200,13 +202,13 @@ $ ->
$('.navbar-toggle i').toggleClass("fa-angle-right fa-angle-left")
# Show/hide comments on diff
$("body").on "click", ".js-toggle-diff-comments", (e) ->
$body.on "click", ".js-toggle-diff-comments", (e) ->
$(@).toggleClass('active')
$(@).closest(".diff-file").find(".notes_holder").toggle()
e.preventDefault()
$(document).off "click", '.js-confirm-danger'
$(document).on "click", '.js-confirm-danger', (e) ->
$document.off "click", '.js-confirm-danger'
$document.on "click", '.js-confirm-danger', (e) ->
e.preventDefault()
btn = $(e.target)
text = btn.data("confirm-danger-message")
......@@ -214,7 +216,7 @@ $ ->
new ConfirmDangerModal(form, text)
$(document).on 'click', 'button', ->
$document.on 'click', 'button', ->
$(this).blur()
$('input[type="search"]').each ->
......@@ -222,7 +224,7 @@ $ ->
$this.attr 'value', $this.val()
return
$(document)
$document
.off 'keyup', 'input[type="search"]'
.on 'keyup', 'input[type="search"]' , (e) ->
$this = $(this)
......@@ -230,7 +232,7 @@ $ ->
$sidebarGutterToggle = $('.js-sidebar-toggle')
$(document)
$document
.off 'breakpoint:change'
.on 'breakpoint:change', (e, breakpoint) ->
if breakpoint is 'sm' or breakpoint is 'xs'
......@@ -242,14 +244,14 @@ $ ->
oldBootstrapBreakpoint = bootstrapBreakpoint
bootstrapBreakpoint = bp.getBreakpointSize()
if bootstrapBreakpoint != oldBootstrapBreakpoint
$(document).trigger('breakpoint:change', [bootstrapBreakpoint])
$document.trigger('breakpoint:change', [bootstrapBreakpoint])
checkInitialSidebarSize = ->
bootstrapBreakpoint = bp.getBreakpointSize()
if bootstrapBreakpoint is "xs" or "sm"
$(document).trigger('breakpoint:change', [bootstrapBreakpoint])
$document.trigger('breakpoint:change', [bootstrapBreakpoint])
$(window)
$window
.off "resize.app"
.on "resize.app", (e) ->
fitSidebarForSize()
......@@ -257,3 +259,47 @@ $ ->
gl.awardsHandler = new AwardsHandler()
checkInitialSidebarSize()
new Aside()
# Sidenav pinning
if $window.width() < 1440 and $.cookie('pin_nav') is 'true'
$.cookie('pin_nav', 'false', { path: '/' })
$('.page-with-sidebar')
.toggleClass('page-sidebar-collapsed page-sidebar-expanded')
.removeClass('page-sidebar-pinned')
$('.navbar-fixed-top').removeClass('header-pinned-nav')
$document
.off 'click', '.js-nav-pin'
.on 'click', '.js-nav-pin', (e) ->
e.preventDefault()
$pinBtn = $(e.currentTarget)
$page = $ '.page-with-sidebar'
$topNav = $ '.navbar-fixed-top'
$tooltip = $ "##{$pinBtn.attr('aria-describedby')}"
doPinNav = not $page.is('.page-sidebar-pinned')
tooltipText = 'Pin navigation'
$(this).toggleClass 'is-active'
if doPinNav
$page.addClass('page-sidebar-pinned')
$topNav.addClass('header-pinned-nav')
else
$tooltip.remove() # Remove it immediately when collapsing the sidebar
$page.removeClass('page-sidebar-pinned')
.toggleClass('page-sidebar-collapsed page-sidebar-expanded')
$topNav.removeClass('header-pinned-nav')
.toggleClass('header-collapsed header-expanded')
# Save settings
$.cookie 'pin_nav', doPinNav, { path: '/' }
if $.cookie('pin_nav') is 'true' or doPinNav
tooltipText = 'Unpin navigation'
# Update tooltip text immediately
$tooltip.find('.tooltip-inner').text(tooltipText)
# Persist tooltip title
$pinBtn.attr('title', tooltipText).tooltip('fixTitle')
app/assets/javascripts/awards_handler.coffee
View file @ 2674b548
......@@ -40,7 +40,7 @@ class @AwardsHandler
$menu = $ '.emoji-menu'
if $addBtn.hasClass 'js-note-emoji'
$addBtn.parents('.note').find('.js-awards-block').addClass 'current'
$addBtn.closest('.note').find('.js-awards-block').addClass 'current'
else
$addBtn.closest('.js-awards-block').addClass 'current'
......
app/assets/javascripts/blob/blob_ci_yaml.js.coffee 0 → 100644
View file @ 2674b548
#= require blob/template_selector
class @BlobCiYamlSelector extends TemplateSelector
requestFile: (query) ->
Api.gitlabCiYml query.name, @requestFileSuccess.bind(@)
class @BlobCiYamlSelectors
constructor: (opts) ->
{
@$dropdowns = $('.js-gitlab-ci-yml-selector')
@editor
} = opts
@$dropdowns.each (i, dropdown) =>
$dropdown = $(dropdown)
new BlobCiYamlSelector(
pattern: /(.gitlab-ci.yml)/,
data: $dropdown.data('data'),
wrapper: $dropdown.closest('.js-gitlab-ci-yml-selector-wrap'),
dropdown: $dropdown,
editor: @editor
)
app/assets/javascripts/blob/blob_gitignore_selector.js.coffee
View file @ 2674b548
class @BlobGitignoreSelector
constructor: (opts) ->
{
@dropdown
@editor
@$wrapper = @dropdown.closest('.gitignore-selector')
@$filenameInput = $('#file_name')
@data = @dropdown.data('filenames')
} = opts
#= require blob/template_selector
@dropdown.glDropdown(
data: @data,
filterable: true,
selectable: true,
search:
fields: ['name']
clicked: @onClick
text: (gitignore) ->
gitignore.name
)
@toggleGitignoreSelector()
@bindEvents()
bindEvents: ->
@$filenameInput
.on 'keyup blur', (e) =>
@toggleGitignoreSelector()
toggleGitignoreSelector: ->
filename = @$filenameInput.val() or $('.editor-file-name').text().trim()
@$wrapper.toggleClass 'hidden', filename isnt '.gitignore'
onClick: (item, el, e) =>
e.preventDefault()
@requestIgnoreFile(item.name)
requestIgnoreFile: (name) ->
Api.gitignoreText name, @requestIgnoreFileSuccess.bind(@)
requestIgnoreFileSuccess: (gitignore) ->
@editor.setValue(gitignore.content, 1)
@editor.focus()
class @BlobGitignoreSelectors
constructor: (opts) ->
{
@$dropdowns = $('.js-gitignore-selector')
@editor
} = opts
@$dropdowns.each (i, dropdown) =>
$dropdown = $(dropdown)
new BlobGitignoreSelector(
dropdown: $dropdown,
editor: @editor
)
class @BlobGitignoreSelector extends TemplateSelector
requestFile: (query) ->
Api.gitignoreText query.name, @requestFileSuccess.bind(@)
app/assets/javascripts/blob/blob_gitignore_selectors.js.coffee 0 → 100644
View file @ 2674b548
class @BlobGitignoreSelectors
constructor: (opts) ->
{
@$dropdowns = $('.js-gitignore-selector')
@editor
} = opts
@$dropdowns.each (i, dropdown) =>
$dropdown = $(dropdown)
new BlobGitignoreSelector(
pattern: /(.gitignore)/,
data: $dropdown.data('data'),
wrapper: $dropdown.closest('.js-gitignore-selector-wrap'),
dropdown: $dropdown,
editor: @editor
)
app/assets/javascripts/blob/blob_license_selector.js.coffee
View file @ 2674b548
class @BlobLicenseSelector
licenseRegex: /^(.+\/)?(licen[sc]e|copying)($|\.)/i
#= require blob/template_selector
constructor: (editor) ->
@$licenseSelector = $('.js-license-selector')
$fileNameInput = $('#file_name')
class @BlobLicenseSelector extends TemplateSelector
requestFile: (query) ->
data =
project: @dropdown.data('project')
fullname: @dropdown.data('fullname')
initialFileNameValue = if $fileNameInput.length
$fileNameInput.val()
else if $('.editor-file-name').length
$('.editor-file-name').text().trim()
@toggleLicenseSelector(initialFileNameValue)
if $fileNameInput
$fileNameInput.on 'keyup blur', (e) =>
@toggleLicenseSelector($(e.target).val())
$('select.license-select').on 'change', (e) ->
data =
project: $(this).data('project')
fullname: $(this).data('fullname')
Api.licenseText $(this).val(), data, (license) ->
editor.setValue(license.content, -1)
toggleLicenseSelector: (fileName) =>
if @licenseRegex.test(fileName)
@$licenseSelector.show()
else
@$licenseSelector.hide()
Api.licenseText query.id, data, @requestFileSuccess.bind(@)
app/assets/javascripts/blob/blob_license_selectors.js.coffee 0 → 100644
View file @ 2674b548
class @BlobLicenseSelectors
constructor: (opts) ->
{
@$dropdowns = $('.js-license-selector')
@editor
} = opts
@$dropdowns.each (i, dropdown) =>
$dropdown = $(dropdown)
new BlobLicenseSelector(
pattern: /^(.+\/)?(licen[sc]e|copying)($|\.)/i,
data: $dropdown.data('data'),
wrapper: $dropdown.closest('.js-license-selector-wrap'),
dropdown: $dropdown,
editor: @editor
)
app/assets/javascripts/blob/edit_blob.js.coffee
View file @ 2674b548
......@@ -12,8 +12,10 @@ class @EditBlob
$("#file-content").val(@editor.getValue())
@initModePanesAndLinks()
new BlobLicenseSelector(@editor)
new BlobGitignoreSelectors(editor: @editor)
new BlobLicenseSelectors { @editor }
new BlobGitignoreSelectors { @editor }
new BlobCiYamlSelectors { @editor }
initModePanesAndLinks: ->
@$editModePanes = $(".js-edit-mode-pane")
......
app/assets/javascripts/blob/template_selector.js.coffee 0 → 100644
View file @ 2674b548
class @TemplateSelector
constructor: (opts = {}) ->
{
@dropdown,
@data,
@pattern,
@wrapper,
@editor,
@fileEndpoint,
@$input = $('#file_name')
} = opts
@buildDropdown()
@bindEvents()
@onFilenameUpdate()
buildDropdown: ->
@dropdown.glDropdown(
data: @data,
filterable: true,
selectable: true,
search:
fields: ['name']
clicked: @onClick
text: (item) ->
item.name
)
bindEvents: ->
@$input.on('keyup blur', (e) =>
@onFilenameUpdate()
)
onFilenameUpdate: ->
return unless @$input.length
filenameMatches = @pattern.test(@$input.val().trim())
if not filenameMatches
@wrapper.addClass('hidden')
return
@wrapper.removeClass('hidden')
onClick: (item, el, e) =>
e.preventDefault()
@requestFile(item)
requestFile: (item) ->
# To be implemented on the extending class
# e.g.
# Api.gitignoreText item.name, @requestFileSuccess.bind(@)
requestFileSuccess: (file) ->
@editor.setValue(file.content, 1)
@editor.focus()
app/assets/javascripts/ci/build.coffee
View file @ 2674b548
......@@ -17,6 +17,8 @@ class @CiBuild
.off 'resize.build'
.on 'resize.build', @hideSidebar
@updateArtifactRemoveDate()
if $('#build-trace').length
@getInitialBuildTrace()
@initScrollButtonAffix()
......@@ -103,3 +105,10 @@ class @CiBuild
$('.js-build-sidebar')
.removeClass 'right-sidebar-collapsed'
.addClass 'right-sidebar-expanded'
updateArtifactRemoveDate: ->
$date = $('.js-artifacts-remove')
if $date.length
date = $date.text()
$date.text $.timefor(new Date(date), ' ')
app/assets/javascripts/dispatcher.js.coffee
View file @ 2674b548
......@@ -29,6 +29,7 @@ class Dispatcher
new Todos()
when 'projects:milestones:new', 'projects:milestones:edit'
new ZenMode()
new DueDateSelect()
new GLForm($('.milestone-form'))
when 'groups:milestones:new'
new ZenMode()
......@@ -53,9 +54,13 @@ class Dispatcher
new Diff()
shortcut_handler = new ShortcutsIssuable(true)
new ZenMode()
new MergedButtons()
when 'projects:merge_requests:commits', 'projects:merge_requests:builds'
new MergedButtons()
when "projects:merge_requests:diffs"
new Diff()
new ZenMode()
new MergedButtons()
when 'projects:merge_requests:index'
shortcut_handler = new ShortcutsNavigation()
Issuable.init()
......@@ -68,9 +73,7 @@ class Dispatcher
new Diff()
new ZenMode()
shortcut_handler = new ShortcutsNavigation()
when 'projects:commits:show'
shortcut_handler = new ShortcutsNavigation()
when 'projects:activity'
when 'projects:commits:show', 'projects:activity'
shortcut_handler = new ShortcutsNavigation()
when 'projects:show'
shortcut_handler = new ShortcutsNavigation()
......@@ -98,6 +101,7 @@ class Dispatcher
when 'projects:blob:show', 'projects:blame:show'
new LineHighlighter()
shortcut_handler = new ShortcutsNavigation()
new ShortcutsBlob true
when 'projects:labels:new', 'projects:labels:edit'
new Labels()
when 'projects:labels:index'
......@@ -133,14 +137,13 @@ class Dispatcher
new Project()
new ProjectAvatar()
switch path[1]
when 'compare'
shortcut_handler = new ShortcutsNavigation()
when 'edit'
shortcut_handler = new ShortcutsNavigation()
new ProjectNew()
when 'new'
new ProjectNew()
when 'show'
new ProjectNew()
new ProjectShow()
new NotificationsDropdown()
when 'wikis'
......@@ -151,9 +154,9 @@ class Dispatcher
when 'snippets'
shortcut_handler = new ShortcutsNavigation()
new ZenMode() if path[2] == 'show'
when 'labels', 'graphs'
shortcut_handler = new ShortcutsNavigation()
when 'project_members', 'deploy_keys', 'hooks', 'services', 'protected_branches'
when 'labels', 'graphs', 'compare', 'pipelines', 'forks', \
'milestones', 'project_members', 'deploy_keys', 'builds', \
'hooks', 'services', 'protected_branches'
shortcut_handler = new ShortcutsNavigation()
# If we haven't installed a custom shortcut handler, install the default one
......
app/assets/javascripts/due_date_select.js.coffee
View file @ 2674b548
class @DueDateSelect
constructor: ->
# Milestone edit/new form
$datePicker = $('.datepicker')
if $datePicker.length
$dueDate = $('#milestone_due_date')
$datePicker.datepicker
dateFormat: 'yy-mm-dd'
onSelect: (dateText, inst) ->
$dueDate.val(dateText)
.datepicker('setDate', $.datepicker.parseDate('yy-mm-dd', $dueDate.val()))
$('.js-clear-due-date').on 'click', (e) ->
e.preventDefault()
$.datepicker._clearDate($datePicker)
# Issuable sidebar
$loading = $('.js-issuable-update .due_date')
.find('.block-loading')
.hide()
......@@ -32,7 +48,7 @@ class @DueDateSelect
date = new Date value.replace(new RegExp('-', 'g'), ',')
mediumDate = $.datepicker.formatDate 'M d, yy', date
else
mediumDate = 'None'
mediumDate = 'No due date'
data = {}
data[abilityName] = {}
......@@ -50,7 +66,8 @@ class @DueDateSelect
$selectbox.hide()
$value.css('display', '')
$valueContent.html(mediumDate)
cssClass = if Date.parse(mediumDate) then 'bold' else 'no-value'
$valueContent.html("<span class='#{cssClass}'>#{mediumDate}</span>")
$sidebarValue.html(mediumDate)
if value isnt ''
......
app/assets/javascripts/gfm_auto_complete.js.coffee
View file @ 2674b548
......@@ -15,6 +15,9 @@ GitLab.GfmAutoComplete =
Members:
template: '<li>${username} <small>${title}</small></li>'
Labels:
template: '<li><span class="dropdown-label-box" style="background: ${color}"></span> ${title}</li>'
# Issues and MergeRequests
Issues:
template: '<li><small>${id}</small> ${title}</li>'
......@@ -176,6 +179,25 @@ GitLab.GfmAutoComplete =
title: sanitize(m.title)
search: "#{m.iid} #{m.title}"
@input.atwho
at: '~'
alias: 'labels'
searchKey: 'search'
displayTpl: @Labels.template
insertTpl: '${atwho-at}${title}'
callbacks:
beforeSave: (merges) ->
sanitizeLabelTitle = (title)->
if /\w+\s+\w+/g.test(title)
"\"#{sanitize(title)}\""
else
sanitize(title)
$.map merges, (m) ->
title: sanitizeLabelTitle(m.title)
color: m.color
search: "#{m.title}"
destroyAtWho: ->
@input.atwho('destroy')
......@@ -195,6 +217,8 @@ GitLab.GfmAutoComplete =
@input.atwho 'load', 'mergerequests', data.mergerequests
# load emojis
@input.atwho 'load', ':', data.emojis
# load labels
@input.atwho 'load', '~', data.labels
# This trigger at.js again
# otherwise we would be stuck with loading until the user types
......
app/assets/javascripts/gl_dropdown.js.coffee
View file @ 2674b548
......@@ -58,7 +58,7 @@ class GitLabDropdownFilter
filter: (search_text) ->
data = @options.data()
if data?
if data? and not @options.filterByText
results = data
if search_text isnt ''
......@@ -102,10 +102,11 @@ class GitLabDropdownFilter
$el = $(@)
matches = fuzzaldrinPlus.match($el.text().trim(), search_text)
if matches.length
$el.show()
else
$el.hide()
unless $el.is('.dropdown-header')
if matches.length
$el.show()
else
$el.hide()
else
elements.show()
......@@ -191,6 +192,7 @@ class GitLabDropdown
if @options.filterable
@filter = new GitLabDropdownFilter @filterInput,
filterInputBlur: @filterInputBlur
filterByText: @options.filterByText
remote: @options.filterRemote
query: @options.data
keys: searchFields
......@@ -302,6 +304,9 @@ class GitLabDropdown
if @options.setIndeterminateIds
@options.setIndeterminateIds.call(@)
if @options.setActiveIds
@options.setActiveIds.call(@)
# Makes indeterminate items effective
if @fullData and @dropdown.find('.dropdown-menu-toggle').hasClass('js-filter-bulk-update')
@parseData @fullData
......
app/assets/javascripts/gl_form.js.coffee
View file @ 2674b548
......@@ -34,6 +34,8 @@ class @GLForm
# form and textarea event listeners
@addEventListeners()
gl.text.init(@form)
# hide discard button
@form.find('.js-note-discard').hide()
......@@ -42,6 +44,7 @@ class @GLForm
clearEventListeners: ->
@textarea.off 'focus'
@textarea.off 'blur'
gl.text.removeListeners(@form)
addEventListeners: ->
@textarea.on 'focus', ->
......
app/assets/javascripts/graphs/stat_graph_contributors_graph.js.coffee
View file @ 2674b548
......@@ -121,7 +121,11 @@ class @ContributorsMasterGraph extends ContributorsGraph
class @ContributorsAuthorGraph extends ContributorsGraph
constructor: (@data) ->
@width = $('.content').width()/2 - 100
# Don't split graph size in half for mobile devices.
if $(window).width() < 768
@width = $('.content').width() - 80
else
@width = ($('.content').width() / 2) - 100
@height = 200
@x = null
@y = null
......
app/assets/javascripts/issuable.js.coffee
View file @ 2674b548
......@@ -56,13 +56,6 @@ issuable_created = false
Issuable.filterResults $('.filter-form')
$('.js-label-select').trigger('update.label')
toggleLabelFilters: ->
$filteredLabels = $('.filtered-labels')
if $filteredLabels.find('.label-row').length > 0
$filteredLabels.removeClass('hidden')
else
$filteredLabels.addClass('hidden')
filterResults: (form) =>
formData = form.serialize()
......@@ -71,58 +64,16 @@ issuable_created = false
issuesUrl = formAction
issuesUrl += ("#{if formAction.indexOf('?') < 0 then '?' else '&'}")
issuesUrl += formData
$.ajax
type: 'GET'
url: formAction
data: formData
complete: ->
$('.issues-holder, .merge-requests-holder').css('opacity', '1.0')
success: (data) ->
$('.issues-holder, .merge-requests-holder').html(data.html)
# Change url so if user reload a page - search results are saved
history.replaceState {page: issuesUrl}, document.title, issuesUrl
Issuable.reload()
Issuable.updateStateFilters()
$filteredLabels = $('.filtered-labels')
if typeof Issuable.labelRow is 'function'
$filteredLabels.html(Issuable.labelRow(data))
Issuable.toggleLabelFilters()
dataType: "json"
reload: ->
if Issuable.created
Issuable.initChecks()
$('#filter_issue_search').val($('#issue_search').val())
Turbolinks.visit(issuesUrl);
initChecks: ->
$('.check_all_issues').on 'click', ->
$('.check_all_issues').off('click').on('click', ->
$('.selected_issue').prop('checked', @checked)
Issuable.checkChanged()
)
$('.selected_issue').on 'change', Issuable.checkChanged
updateStateFilters: ->
stateFilters = $('.issues-state-filters, .dropdown-menu-sort')
newParams = {}
paramKeys = ['author_id', 'milestone_title', 'assignee_id', 'issue_search', 'issue_search']
for paramKey in paramKeys
newParams[paramKey] = gl.utils.getParameterValues(paramKey)[0] or ''
if stateFilters.length
stateFilters.find('a').each ->
initialUrl = gl.utils.removeParamQueryString($(this).attr('href'), 'label_name[]')
labelNameValues = gl.utils.getParameterValues('label_name[]')
if labelNameValues
labelNameQueryString = ("label_name[]=#{value}" for value in labelNameValues).join('&')
newUrl = "#{gl.utils.mergeUrlParams(newParams, initialUrl)}&#{labelNameQueryString}"
else
newUrl = gl.utils.mergeUrlParams(newParams, initialUrl)
$(this).attr 'href', newUrl
$('.selected_issue').off('change').on('change', Issuable.checkChanged)
checkChanged: ->
checked_issues = $('.selected_issue:checked')
......
app/assets/javascripts/issuable_form.js.coffee
View file @ 2674b548
......@@ -102,6 +102,10 @@ class @IssuableForm
return {
results: data
}
data: (query) ->
{
search: query
}
formatResult: (project) ->
project.name_with_namespace
formatSelection: (project) ->
......
app/assets/javascripts/issues-bulk-assignment.js.coffee
View file @ 2674b548
......@@ -9,6 +9,9 @@ class @IssuableBulkActions
@bindEvents()
# Fixes bulk-assign not working when navigating through pages
Issuable.initChecks();
getElement: (selector) ->
@container.find selector
......
app/assets/javascripts/labels_select.js.coffee
View file @ 2674b548
......@@ -39,7 +39,7 @@ class @LabelsSelect
</a>
<% }); %>'
)
labelNoneHTMLTemplate = _.template('<div class="light">None</div>')
labelNoneHTMLTemplate = '<span class="no-value">None</span>'
if newLabelField.length
......@@ -145,7 +145,7 @@ class @LabelsSelect
template = labelHTMLTemplate(data)
labelCount = data.labels.length
else
template = labelNoneHTMLTemplate()
template = labelNoneHTMLTemplate
$value
.removeAttr('style')
.html(template)
......@@ -210,9 +210,21 @@ class @LabelsSelect
if $dropdown.hasClass('js-filter-bulk-update')
indeterminate = instance.indeterminateIds
active = instance.activeIds
if indeterminate.indexOf(label.id) isnt -1
selectedClass.push 'is-indeterminate'
if active.indexOf(label.id) isnt -1
# Remove is-indeterminate class if the item will be marked as active
i = selectedClass.indexOf 'is-indeterminate'
selectedClass.splice i, 1 unless i is -1
selectedClass.push 'is-active'
# Add input manually
instance.addInput @fieldName, label.id
if $form.find("input[type='hidden']\
[name='#{$dropdown.data('fieldName')}']\
[value='#{this.id(label)}']").length
......@@ -328,6 +340,10 @@ class @LabelsSelect
setIndeterminateIds: ->
if @dropdown.find('.dropdown-menu-toggle').hasClass('js-filter-bulk-update')
@indeterminateIds = _this.getIndeterminateIds()
setActiveIds: ->
if @dropdown.find('.dropdown-menu-toggle').hasClass('js-filter-bulk-update')
@activeIds = _this.getActiveIds()
)
@bindEvents()
......@@ -352,3 +368,12 @@ class @LabelsSelect
label_ids.push $("#issue_#{issue_id}").data('labels')
_.flatten(label_ids)
getActiveIds: ->
label_ids = []
$('.selected_issue:checked').each (i, el) ->
issue_id = $(el).data('id')
label_ids.push $("#issue_#{issue_id}").data('labels')
_.intersection.apply _, label_ids
app/assets/javascripts/layout_nav.js.coffee
View file @ 2674b548
class @LayoutNav
$ ->
$('.fade-left').addClass('end-scroll')
$('.scrolling-tabs').on 'scroll', (event) ->
$this = $(this)
$el = $(event.target)
currentPosition = $this.scrollLeft()
size = bp.getBreakpointSize()
controlBtnWidth = $('.controls').width()
maxPosition = $this.get(0).scrollWidth - $this.parent().width()
maxPosition += controlBtnWidth if size isnt 'xs' and $('.nav-control').length
$el.find('.fade-left').toggleClass('end-scroll', currentPosition is 0)
$el.find('.fade-right').toggleClass('end-scroll', currentPosition is maxPosition)
hideEndFade = ($scrollingTabs) ->
$scrollingTabs.each ->
$this = $(@)
$this
.find('.fade-right')
.toggleClass('end-scroll', $this.width() is $this.prop('scrollWidth'))
$ ->
$('.fade-left').addClass('end-scroll')
hideEndFade($('.scrolling-tabs'))
$(window)
.off 'resize.nav'
.on 'resize.nav', ->
hideEndFade($('.scrolling-tabs'))
$('.scrolling-tabs').on 'scroll', (event) ->
$this = $(this)
currentPosition = $this.scrollLeft()
maxPosition = $this.prop('scrollWidth') - $this.outerWidth()
$this.find('.fade-left').toggleClass('end-scroll', currentPosition is 0)
$this.find('.fade-right').toggleClass('end-scroll', currentPosition is maxPosition)
app/assets/javascripts/lib/common_utils.js.coffee
View file @ 2674b548
((w) ->
w.gl or= {}
w.gl.utils or= {}
w.gl.utils.isInGroupsPage = ->
return $('body').data('page').split(':')[0] is 'groups'
w.gl.utils.isInProjectPage = ->
return $('body').data('page').split(':')[0] is 'projects'
w.gl.utils.getProjectSlug = ->
return if @isInProjectPage() then $('body').data 'project' else null
w.gl.utils.getGroupSlug = ->
return if @isInGroupsPage() then $('body').data 'group' else null
gl.utils.updateTooltipTitle = ($tooltipEl, newTitle) ->
$tooltipEl
.tooltip 'destroy'
.attr 'title', newTitle
.tooltip 'fixTitle'
gl.utils.preventDisabledButtons = ->
$('.btn').click (e) ->
if $(this).hasClass 'disabled'
e.preventDefault()
e.stopImmediatePropagation()
return false
jQuery.timefor = (time, suffix, expiredLabel) ->
return '' unless time
......
app/assets/javascripts/lib/text_utility.js.coffee 0 → 100644
View file @ 2674b548
((w) ->
w.gl ?= {}
w.gl.text ?= {}
gl.text.randomString = -> Math.random().toString(36).substring(7)
gl.text.replaceRange = (s, start, end, substitute) ->
s.substring(0, start) + substitute + s.substring(end);
gl.text.selectedText = (text, textarea) ->
text.substring(textarea.selectionStart, textarea.selectionEnd)
gl.text.insertText = (textArea, text, tag, selected, wrap) ->
selectedSplit = selected.split('\n')
startChar = if not wrap and textArea.selectionStart > 0 then '\n' else ''
if selectedSplit.length > 1 and not wrap
insertText = selectedSplit.map((val) ->
if val.indexOf(tag) is 0
"#{val.replace(tag, '')}"
else
"#{tag}#{val}"
).join('\n')
else
insertText = "#{startChar}#{tag}#{selected}#{if wrap then tag else ' '}"
if document.queryCommandSupported('insertText')
document.execCommand 'insertText', false, insertText
else
try
document.execCommand("ms-beginUndoUnit")
textArea.value = @replaceRange(
text,
textArea.selectionStart,
textArea.selectionEnd,
insertText)
try
document.execCommand("ms-endUndoUnit")
@moveCursor(textArea, tag, wrap)
gl.text.moveCursor = (textArea, tag, wrapped) ->
return unless textArea.setSelectionRange
if textArea.selectionStart is textArea.selectionEnd
if wrapped
pos = textArea.selectionStart - tag.length
else
pos = textArea.selectionStart
textArea.setSelectionRange pos, pos
gl.text.updateText = (textArea, tag, wrap) ->
$textArea = $(textArea)
oldVal = $textArea.val()
textArea = $textArea.get(0)
text = $textArea.val()
selected = @selectedText(text, textArea)
$textArea.focus()
@insertText(textArea, text, tag, selected, wrap)
gl.text.init = (form) ->
self = @
$('.js-md', form)
.off 'click'
.on 'click', ->
$this = $(@)
self.updateText(
$this.closest('.md-area').find('textarea'),
$this.data('md-tag'),
not $this.data('md-prepend')
)
gl.text.removeListeners = (form) ->
$('.js-md', form).off()
) window
app/assets/javascripts/logo.js.coffee
View file @ 2674b548
......@@ -42,9 +42,3 @@ work = ->
$(document).on('page:fetch', start)
$(document).on('page:change', stop)
$ ->
# Make logo clickable as part of a workaround for Safari visited
# link behaviour (See !2690).
$('#logo').on 'click', ->
Turbolinks.visit('/')
app/assets/javascripts/merge_request.js.coffee
View file @ 2674b548
......@@ -9,7 +9,7 @@ class @MergeRequest
# Options:
# action - String, current controller action
#
constructor: (@opts) ->
constructor: (@opts = {}) ->
this.$el = $('.merge-request')
this.$('.show-all-commits').on 'click', =>
......
app/assets/javascripts/merge_request_tabs.js.coffee
View file @ 2674b548
......@@ -88,7 +88,7 @@ class @MergeRequestTabs
scrollToElement: (container) ->
if window.location.hash
navBarHeight = $('.navbar-gitlab').outerHeight()
navBarHeight = $('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight()
$el = $("#{container} #{window.location.hash}:not(.match)")
$.scrollTo("#{container} #{window.location.hash}:not(.match)", offset: -navBarHeight) if $el.length
......
app/assets/javascripts/merged_buttons.js.coffee 0 → 100644
View file @ 2674b548
class @MergedButtons
constructor: ->
@$removeBranchWidget = $('.remove_source_branch_widget')
@$removeBranchProgress = $('.remove_source_branch_in_progress')
@$removeBranchFailed = $('.remove_source_branch_widget.failed')
@cleanEventListeners()
@initEventListeners()
cleanEventListeners: ->
$(document).off 'click', '.remove_source_branch'
$(document).off 'ajax:success', '.remove_source_branch'
$(document).off 'ajax:error', '.remove_source_branch'
initEventListeners: ->
$(document).on 'click', '.remove_source_branch', @removeSourceBranch
$(document).on 'ajax:success', '.remove_source_branch', @removeBranchSuccess
$(document).on 'ajax:error', '.remove_source_branch', @removeBranchError
removeSourceBranch: =>
@$removeBranchWidget.hide()
@$removeBranchProgress.show()
removeBranchSuccess: ->
location.reload()
removeBranchError: ->
@$removeBranchWidget.hide()
@$removeBranchProgress.hide()
@$removeBranchFailed.show()
app/assets/javascripts/milestone_select.js.coffee
View file @ 2674b548
......@@ -24,14 +24,10 @@ class @MilestoneSelect
if issueUpdateURL
milestoneLinkTemplate = _.template(
'<a href="/<%= namespace %>/<%= path %>/milestones/<%= iid %>">
<span class="has-tooltip" data-container="body" title="<%= remaining %>">
<%= _.escape(title) %>
</span>
</a>'
'<a href="/<%= namespace %>/<%= path %>/milestones/<%= iid %>" class="bold has-tooltip" data-container="body" title="<%= remaining %>"><%= _.escape(title) %></a>'
)
milestoneLinkNoneTemplate = '<div class="light">None</div>'
milestoneLinkNoneTemplate = '<span class="no-value">None</span>'
collapsedSidebarLabelTemplate = _.template(
'<span class="has-tooltip" data-container="body" title="<%= remaining %>" data-placement="left">
......@@ -116,7 +112,7 @@ class @MilestoneSelect
.val()
data = {}
data[abilityName] = {}
data[abilityName].milestone_id = selected
data[abilityName].milestone_id = if selected? then selected else null
$loading
.fadeIn()
$dropdown.trigger('loading.gl.dropdown')
......
app/assets/javascripts/network/application.js.coffee 0 → 100644
View file @ 2674b548
# This is a manifest file that'll be compiled into including all the files listed below.
# Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
# be included in the compiled file accessible from http://example.com/assets/application.js
# It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
# the compiled file.
#
#= require raphael
#= require g.raphael
#= require g.bar
#= require_tree .
$ ->
network_graph = new Network({
url: $(".network-graph").attr('data-url'),
commit_url: $(".network-graph").attr('data-commit-url'),
ref: $(".network-graph").attr('data-ref'),
commit_id: $(".network-graph").attr('data-commit-id')
})
new ShortcutsNetwork(network_graph.branch_graph)
app/assets/javascripts/notes.js.coffee
View file @ 2674b548
......@@ -102,12 +102,15 @@ class @Notes
keydownNoteText: (e) ->
$this = $(this)
if $this.val() is '' and e.which is 38 #aka the up key
if $this.val() is '' and e.which is 38 and not isMetaKey e
myLastNote = $("li.note[data-author-id='#{gon.current_user_id}'][data-editable]:last")
if myLastNote.length
myLastNoteEditBtn = myLastNote.find('.js-note-edit')
myLastNoteEditBtn.trigger('click', [true, myLastNote])
isMetaKey = (e) ->
(e.metaKey or e.ctrlKey or e.altKey or e.shiftKey)
initRefresh: ->
clearInterval(Notes.interval)
Notes.interval = setInterval =>
......@@ -115,12 +118,14 @@ class @Notes
, @pollingInterval
refresh: =>
return if @refreshing is true
@refreshing = true
if not document.hidden and document.URL.indexOf(@noteable_url) is 0
@getContent()
getContent: ->
return if @refreshing
@refreshing = true
$.ajax
url: @notes_url
data: "last_fetched_at=" + @last_fetched_at
......
app/assets/javascripts/notifications_dropdown.js.coffee
View file @ 2674b548
class @NotificationsDropdown
$ ->
constructor: ->
$(document)
.off 'click', '.update-notification'
.on 'click', '.update-notification', (e) ->
e.preventDefault()
return if $(this).is('.is-active') and $(this).data('notification-level') is 'custom'
notificationLevel = $(@).data 'notification-level'
label = $(@).data 'notification-title'
form = $(this).parents('form:first')
form = $(this).parents('.notification-form:first')
form.find('.js-notification-loading').toggleClass 'fa-bell fa-spin fa-spinner'
form.find('#notification_setting_level').val(notificationLevel)
form.submit();
form.submit()
$(document)
.off 'ajax:success', '#notification-form'
.on 'ajax:success', '#notification-form', (e, data) ->
.off 'ajax:success', '.notification-form'
.on 'ajax:success', '.notification-form', (e, data) ->
if data.saved
new Flash('Notification settings saved', 'notice')
$(e.currentTarget).closest('.notification-dropdown').replaceWith(data.html)
$(e.currentTarget)
.closest('.notification-dropdown')
.replaceWith(data.html)
else
new Flash('Failed to save new settings', 'alert')
app/assets/javascripts/notifications_form.js.coffee
View file @ 2674b548
......@@ -12,7 +12,6 @@ class @NotificationsForm
toggleCheckbox: (e) =>
$checkbox = $(e.currentTarget)
$parent = $checkbox.closest('.checkbox')
console.log($parent)
@saveEvent($checkbox, $parent)
showCheckboxLoadingSpinner: ($parent) ->
......@@ -25,13 +24,13 @@ class @NotificationsForm
saveEvent: ($checkbox, $parent) ->
form = $parent.parents('form:first')
console.log(form)
$.ajax(
url: form.attr('action')
method: form.attr('method')
dataType: 'json'
data: form.serialize()
beforeSend: =>
@showCheckboxLoadingSpinner($parent)
).done (data) ->
......
app/assets/javascripts/project.js.coffee
View file @ 2674b548
......@@ -19,6 +19,7 @@ class @Project
$('.clone').text(url)
# Ref switcher
@initRefSwitcher()
$('.project-refs-select').on 'change', ->
$(@).parents('form').submit()
......@@ -34,7 +35,6 @@ class @Project
$(@).parents('.no-password-message').remove()
e.preventDefault()
@projectSelectDropdown()
projectSelectDropdown: ->
......@@ -50,3 +50,39 @@ class @Project
changeProject: (url) ->
window.location = url
initRefSwitcher: ->
$('.js-project-refs-dropdown').each ->
$dropdown = $(@)
selected = $dropdown.data('selected')
$dropdown.glDropdown(
data: (term, callback) ->
$.ajax(
url: $dropdown.data('refs-url')
data:
ref: $dropdown.data('ref')
).done (refs) ->
callback(refs)
selectable: true
filterable: true
filterByText: true
fieldName: 'ref'
renderRow: (ref) ->
if ref.header?
"<li class='dropdown-header'>#{ref.header}</li>"
else
isActiveClass = if ref is selected then 'is-active' else ''
"<li>
<a href='#' data-ref='#{escape(ref)}' class='#{isActiveClass}'>
#{ref}
</a>
</li>"
id: (obj, $el) ->
$el.data('ref')
toggleLabel: (obj, $el) ->
$el.text().trim()
clicked: (e) ->
$dropdown.closest('form').submit()
)
app/assets/javascripts/right_sidebar.js.coffee
View file @ 2674b548
......@@ -43,6 +43,59 @@ class @Sidebar
$('.right-sidebar')
.hasClass('right-sidebar-collapsed'), { path: '/' })
$(document)
.off 'click', '.js-issuable-todo'
.on 'click', '.js-issuable-todo', @toggleTodo
toggleTodo: (e) =>
$this = $(e.currentTarget)
$todoLoading = $('.js-issuable-todo-loading')
$btnText = $('.js-issuable-todo-text', $this)
ajaxType = if $this.attr('data-delete-path') then 'DELETE' else 'POST'
if $this.attr('data-delete-path')
url = "#{$this.attr('data-delete-path')}"
else
url = "#{$this.data('url')}"
$.ajax(
url: url
type: ajaxType
dataType: 'json'
data:
issuable_id: $this.data('issuable-id')
issuable_type: $this.data('issuable-type')
beforeSend: =>
@beforeTodoSend($this, $todoLoading)
).done (data) =>
@todoUpdateDone(data, $this, $btnText, $todoLoading)
beforeTodoSend: ($btn, $todoLoading) ->
$btn.disable()
$todoLoading.removeClass 'hidden'
todoUpdateDone: (data, $btn, $btnText, $todoLoading) ->
$todoPendingCount = $('.todos-pending-count')
$todoPendingCount.text data.count
$btn.enable()
$todoLoading.addClass 'hidden'
if data.count is 0
$todoPendingCount.addClass 'hidden'
else
$todoPendingCount.removeClass 'hidden'
if data.delete_path?
$btn
.attr 'aria-label', $btn.data('mark-text')
.attr 'data-delete-path', data.delete_path
$btnText.text $btn.data('mark-text')
else
$btn
.attr 'aria-label', $btn.data('todo-text')
.removeAttr 'data-delete-path'
$btnText.text $btn.data('todo-text')
sidebarDropdownLoading: (e) ->
$sidebarCollapsedIcon = $(@).closest('.block').find('.sidebar-collapsed-icon')
......@@ -117,5 +170,3 @@ class @Sidebar
getBlock: (name) ->
@sidebar.find(".block.#{name}")
app/assets/javascripts/search_autocomplete.js.coffee
View file @ 2674b548
......@@ -67,8 +67,12 @@ class @SearchAutocomplete
getData: (term, callback) ->
_this = @
# Do not trigger request if input is empty
return if @searchInput.val() is ''
unless term
if contents = @getCategoryContents()
@searchInput.data('glDropdown').filter.options.callback contents
@enableAutocomplete()
return
# Prevent multiple ajax calls
return if @loadingSuggestions
......@@ -122,6 +126,37 @@ class @SearchAutocomplete
).always ->
_this.loadingSuggestions = false
getCategoryContents: ->
userId = gon.current_user_id
{ utils, projectOptions, groupOptions, dashboardOptions } = gl
if utils.isInGroupsPage() and groupOptions
options = groupOptions[utils.getGroupSlug()]
else if utils.isInProjectPage() and projectOptions
options = projectOptions[utils.getProjectSlug()]
else if dashboardOptions
options = dashboardOptions
{ issuesPath, mrPath, name } = options
items = [
{ header: "#{name}" }
{ text: 'Issues assigned to me', url: "#{issuesPath}/?assignee_id=#{userId}" }
{ text: "Issues I've created", url: "#{issuesPath}/?author_id=#{userId}" }
'separator'
{ text: 'Merge requests assigned to me', url: "#{mrPath}/?assignee_id=#{userId}" }
{ text: "Merge requests I've created", url: "#{mrPath}/?author_id=#{userId}" }
]
items.splice 0, 1 unless name
return items
serializeState: ->
{
# Search Criteria
......@@ -209,6 +244,12 @@ class @SearchAutocomplete
@isFocused = true
@wrap.addClass('search-active')
@getData() if @getValue() is ''
getValue: -> return @searchInput.val()
onClearInputClick: (e) =>
e.preventDefault()
@searchInput.val('').focus()
......@@ -229,6 +270,10 @@ class @SearchAutocomplete
@locationBadgeEl.text(badgeText).show()
@wrap.addClass('has-location-badge')
hasLocationBadge: -> return @wrap.is '.has-location-badge'
restoreOriginalState: ->
inputs = Object.keys @originalState
......@@ -257,13 +302,14 @@ class @SearchAutocomplete
@getElement("##{input}").val('')
removeLocationBadge: ->
@locationBadgeEl.hide()
# Reset state
@locationBadgeEl.hide()
@resetSearchState()
@wrap.removeClass('has-location-badge')
@disableAutocomplete()
disableAutocomplete: ->
@searchInput.addClass('disabled')
......
app/assets/javascripts/shortcuts.js.coffee
View file @ 2674b548
class @Shortcuts
constructor: ->
constructor: (skipResetBindings) ->
@enabledHelp = []
Mousetrap.reset()
Mousetrap.reset() if not skipResetBindings
Mousetrap.bind('?', @onToggleHelp)
Mousetrap.bind('s', Shortcuts.focusSearch)
Mousetrap.bind(['ctrl+shift+p', 'command+shift+p'], @toggleMarkdownPreview)
......
app/assets/javascripts/shortcuts_blob.coffee 0 → 100644
View file @ 2674b548
#= require shortcuts
class @ShortcutsBlob extends Shortcuts
constructor: (skipResetBindings) ->
super skipResetBindings
Mousetrap.bind('y', ShortcutsBlob.copyToClipboard)
@copyToClipboard: ->
clipboardButton = $('.btn-clipboard')
clipboardButton.click() if clipboardButton
app/assets/javascripts/sidebar.js.coffee
View file @ 2674b548
......@@ -3,13 +3,33 @@ expanded = 'page-sidebar-expanded'
toggleSidebar = ->
$('.page-with-sidebar').toggleClass("#{collapsed} #{expanded}")
$('header').toggleClass("header-collapsed header-expanded")
$('.navbar-fixed-top').toggleClass("header-collapsed header-expanded")
if $.cookie('pin_nav') is 'true'
$('.navbar-fixed-top').toggleClass('header-pinned-nav')
$('.page-with-sidebar').toggleClass('page-sidebar-pinned')
setTimeout ( ->
niceScrollBars = $('.nicescroll').niceScroll();
niceScrollBars = $('.nav-sidebar').niceScroll();
niceScrollBars.updateScrollBar();
), 300
$(document)
.off 'click', 'body'
.on 'click', 'body', (e) ->
unless $.cookie('pin_nav') is 'true'
$target = $(e.target)
$nav = $target.closest('.sidebar-wrapper')
pageExpanded = $('.page-with-sidebar').hasClass('page-sidebar-expanded')
$toggle = $target.closest('.toggle-nav-collapse, .side-nav-toggle')
if $nav.length is 0 and pageExpanded and $toggle.length is 0
$('.page-with-sidebar')
.toggleClass('page-sidebar-collapsed page-sidebar-expanded')
$('.navbar-fixed-top')
.toggleClass('header-collapsed header-expanded')
$(document).on("click", '.toggle-nav-collapse, .side-nav-toggle', (e) ->
e.preventDefault()
......
app/assets/javascripts/star.js.coffee
View file @ 2674b548
......@@ -9,9 +9,11 @@ class @Star
$this.parent().find('.star-count').text data.star_count
if isStarred
$starSpan.removeClass('starred').text 'Star'
gl.utils.updateTooltipTitle $this, 'Star project'
$starIcon.removeClass('fa-star').addClass 'fa-star-o'
else
$starSpan.addClass('starred').text 'Unstar'
gl.utils.updateTooltipTitle $this, 'Unstar project'
$starIcon.removeClass('fa-star-o').addClass 'fa-star'
return
......
app/assets/javascripts/users/calendar.js.coffee
View file @ 2674b548
......@@ -6,12 +6,6 @@ class @Calendar
@daySizeWithSpace = @daySize + (@daySpace * 2)
@monthNames = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
@months = []
@highestValue = 0
# Get the highest value from the timestampes
_.each timestamps, (count) =>
if count > @highestValue
@highestValue = count
# Loop through the timestamps to create a group of objects
# The group of objects will be grouped based on the day of the week they are
......@@ -39,8 +33,8 @@ class @Calendar
i++
# Init color functions
@color = @initColor()
@colorKey = @initColorKey()
@color = @initColor()
# Init the svg element
@renderSvg(group)
......@@ -104,7 +98,7 @@ class @Calendar
.attr 'class', 'user-contrib-cell js-tooltip'
.attr 'fill', (stamp) =>
if stamp.count isnt 0
@color(stamp.count)
@color(Math.min(stamp.count, 40))
else
'#ededed'
.attr 'data-container', 'body'
......@@ -164,10 +158,11 @@ class @Calendar
color
initColor: ->
colorRange = ['#ededed', @colorKey(0), @colorKey(1), @colorKey(2), @colorKey(3)]
d3.scale
.linear()
.range(['#acd5f2', '#254e77'])
.domain([0, @highestValue])
.threshold()
.domain([0, 10, 20, 30])
.range(colorRange)
initColorKey: ->
d3.scale
......
app/assets/javascripts/users_select.js.coffee
View file @ 2674b548
......@@ -31,7 +31,7 @@ class @UsersSelect
assignTo = (selected) ->
data = {}
data[abilityName] = {}
data[abilityName].assignee_id = selected
data[abilityName].assignee_id = if selected? then selected else null
$loading
.fadeIn()
$dropdown.trigger('loading.gl.dropdown')
......@@ -72,7 +72,7 @@ class @UsersSelect
assigneeTemplate = _.template(
'<% if (username) { %>
<a class="author_link " href="/u/<%= username %>">
<a class="author_link bold" href="/u/<%= username %>">
<% if( avatar ) { %>
<img width="32" class="avatar avatar-inline s32" alt="" src="<%= avatar %>">
<% } %>
......@@ -82,7 +82,7 @@ class @UsersSelect
</span>
</a>
<% } else { %>
<span class="assign-yourself">
<span class="no-value assign-yourself">
No assignee -
<a href="#" class="js-assign-yourself">
assign yourself
......
app/assets/stylesheets/framework.scss
View file @ 2674b548
......@@ -37,3 +37,4 @@
@import "framework/timeline.scss";
@import "framework/typography.scss";
@import "framework/zen.scss";
@import "framework/blank";
app/assets/stylesheets/framework/blank.scss 0 → 100644
View file @ 2674b548
.blank-state {
padding-top: 20px;
padding-bottom: 20px;
text-align: center;
}
.blank-state-no-icon {
padding-top: 40px;
padding-bottom: 40px;
}
.blank-state-title {
margin-top: 0;
margin-bottom: 5px;
font-size: 19px;
font-weight: normal;
}
.blank-state-text {
margin-top: 0;
margin-bottom: $gl-padding;
font-size: 15px;
}
app/assets/stylesheets/framework/blocks.scss
View file @ 2674b548
......@@ -91,6 +91,26 @@
background-color: $white-light;
border-top: none;
}
&.top-block .container-fluid {
background-color: inherit;
}
}
.sub-header-block {
background-color: $white-light;
border-bottom: 1px solid $white-dark;
padding: 11px 0;
margin-bottom: 11px;
.oneline {
line-height: 35px;
}
&.no-bottom-space {
border-bottom: 0;
margin-bottom: 0;
}
}
.cover-block {
......
app/assets/stylesheets/framework/dropdowns.scss
View file @ 2674b548
......@@ -461,10 +461,12 @@
}
}
.ui-state-active,
.ui-state-hover {
color: $md-link-color;
background-color: $calendar-hover-bg;
.ui-datepicker-calendar {
.ui-state-hover,
.ui-state-active {
color: #fff;
border: 0;
}
}
.ui-datepicker-prev,
......
app/assets/stylesheets/framework/gitlab-theme.scss
View file @ 2674b548
......@@ -8,8 +8,8 @@
*/
@mixin gitlab-theme($color-light, $color, $color-darker, $color-dark) {
.page-with-sidebar {
.collapse-nav a {
.toggle-nav-collapse,
.pin-nav-btn {
color: $color-light;
background: $color;
......
app/assets/stylesheets/framework/header.scss
View file @ 2674b548
......@@ -2,8 +2,19 @@
* Application Header
*
*/
@mixin tanuki-logo-colors($path-color) {
fill: $path-color;
transition: all 0.8s;
&:hover,
&.highlight {
fill: lighten($path-color, 25%);
transition: all 0.1s;
}
}
header {
transition-duration: .3s;
transition: padding $sidebar-transition-duration;
&.navbar-empty {
height: $header-height;
......@@ -79,14 +90,9 @@ header {
&.header-collapsed {
padding: 0 16px;
.side-nav-toggle {
display: block;
}
}
.side-nav-toggle {
display: none;
position: absolute;
left: -10px;
margin: 6px 0;
......@@ -108,9 +114,7 @@ header {
.header-content {
position: relative;
height: $header-height;
padding-right: 40px;
padding-left: 30px;
transition-duration: .3s;
@media (min-width: $screen-sm-min) {
padding-right: 0;
......@@ -198,25 +202,24 @@ header {
}
}
.header-collapsed {
margin-left: 0;
#tanuki-logo {
.header-content {
@media (min-width: $screen-sm-max) {
padding-left: 30px;
transition-duration: .3s;
}
#tanuki-left-ear,
#tanuki-right-ear,
#tanuki-nose {
@include tanuki-logo-colors($tanuki-red);
}
}
.tanuki-shape {
transition: all 0.8s;
#tanuki-left-eye,
#tanuki-right-eye {
@include tanuki-logo-colors($tanuki-orange);
}
&:hover, &.highlight {
fill: rgb(255, 255, 255);
transition: all 0.1s;
#tanuki-left-cheek,
#tanuki-right-cheek {
@include tanuki-logo-colors($tanuki-yellow);
}
}
@media (max-width: $screen-xs-max) {
......
app/assets/stylesheets/framework/lists.scss
View file @ 2674b548
......@@ -159,7 +159,7 @@ ul.content-list {
background-color: $gray-light;
border: dotted 1px $gray-dark;
margin: 1px 0;
min-height: 30px;
min-height: 52px;
}
}
}
......
app/assets/stylesheets/framework/markdown_area.scss
View file @ 2674b548
......@@ -65,6 +65,11 @@
a {
padding-top: 0;
line-height: 1;
border-bottom: 1px solid $border-color;
&.btn.btn-xs {
padding: 2px 5px;
}
}
}
}
......@@ -97,5 +102,30 @@
white-space: pre-wrap;
word-break: keep-all;
}
@include bulleted-list;
}
}
.toolbar-group {
float: left;
margin-right: -5px;
margin-left: $gl-padding;
&:first-child {
margin-left: 0;
}
}
.toolbar-btn {
float: left;
padding: 0 5px;
color: #959494;
background: transparent;
border: 0;
outline: 0;
&:hover {
color: $gl-link-color;
}
}
app/assets/stylesheets/framework/mixins.scss
View file @ 2674b548
......@@ -110,3 +110,17 @@
font-size: 16px;
line-height: 24px;
}
@mixin bulleted-list {
> ul {
list-style-type: disc;
ul {
list-style-type: circle;
ul {
list-style-type: square;
}
}
}
}
\ No newline at end of file
app/assets/stylesheets/framework/mobile.scss
View file @ 2674b548
......@@ -52,6 +52,19 @@
.git-clone-holder {
display: none;
}
// Display Star and Fork buttons without counters on mobile.
.project-action-buttons {
display: block;
.count-buttons .btn {
margin: 0 10px;
}
.count-buttons .count-with-arrow {
display: none;
}
}
}
.project-stats {
......
app/assets/stylesheets/framework/nav.scss
View file @ 2674b548
......@@ -18,6 +18,13 @@
opacity: 0;
transition-duration: .3s;
}
.fa {
position: relative;
top: 3px;
font-size: 13px;
color: $btn-placeholder-gray;
}
}
@mixin scrolling-links() {
......@@ -74,6 +81,7 @@
.container-fluid {
background-color: $background-color;
margin-bottom: 0;
}
li {
......@@ -103,10 +111,6 @@
width: 50%;
line-height: 28px;
&.wiki-page {
padding: 16px 10px 11px;
}
/* Small devices (phones, tablets, 768px and lower) */
@media (max-width: $screen-sm-min) {
width: 100%;
......@@ -135,7 +139,7 @@
}
/* Small devices (phones, tablets, 768px and lower) */
@media (max-width: $screen-sm-max) {
@media (max-width: $screen-xs-max) {
width: 100%;
}
}
......@@ -219,6 +223,7 @@
form {
display: block;
height: auto;
margin-bottom: 14px;
input {
width: 100%;
......@@ -241,6 +246,12 @@
}
}
}
&.adjust {
.nav-text, .nav-controls {
width: auto;
}
}
}
.layout-nav {
......@@ -250,7 +261,7 @@
z-index: 11;
background: $background-color;
border-bottom: 1px solid $border-color;
transition-duration: .3s;
transition: padding $sidebar-transition-duration;
text-align: center;
.container-fluid {
......@@ -280,11 +291,10 @@
}
.dropdown {
margin-left: 7px;
@media (max-width: $screen-xs-min) {
margin-left: 0;
}
position: absolute;
top: 7px;
right: 15px;
z-index: 2;
li.active {
font-weight: bold;
......@@ -313,11 +323,19 @@
.fade-right {
@include fade(left, rgba(250, 250, 250, 0.4), $background-color);
right: 0;
.fa {
right: -7px;
}
}
.fade-left {
@include fade(right, rgba(250, 250, 250, 0.4), $background-color);
left: 0;
.fa {
left: -7px;
}
}
li {
......@@ -347,6 +365,12 @@
.badge {
color: $gl-icon-color;
}
&:hover {
a, i {
color: $black;
}
}
}
}
......
app/assets/stylesheets/framework/panels.scss
View file @ 2674b548
......@@ -9,6 +9,10 @@
margin-top: -2px;
float: right;
}
.dropdown-menu-toggle {
line-height: 20px;
}
}
.panel-body {
......
app/assets/stylesheets/framework/selects.scss
View file @ 2674b548
......@@ -165,11 +165,6 @@
background-size: 16px 16px !important;
}
/** Branch/tag selector **/
.project-refs-form .select2-container {
width: 160px !important;
}
.select2-results .select2-no-results,
.select2-results .select2-searching,
.select2-results .select2-ajax-error,
......
app/assets/stylesheets/framework/sidebar.scss
View file @ 2674b548
.page-with-sidebar {
padding-top: $header-height;
transition-duration: .3s;
transition: padding $sidebar-transition-duration;
.sidebar-wrapper {
position: fixed;
top: 0;
bottom: 0;
overflow-y: auto;
overflow-x: hidden;
left: 0;
height: 100%;
transition-duration: .3s;
overflow: hidden;
transition: width $sidebar-transition-duration;
}
}
.sidebar-wrapper {
z-index: 1000;
background: $background-color;
.nicescroll-rails-hr {
// TODO: Figure out why nicescroll doesn't hide horizontal bar
display: none!important;
}
}
.content-wrapper {
width: 100%;
transition: padding $sidebar-transition-duration;
.container-fluid {
background: #fff;
......@@ -34,58 +39,52 @@
}
}
.sidebar-wrapper {
.sidebar-user {
padding: 15px 22px;
position: fixed;
bottom: 0;
width: $sidebar_width;
overflow: hidden;
transition-duration: .3s;
.sidebar-user {
padding: 15px;
position: absolute;
left: 0;
bottom: 0;
width: $sidebar_width;
overflow: hidden;
font-size: 16px;
line-height: 36px;
transition: width $sidebar-transition-duration, padding $sidebar-transition-duration;
.username {
margin-left: 10px;
width: $sidebar_width - 2 * 10px;
font-size: 16px;
line-height: 34px;
}
@media (min-width: $sidebar-breakpoint) {
bottom: 50px;
}
}
.nav-sidebar {
position: absolute;
top: 50px;
bottom: 65px;
width: $sidebar_width;
overflow-y: auto;
overflow-x: hidden;
.tanuki-shape {
transition: all 0.8s;
&:hover, &.highlight {
fill: rgb(255, 255, 255);
transition: all 0.1s;
@media (min-width: $sidebar-breakpoint) {
bottom: 115px;
}
}
.nav-sidebar {
margin-top: 22 + $header-height;
margin-bottom: 116px;
transition-duration: .3s;
list-style: none;
overflow: hidden;
&.navbar-collapse {
padding: 0 !important;
}
li {
width: $sidebar_width;
&.separate-item {
padding-top: 10px;
margin-top: 10px;
}
.icon-container {
width: 34px;
display: inline-block;
text-align: center;
}
a {
width: $sidebar_width;
padding: 7px 15px 7px 23px;
padding: 7px 15px 7px 12px;
font-size: $gl-font-size;
line-height: 24px;
display: block;
......@@ -93,11 +92,9 @@
font-weight: normal;
outline: none;
&:hover {
text-decoration: none;
}
&:active, &:focus {
&:hover,
&:active,
&:focus {
text-decoration: none;
}
......@@ -109,10 +106,6 @@
svg {
margin-right: 13px;
}
&.back-link i {
transition-duration: .3s;
}
}
}
......@@ -123,37 +116,50 @@
}
}
.sidebar-subnav {
margin-left: 0;
padding-left: 0;
li {
list-style: none;
}
}
.collapse-nav a {
.toggle-nav-collapse {
width: $sidebar_width;
position: fixed;
position: absolute;
top: 0;
left: 0;
min-height: 50px;
padding: 5px 0;
font-size: 18px;
background: transparent;
height: 50px;
text-align: center;
line-height: 40px;
line-height: 30px;
}
.nav-header-btn {
padding: 10px 5px;
color: inherit;
transition-duration: .3s;
outline: none;
&:hover {
&:hover,
&:focus {
color: $white-light;
text-decoration: none;
}
}
.sidebar-wrapper {
&.hidden-nav {
width: 0;
.pin-nav-btn {
display: none;
position: absolute;
left: 0;
bottom: 0;
height: 50px;
width: $sidebar_width;
line-height: 30px;
@media (min-width: $sidebar-breakpoint) {
display: block;
}
.fa {
transition: transform .15s;
}
&.is-active {
.fa {
transform: rotate(90deg);
}
}
}
......@@ -162,62 +168,34 @@
.sidebar-wrapper {
width: 0;
.nav-sidebar {
width: 0;
li {
width: auto;
a {
span {
display: none;
}
}
}
}
.collapse-nav a {
width: 0;
i {
display: none;
}
}
.sidebar-user {
width: 0;
padding-left: 0;
padding-right: 0;
.username {
display: none;
}
}
}
}
.page-sidebar-expanded {
@media (max-width: $screen-sm-max) {
padding-left: 0;
}
.sidebar-wrapper {
width: $sidebar_width;
}
}
.nav-sidebar {
width: $sidebar_width;
.page-sidebar-pinned {
.content-wrapper,
.layout-nav {
@media (min-width: $sidebar-breakpoint) {
padding-left: $sidebar_width;
}
}
}
.nav-sidebar li a {
width: $sidebar_width;
header.header-pinned-nav {
@media (min-width: $sidebar-breakpoint) {
padding-left: ($sidebar_width + $gl-padding);
&.back-link {
i {
opacity: 0;
}
}
.side-nav-toggle {
display: none;
}
.header-content {
padding-left: 0;
}
}
}
......
app/assets/stylesheets/framework/variables.scss
View file @ 2674b548
......@@ -6,6 +6,8 @@ $sidebar_width: 220px;
$gutter_collapsed_width: 62px;
$gutter_width: 290px;
$gutter_inner_width: 258px;
$sidebar-transition-duration: .15s;
$sidebar-breakpoint: 1440px;
/*
* UI elements
......@@ -154,6 +156,11 @@ $warning-message-border: #f0e2bb;
/* header */
$light-grey-header: #faf9f9;
/* tanuki logo colors */
$tanuki-red: #e24329;
$tanuki-orange: #fc6d26;
$tanuki-yellow: #fca326;
/*
* State colors:
*/
......@@ -261,5 +268,10 @@ $calendar-hover-bg: #ecf3fe;
$calendar-border-color: rgba(#000, .1);
$calendar-unselectable-bg: #faf9f9;
/*
* Personal Access Tokens
*/
$personal-access-tokens-disabled-label-color: #bbb;
$ci-output-bg: #1d1f21;
$ci-text-color: #c5c8c6;
app/assets/stylesheets/mailers/devise.scss
View file @ 2674b548
......@@ -38,6 +38,10 @@ table {
margin: 0 auto;
text-align: left;
width: 600px;
& > td {
text-align: center;
}
}
&#body {
......
app/assets/stylesheets/pages/commit.scss
View file @ 2674b548
......@@ -26,6 +26,8 @@
.commit-info-row {
margin-bottom: 10px;
line-height: 24px;
padding-top: 6px;
&.commit-info-row-header {
line-height: 34px;
......
app/assets/stylesheets/pages/commits.scss
View file @ 2674b548
......@@ -7,84 +7,119 @@
margin-right: 9px;
}
.lists-separator {
margin: 10px 0;
border-color: #ddd;
.commit-header {
padding: 5px 10px;
background-color: $background-color;
border-top: 1px solid #eee;
border-bottom: 1px solid #eee;
font-size: 14px;
&:first-child {
border-top-width: 0;
}
}
.commits-row {
ul {
margin: 0;
.commit-row-title {
line-height: 1;
margin-bottom: 7px;
li.commit {
padding: 8px 0;
}
.notes_count {
float: right;
margin-right: 10px;
}
.str-truncated {
max-width: 70%;
}
.commits-row-date {
font-size: 15px;
line-height: 20px;
margin-bottom: 5px;
.commit-row-message {
color: $gl-dark-link-color;
}
.text-expander {
display: inline-block;
background: $gray-light;
color: $gl-placeholder-color;
padding: 0 5px;
cursor: pointer;
border: 1px solid $border-gray-dark;
border-radius: $border-radius-default;
margin-left: 5px;
&:hover {
background-color: darken($gray-light, 10%);
text-decoration: none;
}
}
}
li.commit {
list-style: none;
.commit-actions {
@media (min-width: $screen-sm-min) {
float: right;
margin-left: $gl-padding;
margin-top: 2px;
font-size: 0;
}
.commit-row-title {
font-size: $list-font-size;
line-height: 20px;
margin-bottom: 2px;
.btn-transparent {
padding-left: 0;
padding-right: 0;
}
.btn-clipboard {
margin-top: -1px;
.btn {
&:not(:first-child) {
margin-left: $gl-padding;
}
}
}
.notes_count {
float: right;
margin-right: 10px;
}
.commit-short-id {
font-family: $monospace_font;
font-weight: 600;
}
.commit_short_id {
min-width: 65px;
color: $gl-dark-link-color;
font-family: $monospace_font;
}
.commit {
padding: 10px 0;
position: relative;
.str-truncated {
max-width: 70%;
@media (min-width: $screen-sm-min) {
padding-left: 20px;
.commit-info-block {
padding-left: 44px;
}
}
.commit-row-message {
color: $gl-dark-link-color;
&:not(:last-child) {
border-bottom: 1px solid #eee;
}
&:hover {
text-decoration: underline;
}
}
a,
button {
color: $gl-dark-link-color;
vertical-align: baseline;
}
.text-expander {
background: #eee;
color: #555;
padding: 0 5px;
cursor: pointer;
margin-left: 4px;
&:hover {
background-color: #ddd;
}
}
.avatar {
position: absolute;
top: 10px;
left: 16px;
}
.item-title {
display: inline-block;
max-width: 70%;
@media (min-width: $screen-sm-min) {
max-width: 70%;
}
}
.commit-row-description {
font-size: 14px;
border-left: 1px solid #eee;
padding: 10px 15px;
margin: 5px 0 10px 5px;
margin: 10px 0;
background: #f9f9f9;
display: none;
......@@ -93,6 +128,7 @@ li.commit {
background: inherit;
padding: 0;
margin: 0;
white-space: pre-wrap;
}
a {
......@@ -102,7 +138,7 @@ li.commit {
.commit-row-info {
color: $gl-gray;
line-height: 24px;
line-height: 1;
a {
color: $gl-gray;
......@@ -111,10 +147,6 @@ li.commit {
.avatar {
margin-right: 8px;
}
.committed_ago {
display: inline-block;
}
}
&.inline-commit {
......
app/assets/stylesheets/pages/diff.scss
View file @ 2674b548
......@@ -4,6 +4,11 @@
margin-bottom: $gl-padding;
border-radius: 3px;
.commit-short-id {
font-family: $regular_font;
font-weight: 400;
}
.diff-header {
position: relative;
background: $background-color;
......
app/assets/stylesheets/pages/editor.scss
View file @ 2674b548
......@@ -60,14 +60,14 @@
.encoding-selector,
.license-selector,
.gitignore-selector {
.gitignore-selector,
.gitlab-ci-yml-selector {
display: inline-block;
vertical-align: top;
font-family: $regular_font;
}
.gitignore-selector {
.gitignore-selector, .license-selector, .gitlab-ci-yml-selector {
.dropdown {
line-height: 21px;
}
......@@ -77,4 +77,10 @@
width: 220px;
}
}
.gitlab-ci-yml-selector {
.dropdown-menu-toggle {
width: 250px;
}
}
}
app/assets/stylesheets/pages/environments.scss 0 → 100644
View file @ 2674b548
.environments {
.commit-title {
margin: 0;
}
}
app/assets/stylesheets/pages/events.scss
View file @ 2674b548
......@@ -54,6 +54,10 @@
}
}
code {
white-space: pre-wrap;
}
pre {
border: none;
background: #f9f9f9;
......@@ -136,9 +140,10 @@
.event-last-push {
overflow: auto;
width: 100%;
.event-last-push-text {
@include str-truncated(100%);
padding: 5px 0;
padding: 4px 0;
font-size: 13px;
float: left;
margin-right: -150px;
......
app/assets/stylesheets/pages/groups.scss
View file @ 2674b548
......@@ -39,3 +39,20 @@
}
}
}
.groups-cover-block {
.container-fluid {
position: relative;
}
.access-request-button {
@include btn-gray;
position: absolute;
right: 16px;
bottom: 32px;
padding: 3px 10px;
text-transform: none;
background-color: $background-color;
}
}
app/assets/stylesheets/pages/help.scss
View file @ 2674b548
......@@ -57,4 +57,11 @@
.documentation {
padding: 7px;
// Border around images in the help pages.
img:not(.emoji) {
border: 1px solid $table-border-gray;
padding: 5px;
margin: 5px;
}
}
app/assets/stylesheets/pages/issuable.scss
View file @ 2674b548
......@@ -4,6 +4,13 @@
margin-right: 1px;
}
}
// Border around images in issue and MR descriptions.
.description img:not(.emoji) {
border: 1px solid $table-border-gray;
padding: 5px;
margin: 5px;
}
}
.issuable-filter-count {
......@@ -34,6 +41,10 @@
color: inherit;
}
.issuable-header-text {
margin-top: 7px;
}
.block {
@include clearfix;
padding: $gl-padding 0;
......@@ -60,10 +71,6 @@
margin-top: 0;
}
.issuable-count {
margin-top: 7px;
}
.gutter-toggle {
margin-left: 20px;
padding-left: 10px;
......@@ -145,7 +152,6 @@
.assign-yourself {
margin-top: 10px;
font-weight: normal;
display: block;
}
}
......@@ -158,6 +164,10 @@
font-weight: normal;
}
.no-value {
color: $gl-placeholder-color;
}
.sidebar-collapsed-icon {
display: none;
}
......@@ -248,11 +258,16 @@
padding-bottom: 0;
margin-bottom: 10px;
}
.issuable-header-btn {
display: none;
}
}
.issuable-pager {
.issuable-header-btn {
background: $gray-normal;
border: 1px solid $border-gray-normal;
&:hover {
background: $gray-dark;
border: 1px solid $border-gray-dark;
......@@ -263,7 +278,7 @@
}
}
a:not(.issuable-pager) {
a {
&:hover {
color: $md-link-color;
text-decoration: none;
......@@ -322,7 +337,7 @@
margin-left: 5px;
a {
color: #8c8c8c;
color: $gl-placeholder-color;
}
}
......
app/assets/stylesheets/pages/labels.scss
View file @ 2674b548
......@@ -50,11 +50,10 @@
.label-row {
.label-name {
display: block;
display: inline-block;
margin-bottom: 10px;
@media (min-width: $screen-sm-min) {
display: inline-block;
width: 200px;
margin-bottom: 0;
}
......@@ -63,6 +62,7 @@
.label-description {
display: block;
margin-bottom: 10px;
margin-left: 50px;
@media (min-width: $screen-sm-min) {
display: inline-block;
......@@ -115,6 +115,13 @@
}
}
.draggable-handler {
display: inline-block;
opacity: 0;
transition: opacity .3s;
color: $gray-darkest;
}
.prioritized-labels {
margin-bottom: 30px;
......@@ -122,6 +129,13 @@
display: none;
color: $gray-light;
}
li:hover {
.draggable-handler {
display: inline-block;
opacity: 1;
}
}
}
.other-labels {
......
app/assets/stylesheets/pages/merge_requests.scss
View file @ 2674b548
......@@ -119,7 +119,12 @@
margin-bottom: 0;
}
@media (max-width: $screen-sm-max) {
.btn-grouped {
margin-left: 0;
margin-right: 7px;
}
@media (max-width: $screen-xs-max) {
h4 {
font-size: 15px;
}
......@@ -131,10 +136,14 @@
.btn,
.btn-group,
.accept-action {
width: 100%;
margin-bottom: 4px;
}
.accept-action {
width: 100%;
text-align: center;
}
.accept-control {
width: 100%;
text-align: center;
......@@ -244,6 +253,10 @@
.panel-footer {
padding: 5px 10px;
.btn {
min-width: auto;
}
}
.commit {
......@@ -252,9 +265,7 @@
}
.avatar {
width: 20px;
height: 20px;
margin-right: 5px;
margin-left: 0;
}
.commit-row-info {
......@@ -282,7 +293,7 @@
margin-bottom: 0;
}
@media (min-width: $screen-sm-min) {
@media (min-width: $screen-xs-min) {
float: left;
width: 50%;
margin-bottom: 0;
......@@ -313,3 +324,13 @@
}
}
}
.merged-buttons {
.btn {
float: left;
&:not(:last-child) {
margin-right: 10px;
}
}
}
app/assets/stylesheets/pages/note_form.scss
View file @ 2674b548
......@@ -179,6 +179,10 @@
border-top: 1px solid $border-color;
}
.md-helper {
padding-top: 10px;
}
.toolbar-button {
padding: 0;
background: none;
......@@ -219,3 +223,16 @@
float: left;
}
}
.note-form-actions {
@media (max-width: $screen-xs-max) {
.btn {
float: none;
width: 100%;
&:not(:last-child) {
margin-bottom: 10px;
}
}
}
}
app/assets/stylesheets/pages/notes.scss
View file @ 2674b548
......@@ -84,24 +84,14 @@ ul.notes {
word-wrap: break-word;
@include md-typography;
// Reset ul style types since we're nested inside a ul already
@include bulleted-list;
// On diffs code should wrap nicely and not overflow
code {
white-space: pre-wrap;
}
// Reset ul style types since we're nested inside a ul already
& > ul {
list-style-type: disc;
ul {
list-style-type: circle;
ul {
list-style-type: square;
}
}
}
ul.task-list {
ul:not(.task-list) {
padding-left: 1.3em;
......@@ -117,6 +107,13 @@ ul.notes {
code {
word-break: keep-all;
}
// Border around images in issue and MR comments.
img:not(.emoji) {
border: 1px solid $table-border-gray;
padding: 5px;
margin: 5px 0;
}
}
}
......@@ -139,6 +136,12 @@ ul.notes {
@media (min-width: $screen-sm-min) {
padding-right: 0;
}
@media (max-width: $screen-xs-min) {
.inline {
display: block;
}
}
}
.note-emoji-button {
......@@ -258,7 +261,11 @@ ul.notes {
position: absolute;
right: 0;
top: 0;
.note-action-button {
margin-left: 10px;
}
@media (min-width: $screen-sm-min) {
position: relative;
}
......
app/assets/stylesheets/pages/profile.scss
View file @ 2674b548
......@@ -192,6 +192,25 @@
}
}
.personal-access-tokens-never-expires-label {
color: $personal-access-tokens-disabled-label-color;
}
.datepicker.personal-access-tokens-expires-at .ui-state-disabled span {
text-align: center;
}
.created-personal-access-token-container {
#created-personal-access-token {
width: 90%;
display: inline;
}
.btn-clipboard {
margin-left: 5px;
}
}
.user-profile {
@media (max-width: $screen-xs-max) {
.cover-block {
......
app/assets/stylesheets/pages/projects.scss
View file @ 2674b548
......@@ -5,10 +5,12 @@
font-weight: normal;
}
}
.no-ssh-key-message, .project-limit-message {
background-color: #f28d35;
margin-bottom: 0;
}
.new_project,
.edit-project {
fieldset.features {
......@@ -18,13 +20,6 @@
}
}
.project-name-holder {
.help-inline {
vertical-align: top;
padding: 7px;
}
}
.project-home-panel {
background: $white-light;
text-align: left;
......@@ -33,7 +28,7 @@
.container-fluid {
position: relative;
@media (min-width: $screen-md-max) {
@media (min-width: $screen-lg-min) {
.row {
display: flex;
-ms-flex-align: center;
......@@ -106,7 +101,8 @@
.notifications-btn {
.fa-bell {
.fa-bell,
.fa-spinner {
margin-right: 6px;
}
......@@ -224,13 +220,20 @@
right: 16px;
bottom: 0;
.btn {
padding: 3px 10px;
background-color: $background-color;
@media (max-width: $screen-md-max) {
top: 0;
}
@media (max-width: 1304px) {
top: 0;
.access-request-button {
position: absolute;
right: 0;
bottom: 61px;
@media (max-width: $screen-md-max) {
position: relative;
bottom: 0;
margin-right: 10px;
}
}
}
......@@ -281,10 +284,6 @@
color: #555;
}
.project_member_row form {
margin: 0;
}
.transfer-project .select2-container {
min-width: 200px;
}
......@@ -368,13 +367,14 @@ a.deploy-project-label {
.project-import .btn {
float: left;
margin-bottom: 10px;
margin-right: 10px;
}
.project-stats {
margin-top: $gl-padding;
margin-bottom: 0;
padding: 16px 0;
padding: 0;
background-color: $white-light;
font-size: 0;
......@@ -383,13 +383,14 @@ a.deploy-project-label {
}
.nav li {
display: inline;
display: inline-block;
margin: 16px 0;
margin-right: 16px;
}
.nav > li > a {
background-color: transparent;
margin-right: 12px;
padding: 0 10px;
padding: 5px 10px;
font-size: 15px;
color: $notes-light-color;
}
......@@ -403,12 +404,17 @@ a.deploy-project-label {
font-size: 17px;
}
li.missing a {
color: #5a6069;
border: 1px dashed #dce0e5;
li.missing {
border: 1px dashed $border-gray-light;
border-radius: $border-radius-default;
a {
color: $notes-light-color;
display: block;
}
&:hover {
background-color: #f0f2f5;
background-color: $gray-normal;
}
}
......@@ -495,7 +501,8 @@ pre.light-well {
.activity-filter-block {
.controls {
padding-bottom: 10px;
padding-bottom: 7px;
margin-top: 8px;
border-bottom: 1px solid $border-color;
}
}
......@@ -616,3 +623,9 @@ pre.light-well {
color: $gl-text-green;
}
}
.project-refs-form {
.dropdown-menu {
width: 300px;
}
}
app/assets/stylesheets/pages/stat_graph.scss
View file @ 2674b548
......@@ -14,24 +14,38 @@
font-size: 10px;
}
#contributors-master {
@include make-md-column(12);
svg {
width: 100%;
}
}
#contributors {
.contributors-list {
margin: 0 0 10px;
list-style: none;
padding: 0;
svg {
width: 100%;
}
}
.person {
&:nth-child(even) {
float: right;
}
float: left;
@include make-md-column(6);
margin-top: 10px;
@media (max-width: $screen-sm-min) {
width: 100%;
}
}
.person .spark {
display: block;
background: #f3f3f3;
width: 100%;
}
.person .area-contributor {
......
app/assets/stylesheets/pages/todos.scss
View file @ 2674b548
......@@ -62,6 +62,10 @@
}
}
code {
white-space: pre-wrap;
}
pre {
border: none;
background: #f9f9f9;
......
app/assets/stylesheets/pages/tree.scss
View file @ 2674b548
......@@ -101,7 +101,7 @@
margin: 0;
.commit {
padding: 0;
padding: 0 0 0 55px;
.commit-row-title {
.commit-row-message {
......@@ -129,4 +129,6 @@
.tree-controls {
float: right;
margin-top: 11px;
position: relative;
z-index: 2;
}
app/controllers/admin/appearances_controller.rb
View file @ 2674b548
......@@ -5,6 +5,7 @@ class Admin::AppearancesController < Admin::ApplicationController
end
def preview
render 'preview', layout: 'devise'
end
def create
......
app/controllers/admin/runner_projects_controller.rb
View file @ 2674b548
class Admin::RunnerProjectsController < Admin::ApplicationController
before_action :project, only: [:create]
def index
@runner_projects = project.runner_projects.all
@runner_project = project.runner_projects.new
end
def create
@runner = Ci::Runner.find(params[:runner_project][:runner_id])
if @runner.assign_to(@project, current_user)
return head(403) if @runner.is_shared? || @runner.locked?
runner_project = @runner.assign_to(@project, current_user)
if runner_project.persisted?
redirect_to admin_runner_path(@runner)
else
redirect_to admin_runner_path(@runner), alert: 'Failed adding runner to project'
......
app/controllers/application_controller.rb
View file @ 2674b548
......@@ -8,7 +8,7 @@ class ApplicationController < ActionController::Base
include PageLayoutHelper
include WorkhorseHelper
before_action :authenticate_user_from_token!
before_action :authenticate_user_from_private_token!
before_action :authenticate_user!
before_action :validate_user_service_ticket!
before_action :reject_blocked!
......@@ -24,7 +24,7 @@ class ApplicationController < ActionController::Base
protect_from_forgery with: :exception
helper_method :abilities, :can?, :current_application_settings
helper_method :import_sources_enabled?, :github_import_enabled?, :github_import_configured?, :gitlab_import_enabled?, :gitlab_import_configured?, :bitbucket_import_enabled?, :bitbucket_import_configured?, :gitorious_import_enabled?, :google_code_import_enabled?, :fogbugz_import_enabled?, :git_import_enabled?
helper_method :import_sources_enabled?, :github_import_enabled?, :github_import_configured?, :gitlab_import_enabled?, :gitlab_import_configured?, :bitbucket_import_enabled?, :bitbucket_import_configured?, :gitorious_import_enabled?, :google_code_import_enabled?, :fogbugz_import_enabled?, :git_import_enabled?, :gitlab_project_import_enabled?
rescue_from Encoding::CompatibilityError do |exception|
log_exception(exception)
......@@ -36,6 +36,10 @@ class ApplicationController < ActionController::Base
render_404
end
rescue_from Gitlab::Access::AccessDeniedError do |exception|
render_403
end
def redirect_back_or_default(default: root_path, options: {})
redirect_to request.referer.present? ? :back : default, options
end
......@@ -64,17 +68,10 @@ class ApplicationController < ActionController::Base
end
end
# From https://github.com/plataformatec/devise/wiki/How-To:-Simple-Token-Authentication-Example
# https://gist.github.com/josevalim/fb706b1e933ef01e4fb6
def authenticate_user_from_token!
user_token = if params[:authenticity_token].presence
params[:authenticity_token].presence
elsif params[:private_token].presence
params[:private_token].presence
elsif request.headers['PRIVATE-TOKEN'].present?
request.headers['PRIVATE-TOKEN']
end
user = user_token && User.find_by_authentication_token(user_token.to_s)
# This filter handles both private tokens and personal access tokens
def authenticate_user_from_private_token!
token_string = params[:private_token].presence || request.headers['PRIVATE-TOKEN'].presence
user = User.find_by_authentication_token(token_string) || User.find_by_personal_access_token(token_string)
if user
# Notice we are passing store false, so the user is not
......@@ -326,6 +323,10 @@ class ApplicationController < ActionController::Base
current_application_settings.import_sources.include?('git')
end
def gitlab_project_import_enabled?
current_application_settings.import_sources.include?('gitlab_project')
end
def two_factor_authentication_required?
current_application_settings.require_two_factor_authentication
end
......
app/controllers/autocomplete_controller.rb
View file @ 2674b548
......@@ -35,6 +35,7 @@ class AutocompleteController < ApplicationController
project = Project.find_by_id(params[:project_id])
projects = current_user.authorized_projects
projects = projects.search(params[:search]) if params[:search].present?
projects = projects.select do |project|
current_user.can?(:admin_issue, project)
end
......
app/controllers/concerns/membership_actions.rb 0 → 100644
View file @ 2674b548
module MembershipActions
extend ActiveSupport::Concern
include MembersHelper
def request_access
membershipable.request_access(current_user)
redirect_to polymorphic_path(membershipable),
notice: 'Your request for access has been queued for review.'
end
def approve_access_request
@member = membershipable.members.request.find(params[:id])
return render_403 unless can?(current_user, action_member_permission(:update, @member), @member)
@member.accept_request
redirect_to polymorphic_url([membershipable, :members])
end
def leave
@member = membershipable.members.find_by(user_id: current_user)
Members::DestroyService.new(@member, current_user).execute
source_type = @member.real_source_type.humanize(capitalize: false)
notice =
if @member.request?
"Your access request to the #{source_type} has been withdrawn."
else
"You left the \"#{@member.source.human_name}\" #{source_type}."
end
redirect_path = @member.request? ? @member.source : [:dashboard, @member.real_source_type.tableize]
redirect_to redirect_path, notice: notice
end
protected
def membershipable
raise NotImplementedError
end
end
app/controllers/dashboard/todos_controller.rb
View file @ 2674b548
class Dashboard::TodosController < Dashboard::ApplicationController
before_action :find_todos, only: [:index, :destroy, :destroy_all]
include TodosHelper
before_action :find_todos, only: [:index, :destroy_all]
def index
@todos = @todos.page(params[:page])
end
def destroy
todo.done
todo_notice = 'Todo was successfully marked as done.'
TodoService.new.mark_todos_as_done([todo], current_user)
respond_to do |format|
format.html { redirect_to dashboard_todos_path, notice: todo_notice }
format.html { redirect_to dashboard_todos_path, notice: 'Todo was successfully marked as done.' }
format.js { head :ok }
format.json do
render json: { count: @todos.size, done_count: current_user.todos.done.count }
end
format.json { render json: { count: todos_pending_count, done_count: todos_done_count } }
end
end
def destroy_all
@todos.each(&:done)
TodoService.new.mark_todos_as_done(@todos, current_user)
respond_to do |format|
format.html { redirect_to dashboard_todos_path, notice: 'All todos were marked as done.' }
format.js { head :ok }
format.json do
find_todos
render json: { count: @todos.size, done_count: current_user.todos.done.count }
end
format.json { render json: { count: todos_pending_count, done_count: todos_done_count } }
end
end
private
def todo
@todo ||= current_user.todos.find(params[:id])
@todo ||= find_todos.find(params[:id])
end
def find_todos
@todos = TodosFinder.new(current_user, params).execute
@todos ||= TodosFinder.new(current_user, params).execute
end
end
app/controllers/groups/group_members_controller.rb
View file @ 2674b548
class Groups::GroupMembersController < Groups::ApplicationController
include MembershipActions
# Authorize
before_action :authorize_admin_group_member!, except: [:index, :leave]
before_action :authorize_admin_group_member!, except: [:index, :leave, :request_access]
def index
@project = @group.projects.find(params[:project_id]) if params[:project_id]
@members = @group.group_members
@members = @members.non_invite unless can?(current_user, :admin_group, @group)
@members = @members.non_pending unless can?(current_user, :admin_group, @group)
if params[:search].present?
users = @group.users.search(params[:search]).to_a
......@@ -34,9 +36,7 @@ class Groups::GroupMembersController < Groups::ApplicationController
def destroy
@group_member = @group.group_members.find(params[:id])
return render_403 unless can?(current_user, :destroy_group_member, @group_member)
@group_member.destroy
Members::DestroyService.new(@group_member, current_user).execute
respond_to do |format|
format.html { redirect_to group_group_members_path(@group), notice: 'User was successfully removed from group.' }
......@@ -58,25 +58,12 @@ class Groups::GroupMembersController < Groups::ApplicationController
end
end
def leave
@group_member = @group.group_members.find_by(user_id: current_user)
if can?(current_user, :destroy_group_member, @group_member)
@group_member.destroy
redirect_to(dashboard_groups_path, notice: "You left #{group.name} group.")
else
if @group.last_owner?(current_user)
redirect_to(dashboard_groups_path, alert: "You can not leave #{group.name} group because you're the last owner. Transfer or delete the group.")
else
return render_403
end
end
end
protected
def member_params
params.require(:group_member).permit(:access_level, :user_id)
end
# MembershipActions concern
alias_method :membershipable, :group
end
app/controllers/import/gitlab_projects_controller.rb 0 → 100644
View file @ 2674b548
class Import::GitlabProjectsController < Import::BaseController
before_action :verify_gitlab_project_import_enabled
def new
@namespace_id = project_params[:namespace_id]
@namespace_name = Namespace.find(project_params[:namespace_id]).name
@path = project_params[:path]
end
def create
unless file_is_valid?
return redirect_back_or_default(options: { alert: "You need to upload a GitLab project export archive." })
end
@project = Gitlab::ImportExport::ProjectCreator.new(project_params[:namespace_id],
current_user,
File.expand_path(project_params[:file].path),
project_params[:path]).execute
if @project.saved?
redirect_to(
project_path(@project),
notice: "Project '#{@project.name}' is being imported."
)
else
redirect_to(
new_import_gitlab_project_path,
alert: "Project could not be imported: #{@project.errors.full_messages.join(', ')}"
)
end
end
private
def file_is_valid?
project_params[:file] && project_params[:file].respond_to?(:read)
end
def verify_gitlab_project_import_enabled
render_404 unless gitlab_project_import_enabled?
end
def project_params
params.permit(
:path, :namespace_id, :file
)
end
end
app/controllers/notification_settings_controller.rb
View file @ 2674b548
......@@ -39,7 +39,7 @@ class NotificationSettingsController < ApplicationController
def render_response
render json: {
html: view_to_html_string("notifications/buttons/_notifications", notification_setting: @notification_setting),
html: view_to_html_string("shared/notifications/_button", notification_setting: @notification_setting),
saved: @saved
}
end
......
app/controllers/profiles/accounts_controller.rb
View file @ 2674b548
......@@ -5,7 +5,7 @@ class Profiles::AccountsController < Profiles::ApplicationController
def unlink
provider = params[:provider]
current_user.identities.find_by(provider: provider).destroy
current_user.identities.find_by(provider: provider).destroy unless provider.to_s == 'saml'
redirect_to profile_account_path
end
end
app/controllers/profiles/personal_access_tokens_controller.rb 0 → 100644
View file @ 2674b548
class Profiles::PersonalAccessTokensController < Profiles::ApplicationController
before_action :load_personal_access_tokens, only: :index
def index
@personal_access_token = current_user.personal_access_tokens.build
end
def create
@personal_access_token = current_user.personal_access_tokens.generate(personal_access_token_params)
if @personal_access_token.save
flash[:personal_access_token] = @personal_access_token.token
redirect_to profile_personal_access_tokens_path, notice: "Your new personal access token has been created."
else
load_personal_access_tokens
render :index
end
end
def revoke
@personal_access_token = current_user.personal_access_tokens.find(params[:id])
if @personal_access_token.revoke!
flash[:notice] = "Revoked personal access token #{@personal_access_token.name}!"
else
flash[:alert] = "Could not revoke personal access token #{@personal_access_token.name}."
end
redirect_to profile_personal_access_tokens_path
end
private
def personal_access_token_params
params.require(:personal_access_token).permit(:name, :expires_at)
end
def load_personal_access_tokens
@active_personal_access_tokens = current_user.personal_access_tokens.active.order(:expires_at)
@inactive_personal_access_tokens = current_user.personal_access_tokens.inactive
end
end
app/controllers/projects/application_controller.rb
View file @ 2674b548
......@@ -74,7 +74,7 @@ class Projects::ApplicationController < ApplicationController
end
def require_branch_head
unless @repository.branch_names.include?(@ref)
unless @repository.branch_exists?(@ref)
redirect_to(
namespace_project_tree_path(@project.namespace, @project, @ref),
notice: "This action is not allowed unless you are on a branch"
......
app/controllers/projects/artifacts_controller.rb
View file @ 2674b548
class Projects::ArtifactsController < Projects::ApplicationController
layout 'project'
before_action :authorize_read_build!
before_action :authorize_update_build!, only: [:keep]
before_action :validate_artifacts!
def download
unless artifacts_file.file_storage?
return redirect_to artifacts_file.url
end
unless artifacts_file.exists?
return render_404
end
send_file artifacts_file.path, disposition: 'attachment'
end
def browse
return render_404 unless build.artifacts?
directory = params[:path] ? "#{params[:path]}/" : ''
@entry = build.artifacts_metadata_entry(directory)
......@@ -34,8 +30,17 @@ class Projects::ArtifactsController < Projects::ApplicationController
end
end
def keep
build.keep_artifacts!
redirect_to namespace_project_build_path(project.namespace, project, build)
end
private
def validate_artifacts!
render_404 unless build.artifacts?
end
def build
@build ||= project.builds.find_by!(id: params[:build_id])
end
......
app/controllers/projects/builds_controller.rb
View file @ 2674b548
......@@ -51,7 +51,7 @@ class Projects::BuildsController < Projects::ApplicationController
return render_404
end
build = Ci::Build.retry(@build)
build = Ci::Build.retry(@build, current_user)
redirect_to build_path(build)
end
......
app/controllers/projects/commit_controller.rb
View file @ 2674b548
......@@ -46,7 +46,7 @@ class Projects::CommitController < Projects::ApplicationController
def retry_builds
ci_builds.latest.failed.each do |build|
if build.retryable?
Ci::Build.retry(build)
Ci::Build.retry(build, current_user)
end
end
......
app/controllers/projects/environments_controller.rb 0 → 100644
View file @ 2674b548
class Projects::EnvironmentsController < Projects::ApplicationController
layout 'project'
before_action :authorize_read_environment!
before_action :authorize_create_environment!, only: [:new, :create]
before_action :authorize_update_environment!, only: [:destroy]
before_action :environment, only: [:show, :destroy]
def index
@environments = project.environments
end
def show
@deployments = environment.deployments.order(id: :desc).page(params[:page])
end
def new
@environment = project.environments.new
end
def create
@environment = project.environments.create(create_params)
if @environment.persisted?
redirect_to namespace_project_environment_path(project.namespace, project, @environment)
else
render 'new'
end
end
def destroy
if @environment.destroy
flash[:notice] = 'Environment was successfully removed.'
else
flash[:alert] = 'Failed to remove environment.'
end
redirect_to namespace_project_environments_path(project.namespace, project)
end
private
def create_params
params.require(:environment).permit(:name)
end
def environment
@environment ||= project.environments.find(params[:id])
end
end
app/controllers/projects/merge_requests_controller.rb
View file @ 2674b548
......@@ -204,10 +204,19 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@merge_request.update(merge_error: nil)
if params[:merge_when_build_succeeds].present? && @merge_request.pipeline && @merge_request.pipeline.active?
MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user, merge_params)
.execute(@merge_request)
@status = :merge_when_build_succeeds
if params[:merge_when_build_succeeds].present?
if @merge_request.pipeline && @merge_request.pipeline.active?
MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user, merge_params)
.execute(@merge_request)
@status = :merge_when_build_succeeds
elsif @merge_request.pipeline.success?
# This can be triggered when a user clicks the auto merge button while
# the tests finish at about the same time
MergeWorker.perform_async(@merge_request.id, current_user.id, params)
@status = :success
else
@status = :failed
end
else
MergeWorker.perform_async(@merge_request.id, current_user.id, params)
@status = :success
......
app/controllers/projects/tags_controller.rb
View file @ 2674b548
This diff is collapsed.
app/controllers/projects/todos_controller.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/controllers/projects_controller.rb
View file @ 2674b548
This diff is collapsed.
app/controllers/sessions_controller.rb
View file @ 2674b548
This diff is collapsed.
app/finders/notes_finder.rb
View file @ 2674b548
This diff is collapsed.
app/finders/snippets_finder.rb
View file @ 2674b548
This diff is collapsed.
app/finders/todos_finder.rb
View file @ 2674b548
This diff is collapsed.
app/helpers/application_helper.rb
View file @ 2674b548
This diff is collapsed.
app/helpers/blob_helper.rb
View file @ 2674b548
This diff is collapsed.
app/helpers/branches_helper.rb
View file @ 2674b548
This diff is collapsed.
app/helpers/button_helper.rb
View file @ 2674b548
This diff is collapsed.
app/helpers/ci_status_helper.rb
View file @ 2674b548
This diff is collapsed.
app/helpers/commits_helper.rb
View file @ 2674b548
This diff is collapsed.
app/helpers/diff_helper.rb
View file @ 2674b548
This diff is collapsed.
app/helpers/gitlab_markdown_helper.rb
View file @ 2674b548
This diff is collapsed.
app/helpers/gitlab_routing_helper.rb
View file @ 2674b548
This diff is collapsed.
app/helpers/groups_helper.rb
View file @ 2674b548
This diff is collapsed.
app/helpers/issuables_helper.rb
View file @ 2674b548
This diff is collapsed.
app/helpers/members_helper.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/helpers/nav_helper.rb
View file @ 2674b548
This diff is collapsed.
app/helpers/notifications_helper.rb
View file @ 2674b548
This diff is collapsed.
app/helpers/projects_helper.rb
View file @ 2674b548
This diff is collapsed.
app/helpers/time_helper.rb
View file @ 2674b548
This diff is collapsed.
app/helpers/todos_helper.rb
View file @ 2674b548
This diff is collapsed.
app/mailers/emails/groups.rb deleted 100644 → 0
View file @ 8447c6b1
This diff is collapsed.
app/mailers/emails/members.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/mailers/emails/projects.rb
View file @ 2674b548
This diff is collapsed.
app/mailers/notify.rb
View file @ 2674b548
This diff is collapsed.
app/models/ability.rb
View file @ 2674b548
This diff is collapsed.
app/models/application_setting.rb
View file @ 2674b548
This diff is collapsed.
app/models/blob.rb
View file @ 2674b548
This diff is collapsed.
app/models/ci/build.rb
View file @ 2674b548
This diff is collapsed.
app/models/ci/pipeline.rb
View file @ 2674b548
This diff is collapsed.
app/models/ci/runner.rb
View file @ 2674b548
This diff is collapsed.
app/models/commit.rb
View file @ 2674b548
This diff is collapsed.
app/models/commit_status.rb
View file @ 2674b548
This diff is collapsed.
app/models/concerns/access_requestable.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/models/concerns/awardable.rb
View file @ 2674b548
This diff is collapsed.
app/models/concerns/importable.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/models/concerns/participable.rb
View file @ 2674b548
This diff is collapsed.
app/models/concerns/referable.rb
View file @ 2674b548
This diff is collapsed.
app/models/deployment.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/models/environment.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/models/group.rb
View file @ 2674b548
This diff is collapsed.
app/models/issue.rb
View file @ 2674b548
This diff is collapsed.
app/models/jira_issue.rb deleted 100644 → 0
View file @ 8447c6b1
This diff is collapsed.
app/models/key.rb
View file @ 2674b548
This diff is collapsed.
app/models/member.rb
View file @ 2674b548
This diff is collapsed.
app/models/members/group_member.rb
View file @ 2674b548
This diff is collapsed.
app/models/members/project_member.rb
View file @ 2674b548
This diff is collapsed.
app/models/merge_request.rb
View file @ 2674b548
This diff is collapsed.
app/models/merge_request_diff.rb
View file @ 2674b548
This diff is collapsed.
app/models/note.rb
View file @ 2674b548
This diff is collapsed.
app/models/notification_setting.rb
View file @ 2674b548
This diff is collapsed.
app/models/personal_access_token.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/models/project.rb
View file @ 2674b548
This diff is collapsed.
app/models/project_team.rb
View file @ 2674b548
This diff is collapsed.
app/models/repository.rb
View file @ 2674b548
This diff is collapsed.
app/models/service.rb
View file @ 2674b548
This diff is collapsed.
app/models/todo.rb
View file @ 2674b548
This diff is collapsed.
app/models/user.rb
View file @ 2674b548
This diff is collapsed.
app/services/ci/create_builds_service.rb
View file @ 2674b548
This diff is collapsed.
app/services/ci/create_pipeline_service.rb
View file @ 2674b548
This diff is collapsed.
app/services/ci/register_build_service.rb
View file @ 2674b548
This diff is collapsed.
app/services/create_deployment_service.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/services/git_hooks_service.rb
View file @ 2674b548
This diff is collapsed.
app/services/members/destroy_service.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/services/notification_service.rb
View file @ 2674b548
This diff is collapsed.
app/services/projects/create_service.rb
View file @ 2674b548
This diff is collapsed.
app/services/projects/import_export/export_service.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/services/projects/import_service.rb
View file @ 2674b548
This diff is collapsed.
app/services/todo_service.rb
View file @ 2674b548
This diff is collapsed.
app/views/admin/appearances/_form.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/admin/appearances/show.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/admin/background_jobs/_head.html.haml 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/admin/builds/index.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/admin/dashboard/_head.html.haml 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/admin/dashboard/index.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/admin/groups/index.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/admin/groups/show.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/admin/health_check/show.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/admin/logs/show.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/admin/projects/index.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/admin/projects/show.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/admin/runners/index.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/admin/runners/show.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/admin/users/groups.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/admin/users/index.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/admin/users/projects.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/devise/mailer/password_change.html.haml 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/devise/mailer/password_change.text.erb 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/devise/mailer/reset_password_instructions.html.haml 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/devise/mailer/reset_password_instructions.text.erb 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/devise/mailer/unlock_instructions.text.erb 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/groups/group_members/_group_member.html.haml deleted 100644 → 0
View file @ 8447c6b1
This diff is collapsed.
app/views/groups/show.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/help/_shortcuts.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/import/github/status.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/import/gitlab_projects/new.html.haml 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/issues/_issue.atom.builder
View file @ 2674b548
This diff is collapsed.
app/views/layouts/_page.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/layouts/_search.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/layouts/admin.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/layouts/application.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/layouts/header/_default.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/layouts/nav/_admin.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/layouts/nav/_admin_settings.html.haml 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/layouts/nav/_dashboard.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/layouts/nav/_group.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/layouts/nav/_profile.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/layouts/nav/_project.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/notify/group_access_granted_email.html.haml deleted 100644 → 0
View file @ 8447c6b1
This diff is collapsed.
app/views/notify/group_access_granted_email.text.erb deleted 100644 → 0
View file @ 8447c6b1
This diff is collapsed.
app/views/notify/group_invite_accepted_email.html.haml deleted 100644 → 0
View file @ 8447c6b1
This diff is collapsed.
app/views/notify/group_invite_accepted_email.text.erb deleted 100644 → 0
View file @ 8447c6b1
This diff is collapsed.
app/views/notify/group_invite_declined_email.html.haml deleted 100644 → 0
View file @ 8447c6b1
This diff is collapsed.
app/views/notify/group_invite_declined_email.text.erb deleted 100644 → 0
View file @ 8447c6b1
This diff is collapsed.
app/views/notify/member_access_denied_email.html.haml 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/notify/member_access_denied_email.text.erb 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/notify/member_access_granted_email.html.haml 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/notify/member_access_granted_email.text.erb 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/notify/member_access_requested_email.html.haml 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/notify/member_access_requested_email.text.erb 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/notify/member_invite_accepted_email.html.haml 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/notify/member_invite_accepted_email.text.erb 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/notify/member_invite_declined_email.html.haml 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/notify/member_invite_declined_email.text.erb 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/notify/project_access_granted_email.text.erb deleted 100644 → 0
View file @ 8447c6b1
This diff is collapsed.
app/views/notify/project_member_invited_email.text.erb deleted 100644 → 0
View file @ 8447c6b1
This diff is collapsed.
app/views/notify/project_was_exported_email.html.haml 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/notify/project_was_exported_email.text.erb 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/notify/project_was_not_exported_email.html.haml 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/notify/project_was_not_exported_email.text.haml 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/profiles/accounts/show.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/profiles/personal_access_tokens/index.html.haml 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/projects/_home_panel.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/_last_push.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/_md_preview.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/badges/index.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/blob/_editor.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/builds/show.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/buttons/_star.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/commits/_head.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/commits/show.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/compare/index.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/compare/show.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/deployments/_commit.html.haml 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/projects/deployments/_deployment.html.haml 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/projects/diffs/_diffs.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/diffs/_file.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/edit.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/environments/_environment.html.haml 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/projects/environments/_form.html.haml 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/projects/environments/_header_title.html.haml 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/projects/environments/index.html.haml 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/projects/environments/new.html.haml 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/projects/environments/show.html.haml 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/projects/forks/index.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/graphs/_head.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/graphs/ci.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/graphs/commits.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/graphs/show.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/imports/show.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/issues/_head.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/labels/index.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/network/show.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/new.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/notes/_form.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/notes/_hints.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/notes/_note.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/runners/_form.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/runners/show.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/show.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/tags/_tag.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/tags/index.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/wikis/_nav.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/wikis/_new.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/wikis/edit.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/wikis/history.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/wikis/pages.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/projects/wikis/show.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/shared/_event_filter.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/shared/_label_row.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/shared/_ref_switcher.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/shared/groups/_group.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/shared/issuable/_filter.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/shared/issuable/_form.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/shared/members/_access_request_buttons.html.haml 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/shared/members/_member.html.haml 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/shared/members/_requests.html.haml 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/views/shared/projects/_list.html.haml
View file @ 2674b548
This diff is collapsed.
app/views/u2f/_register.html.haml
View file @ 2674b548
This diff is collapsed.
app/workers/expire_build_artifacts_worker.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/workers/gitlab_remove_project_export_worker.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/workers/project_export_worker.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
app/workers/stuck_ci_builds_worker.rb
View file @ 2674b548
This diff is collapsed.
bin/spring
View file @ 2674b548
This diff is collapsed.
config/application.rb
View file @ 2674b548
This diff is collapsed.
config/gitlab.yml.example
View file @ 2674b548
This diff is collapsed.
config/initializers/1_settings.rb
View file @ 2674b548
This diff is collapsed.
config/initializers/chronic_duration.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
config/initializers/default_url_options.rb
View file @ 2674b548
This diff is collapsed.
config/initializers/metrics.rb
View file @ 2674b548
This diff is collapsed.
config/initializers/sidekiq.rb
View file @ 2674b548
This diff is collapsed.
config/routes.rb
View file @ 2674b548
This diff is collapsed.
db/fixtures/development/15_award_emoji.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
db/migrate/20160314114439_add_requested_at_to_members.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
db/migrate/20160415062917_create_personal_access_tokens.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
db/migrate/20160416190505_remove_note_is_award.rb deleted 100644 → 0
View file @ 8447c6b1
This diff is collapsed.
db/migrate/20160509091049_add_locked_to_ci_runner.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
db/migrate/20160610204157_add_deployments.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
db/migrate/20160610204158_add_environments.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
db/migrate/20160610211845_add_environment_to_builds.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
db/migrate/20160615191922_set_missing_stage_on_ci_builds.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
db/migrate/20160616084004_change_project_of_environment.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
db/migrate/20160616102642_remove_duplicated_keys.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
db/migrate/20160620115026_add_index_on_runners_locked.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
db/schema.rb
View file @ 2674b548
This diff is collapsed.
doc/README.md
View file @ 2674b548
This diff is collapsed.
doc/administration/container_registry.md
View file @ 2674b548
This diff is collapsed.
doc/administration/raketasks/project_import_export.md 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/api/README.md
View file @ 2674b548
This diff is collapsed.
doc/api/award_emoji.md 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/api/builds.md
View file @ 2674b548
This diff is collapsed.
doc/api/ci/README.md 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/api/ci/builds.md 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/api/ci/runners.md 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/api/issues.md
View file @ 2674b548
This diff is collapsed.
doc/api/sidekiq_metrics.md 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/ci/README.md
View file @ 2674b548
This diff is collapsed.
doc/ci/api/README.md
View file @ 2674b548
This diff is collapsed.
doc/ci/api/builds.md
View file @ 2674b548
This diff is collapsed.
doc/ci/api/runners.md
View file @ 2674b548
This diff is collapsed.
doc/ci/docker/using_docker_build.md
View file @ 2674b548
This diff is collapsed.
doc/ci/docker/using_docker_images.md
View file @ 2674b548
This diff is collapsed.
doc/ci/environments.md 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/ci/examples/README.md
View file @ 2674b548
This diff is collapsed.
doc/ci/examples/php.md
View file @ 2674b548
This diff is collapsed.
doc/ci/examples/test-scala-application.md 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/ci/pipelines.md 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/ci/quick_start/README.md
View file @ 2674b548
This diff is collapsed.
doc/ci/quick_start/img/pipelines_status.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/ci/runners/README.md
View file @ 2674b548
This diff is collapsed.
doc/ci/variables/README.md
View file @ 2674b548
This diff is collapsed.
doc/ci/yaml/README.md
View file @ 2674b548
This diff is collapsed.
doc/container_registry/README.md
View file @ 2674b548
This diff is collapsed.
doc/development/doc_styleguide.md
View file @ 2674b548
This diff is collapsed.
doc/development/instrumentation.md
View file @ 2674b548
This diff is collapsed.
doc/development/migration_style_guide.md
View file @ 2674b548
This diff is collapsed.
doc/intro/README.md
View file @ 2674b548
This diff is collapsed.
doc/permissions/permissions.md
View file @ 2674b548
This diff is collapsed.
doc/project_services/emails_on_push.md 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/project_services/img/emails_on_push_service.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/project_services/project_services.md
View file @ 2674b548
This diff is collapsed.
doc/update/8.6-to-8.7.md
View file @ 2674b548
This diff is collapsed.
doc/user/project/img/labels_assign_label_in_new_issue.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/user/project/img/labels_assign_label_sidebar.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/user/project/img/labels_assign_label_sidebar_saved.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/user/project/img/labels_default.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/user/project/img/labels_description_tooltip.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/user/project/img/labels_filter.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/user/project/img/labels_filter_by_priority.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/user/project/img/labels_generate.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/user/project/img/labels_new_label.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/user/project/img/labels_new_label_on_the_fly.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/user/project/img/labels_new_label_on_the_fly_create.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/user/project/img/labels_prioritize.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/user/project/img/labels_subscribe.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/user/project/labels.md 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/user/project/settings/img/import_export_download_export.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/user/project/settings/img/import_export_export_button.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/user/project/settings/img/import_export_mail_link.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/user/project/settings/img/import_export_new_project.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/user/project/settings/img/import_export_select_file.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/user/project/settings/img/settings_edit_button.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/user/project/settings/import_export.md 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/workflow/README.md
View file @ 2674b548
This diff is collapsed.
doc/workflow/add-user/add-user.md
View file @ 2674b548
This diff is collapsed.
doc/workflow/add-user/img/access_requests_management.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/workflow/add-user/img/request_access_button.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/workflow/add-user/img/withdraw_access_request_button.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/workflow/award_emoji.md
View file @ 2674b548
This diff is collapsed.
doc/workflow/award_emoji.png
View file @ 2674b548
This diff is collapsed.
doc/workflow/groups.md
View file @ 2674b548
This diff is collapsed.
doc/workflow/groups/access_requests_management.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/workflow/groups/request_access_button.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/workflow/groups/withdraw_access_request_button.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/workflow/img/award_emoji_comment_awarded.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/workflow/img/award_emoji_comment_picker.png 0 → 100644
View file @ 2674b548
This diff is collapsed.
doc/workflow/labels.md
View file @ 2674b548
This diff is collapsed.
doc/workflow/labels/label1.png deleted 100644 → 0
View file @ 8447c6b1
This diff is collapsed.
doc/workflow/labels/label2.png deleted 100644 → 0
View file @ 8447c6b1
This diff is collapsed.
doc/workflow/labels/label3.png deleted 100644 → 0
View file @ 8447c6b1
This diff is collapsed.
doc/workflow/notifications.md
View file @ 2674b548
This diff is collapsed.
doc/workflow/notifications/settings.png
View file @ 2674b548
This diff is collapsed.
doc/workflow/shortcuts.png
View file @ 2674b548
This diff is collapsed.
features/admin/active_tab.feature
View file @ 2674b548
This diff is collapsed.
features/admin/groups.feature
View file @ 2674b548
This diff is collapsed.
features/dashboard/group.feature
View file @ 2674b548
This diff is collapsed.
features/dashboard/new_project.feature
View file @ 2674b548
This diff is collapsed.
features/dashboard/todos.feature
View file @ 2674b548
This diff is collapsed.
features/project/active_tab.feature
View file @ 2674b548
This diff is collapsed.
features/project/shortcuts.feature
View file @ 2674b548
This diff is collapsed.
features/steps/admin/active_tab.rb
View file @ 2674b548
This diff is collapsed.
features/steps/admin/groups.rb
View file @ 2674b548
This diff is collapsed.
features/steps/dashboard/group.rb
View file @ 2674b548
This diff is collapsed.
features/steps/dashboard/new_project.rb
View file @ 2674b548
This diff is collapsed.
features/steps/dashboard/todos.rb
View file @ 2674b548
This diff is collapsed.
features/steps/group/members.rb
View file @ 2674b548
This diff is collapsed.
features/steps/profile/notifications.rb
View file @ 2674b548
This diff is collapsed.
features/steps/project/network_graph.rb
View file @ 2674b548
This diff is collapsed.
features/steps/project/project.rb
View file @ 2674b548
This diff is collapsed.
features/steps/project/project_find_file.rb
View file @ 2674b548
This diff is collapsed.
features/steps/project/team_management.rb
View file @ 2674b548
This diff is collapsed.
features/steps/shared/project_tab.rb
View file @ 2674b548
This diff is collapsed.
lib/api/api.rb
View file @ 2674b548
This diff is collapsed.
lib/api/award_emoji.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/api/builds.rb
View file @ 2674b548
This diff is collapsed.
lib/api/entities.rb
View file @ 2674b548
This diff is collapsed.
lib/api/gitignores.rb deleted 100644 → 0
View file @ 8447c6b1
This diff is collapsed.
lib/api/helpers.rb
View file @ 2674b548
This diff is collapsed.
lib/api/internal.rb
View file @ 2674b548
This diff is collapsed.
lib/api/notes.rb
View file @ 2674b548
This diff is collapsed.
lib/api/project_members.rb
View file @ 2674b548
This diff is collapsed.
lib/api/runners.rb
View file @ 2674b548
This diff is collapsed.
lib/api/sidekiq_metrics.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/api/templates.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/banzai.rb
View file @ 2674b548
This diff is collapsed.
lib/banzai/filter/external_link_filter.rb
View file @ 2674b548
This diff is collapsed.
lib/banzai/filter/issue_reference_filter.rb
View file @ 2674b548
This diff is collapsed.
lib/banzai/filter/relative_link_filter.rb
View file @ 2674b548
This diff is collapsed.
lib/banzai/filter/upload_link_filter.rb
View file @ 2674b548
This diff is collapsed.
lib/banzai/filter/wiki_link_filter.rb
View file @ 2674b548
This diff is collapsed.
lib/banzai/pipeline/description_pipeline.rb
View file @ 2674b548
This diff is collapsed.
lib/banzai/reference_parser/issue_parser.rb
View file @ 2674b548
This diff is collapsed.
lib/banzai/renderer.rb
View file @ 2674b548
This diff is collapsed.
lib/ci/api/builds.rb
View file @ 2674b548
This diff is collapsed.
lib/ci/api/entities.rb
View file @ 2674b548
This diff is collapsed.
lib/ci/api/runners.rb
View file @ 2674b548
This diff is collapsed.
lib/ci/gitlab_ci_yaml_processor.rb
View file @ 2674b548
This diff is collapsed.
lib/container_registry/blob.rb
View file @ 2674b548
This diff is collapsed.
lib/container_registry/client.rb
View file @ 2674b548
This diff is collapsed.
lib/container_registry/tag.rb
View file @ 2674b548
This diff is collapsed.
lib/gitlab/access.rb
View file @ 2674b548
This diff is collapsed.
lib/gitlab/backend/grack_auth.rb
View file @ 2674b548
This diff is collapsed.
lib/gitlab/backend/shell_env.rb deleted 100644 → 0
View file @ 8447c6b1
This diff is collapsed.
lib/gitlab/ci/config.rb
View file @ 2674b548
This diff is collapsed.
lib/gitlab/ci/config/node/configurable.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/ci/config/node/entry.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/ci/config/node/factory.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/ci/config/node/global.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/ci/config/node/null.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/ci/config/node/script.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/ci/config/node/validation_helpers.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/current_settings.rb
View file @ 2674b548
This diff is collapsed.
lib/gitlab/database.rb
View file @ 2674b548
This diff is collapsed.
lib/gitlab/database/migration_helpers.rb
View file @ 2674b548
This diff is collapsed.
lib/gitlab/email/message/repository_push.rb
View file @ 2674b548
This diff is collapsed.
lib/gitlab/github_import/importer.rb
View file @ 2674b548
This diff is collapsed.
lib/gitlab/gitignore.rb deleted 100644 → 0
View file @ 8447c6b1
This diff is collapsed.
lib/gitlab/gitlab_import/project_creator.rb
View file @ 2674b548
This diff is collapsed.
lib/gitlab/gl_id.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/import_export.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/import_export/attributes_finder.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/import_export/command_line_util.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/import_export/error.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/import_export/file_importer.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/import_export/import_export.yml 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/import_export/importer.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/import_export/members_mapper.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/import_export/project_creator.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/import_export/project_tree_restorer.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/import_export/project_tree_saver.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/import_export/reader.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/import_export/relation_factory.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/import_export/repo_restorer.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/import_export/repo_saver.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/import_export/saver.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/import_export/shared.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/import_export/uploads_restorer.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/import_export/uploads_saver.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/import_export/version_checker.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/import_export/version_saver.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/import_export/wiki_repo_saver.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/import_sources.rb
View file @ 2674b548
This diff is collapsed.
lib/gitlab/lfs/response.rb
View file @ 2674b548
This diff is collapsed.
lib/gitlab/lfs/router.rb
View file @ 2674b548
This diff is collapsed.
lib/gitlab/metrics/instrumentation.rb
View file @ 2674b548
This diff is collapsed.
lib/gitlab/metrics/method_call.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/metrics/rack_middleware.rb
View file @ 2674b548
This diff is collapsed.
lib/gitlab/metrics/sampler.rb
View file @ 2674b548
This diff is collapsed.
lib/gitlab/metrics/transaction.rb
View file @ 2674b548
This diff is collapsed.
lib/gitlab/regex.rb
View file @ 2674b548
This diff is collapsed.
lib/gitlab/template/base_template.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/template/gitignore.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/template/gitlab_ci_yml.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/gitlab/workhorse.rb
View file @ 2674b548
This diff is collapsed.
lib/tasks/gitlab/import_export.rake 0 → 100644
View file @ 2674b548
This diff is collapsed.
lib/tasks/gitlab/update_gitignore.rake deleted 100644 → 0
View file @ 8447c6b1
This diff is collapsed.
lib/tasks/gitlab/update_templates.rake 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/controllers/blob_controller_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/controllers/profiles/accounts_controller_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/controllers/projects/todo_controller_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/factories/deployments.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/factories/environments.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/factories/personal_access_tokens.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/factories/projects.rb
View file @ 2674b548
This diff is collapsed.
spec/features/admin/admin_hooks_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/features/admin/admin_runners_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/features/atom/dashboard_issues_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/features/builds_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/features/container_registry_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/features/environments_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/features/groups/members/member_leaves_group_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/features/groups/members/user_requests_access_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/features/issues/filter_issues_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/features/issues/move_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/features/issues/todo_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/features/issues_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/features/profiles/personal_access_tokens_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/features/projects/badges/list_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/features/projects/import_export/import_file_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/features/projects/import_export/test_project_export.tar.gz 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/features/projects/members/member_leaves_project_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/features/projects/members/user_requests_access_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/features/projects_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/features/search_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/features/todos/todos_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/features/u2f_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/finders/notes_finder_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/fixtures/container_registry/tag_manifest_1.json 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/helpers/application_helper_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/helpers/gitlab_routing_helper_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/helpers/issues_helper_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/helpers/members_helper_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/helpers/merge_requests_helper_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/helpers/projects_helper_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/javascripts/application_spec.js.coffee 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/javascripts/fixtures/application.html.haml 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/javascripts/fixtures/search_autocomplete.html.haml 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/javascripts/issue_spec.js.coffee
View file @ 2674b548
This diff is collapsed.
spec/javascripts/notes_spec.js.coffee
View file @ 2674b548
This diff is collapsed.
spec/javascripts/search_autocomplete_spec.js.coffee 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/lib/banzai/filter/abstract_link_filter_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/lib/banzai/filter/wiki_link_filter_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/lib/container_registry/tag_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/lib/gitlab/ci/config/node/configurable_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/lib/gitlab/ci/config/node/factory_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/lib/gitlab/ci/config/node/global_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/lib/gitlab/ci/config/node/null_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/lib/gitlab/ci/config/node/script_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/lib/gitlab/ci/config_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/lib/gitlab/import_export/members_mapper_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/lib/gitlab/import_export/project.json 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/lib/gitlab/import_export/project_tree_restorer_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/lib/gitlab/import_export/project_tree_saver_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/lib/gitlab/import_export/reader_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/lib/gitlab/import_export/repo_bundler_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/lib/gitlab/import_export/wiki_repo_bundler_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/lib/gitlab/lfs/lfs_router_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/lib/gitlab/metrics/method_call_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/lib/gitlab/metrics/sampler_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/lib/gitlab/metrics/transaction_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/lib/gitlab/reference_extractor_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/lib/gitlab/search_results_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/mailers/notify_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/models/build_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/models/ci/pipeline_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/models/ci/runner_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/models/commit_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/models/commit_status_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/models/concerns/access_requestable_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/models/concerns/milestoneish_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/models/concerns/participable_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/models/deployment_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/models/environment_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/models/event_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/models/group_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/models/jira_issue_spec.rb deleted 100644 → 0
View file @ 8447c6b1
This diff is collapsed.
spec/models/key_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/models/member_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/models/members/group_member_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/models/members/project_member_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/models/note_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/models/personal_access_token_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/models/project_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/models/project_team_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/models/repository_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/requests/api/api_helpers_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/requests/api/award_emoji_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/requests/api/builds_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/requests/api/issues_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/requests/api/milestones_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/requests/api/projects_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/requests/api/runners_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/requests/api/sidekiq_metrics_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/requests/ci/api/builds_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/requests/git_http_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/services/create_deployment_service_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/services/git_push_service_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/services/members/destroy_service_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/services/notification_service_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/services/system_note_service_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/services/todo_service_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/support/import_export/import_export.yml 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/support/test_env.rb
View file @ 2674b548
This diff is collapsed.
spec/workers/expire_build_artifacts_worker_spec.rb 0 → 100644
View file @ 2674b548
This diff is collapsed.
spec/workers/merge_worker_spec.rb
View file @ 2674b548
This diff is collapsed.
spec/workers/stuck_ci_builds_worker_spec.rb
View file @ 2674b548
This diff is collapsed.
vendor/assets/javascripts/raphael.js 0 → 100644
View file @ 2674b548
This diff is collapsed.
vendor/gitignore/Android.gitignore
View file @ 2674b548
This diff is collapsed.
vendor/gitignore/C++.gitignore
View file @ 2674b548
This diff is collapsed.
vendor/gitignore/CMake.gitignore
View file @ 2674b548
This diff is collapsed.
vendor/gitignore/D.gitignore
View file @ 2674b548
This diff is collapsed.
vendor/gitignore/Global/Bazaar.gitignore 0 → 100644
View file @ 2674b548
This diff is collapsed.
vendor/gitignore/Global/OSX.gitignore
View file @ 2674b548
This diff is collapsed.
vendor/gitignore/Global/README.md 0 → 100644
View file @ 2674b548
This diff is collapsed.
vendor/gitignore/Haskell.gitignore
View file @ 2674b548
This diff is collapsed.
vendor/gitignore/Julia.gitignore 0 → 100644
View file @ 2674b548
This diff is collapsed.
vendor/gitignore/LICENSE 0 → 100644
View file @ 2674b548
This diff is collapsed.
vendor/gitignore/Laravel.gitignore
View file @ 2674b548
This diff is collapsed.
vendor/gitignore/Objective-C.gitignore
View file @ 2674b548
This diff is collapsed.
vendor/gitignore/Qt.gitignore
View file @ 2674b548
This diff is collapsed.
vendor/gitignore/README.md deleted 100644 → 0
View file @ 8447c6b1
This diff is collapsed.
vendor/gitignore/Rails.gitignore
View file @ 2674b548
This diff is collapsed.
vendor/gitignore/Swift.gitignore
View file @ 2674b548
This diff is collapsed.
vendor/gitignore/UnrealEngine.gitignore
View file @ 2674b548
This diff is collapsed.
vendor/gitignore/VisualStudio.gitignore
View file @ 2674b548
This diff is collapsed.
vendor/gitlab-ci-yml/Docker.gitlab-ci.yml 0 → 100644
View file @ 2674b548
This diff is collapsed.
vendor/gitlab-ci-yml/Elixir.gitlab-ci.yml 0 → 100644
View file @ 2674b548
This diff is collapsed.
vendor/gitlab-ci-yml/LICENSE 0 → 100644
View file @ 2674b548
This diff is collapsed.
vendor/gitlab-ci-yml/Nodejs.gitlab-ci.yml 0 → 100644
View file @ 2674b548
This diff is collapsed.
vendor/gitlab-ci-yml/Pages/brunch.gitlab-ci.yml 0 → 100644
View file @ 2674b548
This diff is collapsed.
vendor/gitlab-ci-yml/Pages/doxygen.gitlab-ci.yml 0 → 100644
View file @ 2674b548
This diff is collapsed.
vendor/gitlab-ci-yml/Pages/harp.gitlab-ci.yml 0 → 100644
View file @ 2674b548
This diff is collapsed.
vendor/gitlab-ci-yml/Pages/hexo.gitlab-ci.yml 0 → 100644
View file @ 2674b548
This diff is collapsed.
vendor/gitlab-ci-yml/Pages/html.gitlab-ci.yml 0 → 100644
View file @ 2674b548
This diff is collapsed.
vendor/gitlab-ci-yml/Pages/hugo.gitlab-ci.yml 0 → 100644
View file @ 2674b548
This diff is collapsed.
vendor/gitlab-ci-yml/Pages/hyde.gitlab-ci.yml 0 → 100644
View file @ 2674b548
This diff is collapsed.
vendor/gitlab-ci-yml/Pages/jekyll.gitlab-ci.yml 0 → 100644
View file @ 2674b548
This diff is collapsed.
vendor/gitlab-ci-yml/Pages/lektor.gitlab-ci.yml 0 → 100644
View file @ 2674b548
This diff is collapsed.
vendor/gitlab-ci-yml/Pages/metalsmith.gitlab-ci.yml 0 → 100644
View file @ 2674b548
This diff is collapsed.
vendor/gitlab-ci-yml/Pages/middleman.gitlab-ci.yml 0 → 100644
View file @ 2674b548
This diff is collapsed.
vendor/gitlab-ci-yml/Pages/nanoc.gitlab-ci.yml 0 → 100644
View file @ 2674b548
This diff is collapsed.
vendor/gitlab-ci-yml/Pages/octopress.gitlab-ci.yml 0 → 100644
View file @ 2674b548
This diff is collapsed.
vendor/gitlab-ci-yml/Pages/pelican.gitlab-ci.yml 0 → 100644
View file @ 2674b548
This diff is collapsed.
vendor/gitlab-ci-yml/Ruby.gitlab-ci.yml 0 → 100644
View file @ 2674b548
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7