Skip to content

G
gitlab-ce
Commit 452c076a authored by James Lopez's avatar James Lopez
Browse files
Options

Revert "squashed merge and fixed conflicts" 

This reverts commit 13e37a3e.
parent 13e37a3e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3046 additions and 16721 deletions
.gitlab-ci.yml
View file @ 452c076a
......@@ -7,8 +7,7 @@ services:
cache:
key: "ruby21"
paths:
- vendor/apt
- vendor/ruby
- vendor
variables:
MYSQL_ALLOW_EMPTY_PASSWORD: "1"
......@@ -92,7 +91,9 @@ 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 '[ ! -e tmp/spinach-rerun.txt ] || bundle exec spinach -r rerun $(cat tmp/spinach-rerun.txt)'
- knapsack spinach "-r rerun"
# retry failed tests 3 times
- retry '[ ! -e tmp/spinach-rerun.txt ] || bin/spinach -r rerun $(cat tmp/spinach-rerun.txt)'
artifacts:
paths:
- knapsack/
......
.rubocop.yml
View file @ 452c076a
......@@ -349,7 +349,7 @@ Style/MultilineArrayBraceLayout:
# Avoid multi-line chains of blocks.
Style/MultilineBlockChain:
Enabled: true
Enabled: false
# Ensures newlines after multiline block do statements.
Style/MultilineBlockLayout:
......
CHANGELOG
View file @ 452c076a
This diff is collapsed.
Gemfile
View file @ 452c076a
......@@ -210,9 +210,6 @@ 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'
......@@ -227,6 +224,7 @@ 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'
......@@ -247,7 +245,7 @@ end
group :development do
gem "foreman"
gem 'brakeman', '~> 3.3.0', require: false
gem 'brakeman', '~> 3.2.0', require: false
gem 'letter_opener_web', '~> 1.3.0'
gem 'quiet_assets', '~> 1.0.2'
......
Gemfile.lock
View file @ 452c076a
......@@ -50,7 +50,7 @@ GEM
after_commit_queue (1.3.0)
activerecord (>= 3.0)
akismet (2.0.0)
allocations (1.0.5)
allocations (1.0.4)
arel (6.0.3)
asana (0.4.0)
faraday (~> 0.9)
......@@ -97,7 +97,16 @@ GEM
bootstrap-sass (3.3.6)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
brakeman (3.3.2)
brakeman (3.2.1)
erubis (~> 2.6)
haml (>= 3.0, < 5.0)
highline (>= 1.6.20, < 2.0)
ruby2ruby (~> 2.3.0)
ruby_parser (~> 3.8.1)
safe_yaml (>= 1.0)
sass (~> 3.0)
slim (>= 1.3.6, < 4.0)
terminal-table (~> 1.4)
browser (2.0.3)
builder (3.2.2)
bullet (5.0.0)
......@@ -124,8 +133,6 @@ 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)
......@@ -277,7 +284,7 @@ GEM
posix-spawn (~> 0.3)
gitlab_emoji (0.3.1)
gemojione (~> 2.2, >= 2.2.1)
gitlab_git (10.1.3)
gitlab_git (10.1.0)
activesupport (~> 4.0)
charlock_holmes (~> 0.7.3)
github-linguist (~> 4.7.0)
......@@ -331,6 +338,7 @@ GEM
hashie (3.4.3)
health_check (1.5.1)
rails (>= 2.3.0)
highline (1.7.8)
hipchat (1.5.2)
httparty
mimemagic
......@@ -400,7 +408,7 @@ GEM
mime-types (>= 1.16, < 4)
mail_room (0.7.0)
method_source (0.8.2)
mime-types (2.99.2)
mime-types (2.99.1)
mimemagic (0.3.0)
mini_portile2 (2.1.0)
minitest (5.7.0)
......@@ -416,7 +424,6 @@ 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)
......@@ -556,6 +563,7 @@ 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)
......@@ -634,7 +642,10 @@ GEM
ruby-saml (1.1.2)
nokogiri (>= 1.5.10)
uuid (~> 2.3)
ruby_parser (3.8.2)
ruby2ruby (2.3.0)
ruby_parser (~> 3.1)
sexp_processor (~> 4.0)
ruby_parser (3.8.1)
sexp_processor (~> 4.1)
rubyntlm (0.5.2)
rubypants (0.2.0)
......@@ -644,7 +655,7 @@ GEM
safe_yaml (1.0.4)
sanitize (2.1.0)
nokogiri (>= 1.4.4)
sass (3.4.22)
sass (3.4.21)
sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
sass (~> 3.1)
......@@ -693,6 +704,9 @@ GEM
tilt (>= 1.3, < 3)
six (0.2.0)
slack-notifier (1.2.1)
slim (3.0.6)
temple (~> 0.7.3)
tilt (>= 1.3.3, < 2.1)
slop (3.6.0)
spinach (0.8.10)
colorize
......@@ -733,8 +747,10 @@ GEM
railties (>= 3.2.5, < 6)
teaspoon-jasmine (2.2.0)
teaspoon (>= 1.0.0)
temple (0.7.6)
term-ansicolor (1.3.2)
tins (~> 1.0)
terminal-table (1.5.2)
test_after_commit (0.4.2)
activerecord (>= 3.2)
thin (1.6.4)
......@@ -743,7 +759,7 @@ GEM
rack (~> 1.0)
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.5)
tilt (2.0.2)
timecop (0.8.1)
timfel-krb5-auth (0.8.3)
tinder (1.10.1)
......@@ -832,7 +848,7 @@ DEPENDENCIES
better_errors (~> 1.0.1)
binding_of_caller (~> 0.7.2)
bootstrap-sass (~> 3.3.0)
brakeman (~> 3.3.0)
brakeman (~> 3.2.0)
browser (~> 2.0.3)
bullet
bundler-audit
......@@ -841,7 +857,6 @@ 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)
......@@ -937,6 +952,7 @@ 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 @ 452c076a
......@@ -42,10 +42,10 @@ class @LabelManager
$from = @prioritizedLabels
if $from.find('li').length is 1
$from.find('.empty-message').removeClass('hidden')
$from.find('.empty-message').show()
if not $target.find('li').length
$target.find('.empty-message').addClass('hidden')
$target.find('.empty-message').hide()
$label.detach().appendTo($target)
......@@ -54,9 +54,6 @@ 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/application.js.coffee
View file @ 452c076a
......@@ -32,6 +32,10 @@
#= 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
......@@ -121,10 +125,9 @@ window.onload = ->
setTimeout shiftWindow, 100
$ ->
gl.utils.preventDisabledButtons()
bootstrapBreakpoint = bp.getBreakpointSize()
$(".nav-sidebar").niceScroll(cursoropacitymax: '0.4', cursorcolor: '#FFF', cursorborder: "1px solid #FFF")
$(".nicescroll").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", ->
......@@ -254,31 +257,3 @@ $ ->
gl.awardsHandler = new AwardsHandler()
checkInitialSidebarSize()
new Aside()
# Sidenav pinning
if $(window).width() < 1440 and $.cookie('pin_nav') is 'true'
$.cookie('pin_nav', 'false')
$('.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()
$(this).toggleClass 'is-active'
if $.cookie('pin_nav') is 'true'
$.cookie 'pin_nav', 'false'
$('.page-with-sidebar')
.removeClass('page-sidebar-pinned')
.toggleClass('page-sidebar-collapsed page-sidebar-expanded')
$('.navbar-fixed-top')
.removeClass('header-pinned-nav')
.toggleClass('header-collapsed header-expanded')
else
$.cookie 'pin_nav', 'true'
$('.page-with-sidebar').addClass('page-sidebar-pinned')
$('.navbar-fixed-top').addClass('header-pinned-nav')
app/assets/javascripts/awards_handler.coffee
View file @ 452c076a
......@@ -40,7 +40,7 @@ class @AwardsHandler
$menu = $ '.emoji-menu'
if $addBtn.hasClass 'js-note-emoji'
$addBtn.closest('.note').find('.js-awards-block').addClass 'current'
$addBtn.parents('.note').find('.js-awards-block').addClass 'current'
else
$addBtn.closest('.js-awards-block').addClass 'current'
......
app/assets/javascripts/ci/build.coffee
View file @ 452c076a
......@@ -17,8 +17,6 @@ class @CiBuild
.off 'resize.build'
.on 'resize.build', @hideSidebar
@updateArtifactRemoveDate()
if $('#build-trace').length
@getInitialBuildTrace()
@initScrollButtonAffix()
......@@ -105,10 +103,3 @@ 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 @ 452c076a
......@@ -29,7 +29,6 @@ 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()
......@@ -54,13 +53,9 @@ 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()
......@@ -73,7 +68,9 @@ class Dispatcher
new Diff()
new ZenMode()
shortcut_handler = new ShortcutsNavigation()
when 'projects:commits:show', 'projects:activity'
when 'projects:commits:show'
shortcut_handler = new ShortcutsNavigation()
when 'projects:activity'
shortcut_handler = new ShortcutsNavigation()
when 'projects:show'
shortcut_handler = new ShortcutsNavigation()
......@@ -99,7 +96,6 @@ 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,11 +129,15 @@ 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', 'show'
when 'new'
new ProjectNew()
when 'show'
new ProjectShow()
when 'wikis'
new Wikis()
shortcut_handler = new ShortcutsNavigation()
......@@ -146,9 +146,9 @@ class Dispatcher
when 'snippets'
shortcut_handler = new ShortcutsNavigation()
new ZenMode() if path[2] == 'show'
when 'labels', 'graphs', 'compare', 'pipelines', 'forks', \
'milestones', 'project_members', 'deploy_keys', 'builds', \
'hooks', 'services', 'protected_branches'
when 'labels', 'graphs'
shortcut_handler = new ShortcutsNavigation()
when 'project_members', 'deploy_keys', '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 @ 452c076a
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()
......@@ -48,7 +32,7 @@ class @DueDateSelect
date = new Date value.replace(new RegExp('-', 'g'), ',')
mediumDate = $.datepicker.formatDate 'M d, yy', date
else
mediumDate = 'No due date'
mediumDate = 'None'
data = {}
data[abilityName] = {}
......@@ -66,8 +50,7 @@ class @DueDateSelect
$selectbox.hide()
$value.css('display', '')
cssClass = if Date.parse(mediumDate) then 'bold' else 'no-value'
$valueContent.html("<span class='#{cssClass}'>#{mediumDate}</span>")
$valueContent.html(mediumDate)
$sidebarValue.html(mediumDate)
if value isnt ''
......
app/assets/javascripts/issuable.js.coffee
View file @ 452c076a
......@@ -56,6 +56,13 @@ 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()
......@@ -64,16 +71,58 @@ 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()
Turbolinks.visit(issuesUrl);
$('#filter_issue_search').val($('#issue_search').val())
initChecks: ->
$('.check_all_issues').off('click').on('click', ->
$('.check_all_issues').on 'click', ->
$('.selected_issue').prop('checked', @checked)
Issuable.checkChanged()
)
$('.selected_issue').off('change').on('change', 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
checkChanged: ->
checked_issues = $('.selected_issue:checked')
......
app/assets/javascripts/issuable_form.js.coffee
View file @ 452c076a
......@@ -102,10 +102,6 @@ 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 @ 452c076a
......@@ -9,9 +9,6 @@ class @IssuableBulkActions
@bindEvents()
# Fixes bulk-assign not working when navigating through pages
Issuable.initChecks();
getElement: (selector) ->
@container.find selector
......@@ -100,22 +97,13 @@ class @IssuableBulkActions
$labels = @form.find('.labels-filter input[name="update[label_ids][]"]')
$labels.each (k, label) ->
labelIds.push parseInt($(label).val()) if label
labelIds.push $(label).val() if label
labelIds
###*
* Returns Label IDs that will be removed from issue selection
* @return {Array} Array of labels IDs
* Just an alias of @getUnmarkedIndeterminedLabels
* @return {Array} Array of labels
###
getLabelsToRemove: ->
result = []
indeterminatedLabels = @getUnmarkedIndeterminedLabels()
labelsToApply = @getLabelsToApply()
indeterminatedLabels.map (id) ->
# We need to exclude label IDs that will be applied
# By not doing this will cause issues from selection to not add labels at all
result.push(id) if labelsToApply.indexOf(id) is -1
result
@getUnmarkedIndeterminedLabels()
app/assets/javascripts/labels_select.js.coffee
View file @ 452c076a
......@@ -39,7 +39,7 @@ class @LabelsSelect
</a>
<% }); %>'
)
labelNoneHTMLTemplate = '<span class="no-value">None</span>'
labelNoneHTMLTemplate = _.template('<div class="light">None</div>')
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)
......
app/assets/javascripts/layout_nav.js.coffee
View file @ 452c076a
hideEndFade = ($scrollingTabs) ->
$scrollingTabs.each ->
$this = $(@)
$this
.find('.fade-right')
.toggleClass('end-scroll', $this.width() is $this.prop('scrollWidth'))
$ ->
class @LayoutNav
$ ->
$('.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)
$el = $(event.target)
currentPosition = $this.scrollLeft()
maxPosition = $this.prop('scrollWidth') - $this.outerWidth()
size = bp.getBreakpointSize()
controlBtnWidth = $('.controls').width()
maxPosition = $this.get(0).scrollWidth - $this.parent().width()
maxPosition += controlBtnWidth if size isnt 'xs' and $('.nav-control').length
$this.find('.fade-left').toggleClass('end-scroll', currentPosition is 0)
$this.find('.fade-right').toggleClass('end-scroll', currentPosition is maxPosition)
$el.find('.fade-left').toggleClass('end-scroll', currentPosition is 0)
$el.find('.fade-right').toggleClass('end-scroll', currentPosition is maxPosition)
app/assets/javascripts/lib/common_utils.js.coffee
View file @ 452c076a
((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/logo.js.coffee
View file @ 452c076a
......@@ -42,3 +42,9 @@ 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/merged_buttons.js.coffee deleted 100644 → 0
View file @ 13e37a3e
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 @ 452c076a
......@@ -24,10 +24,14 @@ class @MilestoneSelect
if issueUpdateURL
milestoneLinkTemplate = _.template(
'<a href="/<%= namespace %>/<%= path %>/milestones/<%= iid %>" class="bold has-tooltip" data-container="body" title="<%= remaining %>"><%= _.escape(title) %></a>'
'<a href="/<%= namespace %>/<%= path %>/milestones/<%= iid %>">
<span class="has-tooltip" data-container="body" title="<%= remaining %>">
<%= _.escape(title) %>
</span>
</a>'
)
milestoneLinkNoneTemplate = '<span class="no-value">None</span>'
milestoneLinkNoneTemplate = '<div class="light">None</div>'
collapsedSidebarLabelTemplate = _.template(
'<span class="has-tooltip" data-container="body" title="<%= remaining %>" data-placement="left">
......@@ -112,7 +116,7 @@ class @MilestoneSelect
.val()
data = {}
data[abilityName] = {}
data[abilityName].milestone_id = if selected? then selected else null
data[abilityName].milestone_id = selected
$loading
.fadeIn()
$dropdown.trigger('loading.gl.dropdown')
......
app/assets/javascripts/network/application.js.coffee deleted 100644 → 0
View file @ 13e37a3e
# 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 @ 452c076a
......@@ -115,14 +115,12 @@ 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/right_sidebar.js.coffee
View file @ 452c076a
......@@ -43,55 +43,6 @@ 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-id') then 'PATCH' else 'POST'
ajaxUrlExtra = if $this.attr('data-id') then "/#{$this.attr('data-id')}" else ''
$.ajax(
url: "#{$this.data('url')}#{ajaxUrlExtra}"
type: ajaxType
dataType: 'json'
data:
issuable_id: $this.data('issuable')
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.todo?
$btn
.attr 'aria-label', $btn.data('mark-text')
.attr 'data-id', data.todo.id
$btnText.text $btn.data('mark-text')
else
$btn
.attr 'aria-label', $btn.data('todo-text')
.removeAttr 'data-id'
$btnText.text $btn.data('todo-text')
sidebarDropdownLoading: (e) ->
$sidebarCollapsedIcon = $(@).closest('.block').find('.sidebar-collapsed-icon')
......@@ -166,3 +117,5 @@ class @Sidebar
getBlock: (name) ->
@sidebar.find(".block.#{name}")
app/assets/javascripts/search_autocomplete.js.coffee
View file @ 452c076a
......@@ -67,12 +67,8 @@ class @SearchAutocomplete
getData: (term, callback) ->
_this = @
unless term
if contents = @getCategoryContents()
@searchInput.data('glDropdown').filter.options.callback contents
@enableAutocomplete()
return
# Do not trigger request if input is empty
return if @searchInput.val() is ''
# Prevent multiple ajax calls
return if @loadingSuggestions
......@@ -126,37 +122,6 @@ 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
......@@ -244,12 +209,6 @@ class @SearchAutocomplete
@isFocused = true
@wrap.addClass('search-active')
@getData() if @getValue() is ''
getValue: -> return @searchInput.val()
onClearInputClick: (e) =>
e.preventDefault()
@searchInput.val('').focus()
......@@ -270,10 +229,6 @@ class @SearchAutocomplete
@locationBadgeEl.text(badgeText).show()
@wrap.addClass('has-location-badge')
hasLocationBadge: -> return @wrap.is '.has-location-badge'
restoreOriginalState: ->
inputs = Object.keys @originalState
......@@ -302,14 +257,13 @@ class @SearchAutocomplete
@getElement("##{input}").val('')
removeLocationBadge: ->
@locationBadgeEl.hide()
# Reset state
@resetSearchState()
@wrap.removeClass('has-location-badge')
@disableAutocomplete()
@wrap.removeClass('has-location-badge')
disableAutocomplete: ->
@searchInput.addClass('disabled')
......
app/assets/javascripts/shortcuts.js.coffee
View file @ 452c076a
class @Shortcuts
constructor: (skipResetBindings) ->
constructor: ->
@enabledHelp = []
Mousetrap.reset() if not skipResetBindings
Mousetrap.reset()
Mousetrap.bind('?', @onToggleHelp)
Mousetrap.bind('s', Shortcuts.focusSearch)
Mousetrap.bind(['ctrl+shift+p', 'command+shift+p'], @toggleMarkdownPreview)
......
app/assets/javascripts/shortcuts_blob.coffee deleted 100644 → 0
View file @ 13e37a3e
#= 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 @ 452c076a
......@@ -3,33 +3,13 @@ expanded = 'page-sidebar-expanded'
toggleSidebar = ->
$('.page-with-sidebar').toggleClass("#{collapsed} #{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')
$('header').toggleClass("header-collapsed header-expanded")
setTimeout ( ->
niceScrollBars = $('.nav-sidebar').niceScroll();
niceScrollBars = $('.nicescroll').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 @ 452c076a
......@@ -9,11 +9,9 @@ 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_select.js.coffee
View file @ 452c076a
......@@ -31,7 +31,7 @@ class @UsersSelect
assignTo = (selected) ->
data = {}
data[abilityName] = {}
data[abilityName].assignee_id = if selected? then selected else null
data[abilityName].assignee_id = selected
$loading
.fadeIn()
$dropdown.trigger('loading.gl.dropdown')
......@@ -72,7 +72,7 @@ class @UsersSelect
assigneeTemplate = _.template(
'<% if (username) { %>
<a class="author_link bold" href="/u/<%= username %>">
<a class="author_link " 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="no-value assign-yourself">
<span class="assign-yourself">
No assignee -
<a href="#" class="js-assign-yourself">
assign yourself
......
app/assets/stylesheets/framework/gitlab-theme.scss
View file @ 452c076a
......@@ -8,8 +8,8 @@
*/
@mixin gitlab-theme($color-light, $color, $color-darker, $color-dark) {
.page-with-sidebar {
.toggle-nav-collapse,
.pin-nav-btn {
.collapse-nav a {
color: $color-light;
background: $color;
......
app/assets/stylesheets/framework/header.scss
View file @ 452c076a
......@@ -3,7 +3,7 @@
*
*/
header {
transition: padding $sidebar-transition-duration;
transition-duration: .3s;
&.navbar-empty {
height: $header-height;
......@@ -79,9 +79,14 @@ header {
&.header-collapsed {
padding: 0 16px;
.side-nav-toggle {
display: block;
}
}
.side-nav-toggle {
display: none;
position: absolute;
left: -10px;
margin: 6px 0;
......@@ -103,7 +108,9 @@ 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;
......@@ -191,6 +198,18 @@ header {
}
}
.header-collapsed {
margin-left: 0;
.header-content {
@media (min-width: $screen-sm-max) {
padding-left: 30px;
transition-duration: .3s;
}
}
}
.tanuki-shape {
transition: all 0.8s;
......
app/assets/stylesheets/framework/lists.scss
View file @ 452c076a
......@@ -159,7 +159,7 @@ ul.content-list {
background-color: $gray-light;
border: dotted 1px $gray-dark;
margin: 1px 0;
min-height: 52px;
min-height: 30px;
}
}
}
......
app/assets/stylesheets/framework/nav.scss
View file @ 452c076a
......@@ -74,7 +74,6 @@
.container-fluid {
background-color: $background-color;
margin-bottom: 0;
}
li {
......@@ -242,12 +241,6 @@
}
}
}
&.adjust {
.nav-text, .nav-controls {
width: auto;
}
}
}
.layout-nav {
......@@ -257,7 +250,7 @@
z-index: 11;
background: $background-color;
border-bottom: 1px solid $border-color;
transition: padding $sidebar-transition-duration;
transition-duration: .3s;
text-align: center;
.container-fluid {
......@@ -287,10 +280,11 @@
}
.dropdown {
position: absolute;
top: 7px;
right: 15px;
z-index: 2;
margin-left: 7px;
@media (max-width: $screen-xs-min) {
margin-left: 0;
}
li.active {
font-weight: bold;
......@@ -353,12 +347,6 @@
.badge {
color: $gl-icon-color;
}
&:hover {
a, i {
color: $black;
}
}
}
}
......
app/assets/stylesheets/framework/sidebar.scss
View file @ 452c076a
.page-with-sidebar {
padding-top: $header-height;
transition: padding $sidebar-transition-duration;
transition-duration: .3s;
.sidebar-wrapper {
position: fixed;
top: 0;
bottom: 0;
overflow-y: auto;
overflow-x: hidden;
left: 0;
height: 100%;
overflow: hidden;
transition: width $sidebar-transition-duration;
transition-duration: .3s;
}
}
.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;
......@@ -39,19 +34,22 @@
}
}
.sidebar-user {
padding: 15px;
position: absolute;
left: 0;
.sidebar-wrapper {
.sidebar-user {
padding: 15px 22px;
position: fixed;
bottom: 0;
width: $sidebar_width;
overflow: hidden;
font-size: 16px;
line-height: 36px;
transition: width $sidebar-transition-duration, padding $sidebar-transition-duration;
transition-duration: .3s;
@media (min-width: $sidebar-breakpoint) {
bottom: 50px;
.username {
margin-left: 10px;
width: $sidebar_width - 2 * 10px;
font-size: 16px;
line-height: 34px;
}
}
}
......@@ -67,46 +65,39 @@
.nav-sidebar {
position: absolute;
top: 50px;
bottom: 65px;
width: $sidebar_width;
overflow-y: auto;
overflow-x: hidden;
@media (min-width: $sidebar-breakpoint) {
bottom: 115px;
}
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 {
padding: 7px 15px 7px 12px;
width: $sidebar_width;
padding: 7px 15px 7px 23px;
font-size: $gl-font-size;
line-height: 24px;
display: block;
text-decoration: none;
font-weight: normal;
outline: none;
white-space: nowrap;
&:hover,
&:active,
&:focus {
&:hover {
text-decoration: none;
}
&:active, &:focus {
text-decoration: none;
}
......@@ -118,6 +109,10 @@
svg {
margin-right: 13px;
}
&.back-link i {
transition-duration: .3s;
}
}
}
......@@ -128,86 +123,101 @@
}
}
.toggle-nav-collapse {
.sidebar-subnav {
margin-left: 0;
padding-left: 0;
li {
list-style: none;
}
}
.collapse-nav a {
width: $sidebar_width;
position: absolute;
position: fixed;
top: 0;
left: 0;
min-height: 50px;
padding: 5px 0;
font-size: 18px;
line-height: 30px;
}
.nav-header-btn {
padding: 10px 5px;
color: inherit;
background: transparent;
height: 50px;
text-align: center;
line-height: 40px;
transition-duration: .3s;
outline: none;
&:hover,
&:focus {
color: $white-light;
&:hover {
text-decoration: none;
}
}
.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;
.sidebar-wrapper {
&.hidden-nav {
width: 0;
}
}
.fa {
transition: transform .15s;
.page-sidebar-collapsed {
padding-left: 0;
.sidebar-wrapper {
width: 0;
.nav-sidebar {
width: 0;
li {
width: auto;
a {
span {
display: none;
}
}
}
}
.collapse-nav a {
width: 0;
&.is-active {
.fa {
transform: rotate(90deg);
i {
display: none;
}
}
}
.page-sidebar-collapsed {
.sidebar-user {
width: 0;
padding-left: 0;
padding-right: 0;
.sidebar-wrapper {
width: 0;
.username {
display: none;
}
}
}
}
.page-sidebar-expanded {
@media (max-width: $screen-sm-max) {
padding-left: 0;
}
.sidebar-wrapper {
width: $sidebar_width;
}
}
.page-sidebar-pinned {
.content-wrapper,
.layout-nav {
@media (min-width: $sidebar-breakpoint) {
padding-left: $sidebar_width;
}
.nav-sidebar {
width: $sidebar_width;
}
}
header.header-pinned-nav {
@media (min-width: $sidebar-breakpoint) {
padding-left: ($sidebar_width + $gl-padding);
.nav-sidebar li a {
width: $sidebar_width;
.side-nav-toggle {
display: none;
&.back-link {
i {
opacity: 0;
}
}
.header-content {
padding-left: 0;
}
}
}
......
app/assets/stylesheets/framework/variables.scss
View file @ 452c076a
......@@ -6,8 +6,6 @@ $sidebar_width: 220px;
$gutter_collapsed_width: 62px;
$gutter_width: 290px;
$gutter_inner_width: 258px;
$sidebar-transition-duration: .15s;
$sidebar-breakpoint: 1440px;
/*
* UI elements
......
app/assets/stylesheets/pages/commits.scss
View file @ 452c076a
......@@ -7,111 +7,84 @@
margin-right: 9px;
}
.commit-header {
padding: 5px 10px;
background-color: $background-color;
border-top: 1px solid #eee;
border-bottom: 1px solid #eee;
font-size: 14px;
.lists-separator {
margin: 10px 0;
border-color: #ddd;
}
&:first-child {
border-top-width: 0;
.commits-row {
ul {
margin: 0;
li.commit {
padding: 8px 0;
}
}
.commits-row-date {
font-size: 15px;
line-height: 20px;
margin-bottom: 5px;
}
}
.commit-row-title {
line-height: 1;
margin-bottom: 7px;
li.commit {
list-style: none;
.commit-row-title {
font-size: $list-font-size;
line-height: 20px;
margin-bottom: 2px;
.btn-clipboard {
margin-top: -1px;
}
.notes_count {
float: right;
margin-right: 10px;
}
.commit_short_id {
min-width: 65px;
color: $gl-dark-link-color;
font-family: $monospace_font;
}
.str-truncated {
max-width: 70%;
}
.commit-row-message {
color: $gl-dark-link-color;
&:hover {
text-decoration: underline;
}
}
.text-expander {
display: inline-block;
background: $gray-light;
color: $gl-placeholder-color;
background: #eee;
color: #555;
padding: 0 5px;
cursor: pointer;
border: 1px solid $border-gray-dark;
border-radius: $border-radius-default;
margin-left: 5px;
margin-left: 4px;
&:hover {
background-color: darken($gray-light, 10%);
text-decoration: none;
}
background-color: #ddd;
}
}
.commit-actions {
@media (min-width: $screen-sm-min) {
float: right;
margin-left: $gl-padding;
margin-top: 2px;
font-size: 0;
}
.btn-transparent {
padding-left: 0;
padding-right: 0;
}
.btn {
&:not(:first-child) {
margin-left: $gl-padding;
}
}
}
.commit-short-id {
font-family: $monospace_font;
font-weight: 600;
}
.commit {
padding: 10px 0;
@media (min-width: $screen-sm-min) {
padding-left: 46px;
}
&:not(:last-child) {
border-bottom: 1px solid #eee;
}
a,
button {
color: $gl-dark-link-color;
vertical-align: baseline;
}
.avatar {
margin-left: -46px;
}
.item-title {
display: inline-block;
@media (min-width: $screen-sm-min) {
max-width: 70%;
}
}
.commit-row-description {
font-size: 14px;
border-left: 1px solid #eee;
padding: 10px 15px;
margin: 10px 0;
margin: 5px 0 10px 5px;
background: #f9f9f9;
display: none;
......@@ -120,7 +93,6 @@
background: inherit;
padding: 0;
margin: 0;
white-space: pre-wrap;
}
a {
......@@ -130,7 +102,7 @@
.commit-row-info {
color: $gl-gray;
line-height: 1;
line-height: 24px;
a {
color: $gl-gray;
......@@ -139,6 +111,10 @@
.avatar {
margin-right: 8px;
}
.committed_ago {
display: inline-block;
}
}
&.inline-commit {
......
app/assets/stylesheets/pages/environments.scss deleted 100644 → 0
View file @ 13e37a3e
.environments {
.commit-title {
margin: 0;
}
}
app/assets/stylesheets/pages/groups.scss
View file @ 452c076a
......@@ -39,20 +39,3 @@
}
}
}
.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/issuable.scss
View file @ 452c076a
......@@ -34,10 +34,6 @@
color: inherit;
}
.issuable-header-text {
margin-top: 7px;
}
.block {
@include clearfix;
padding: $gl-padding 0;
......@@ -64,6 +60,10 @@
margin-top: 0;
}
.issuable-count {
margin-top: 7px;
}
.gutter-toggle {
margin-left: 20px;
padding-left: 10px;
......@@ -145,6 +145,7 @@
.assign-yourself {
margin-top: 10px;
font-weight: normal;
display: block;
}
}
......@@ -157,10 +158,6 @@
font-weight: normal;
}
.no-value {
color: $gl-placeholder-color;
}
.sidebar-collapsed-icon {
display: none;
}
......@@ -251,16 +248,11 @@
padding-bottom: 0;
margin-bottom: 10px;
}
.issuable-header-btn {
display: none;
}
}
.issuable-header-btn {
.issuable-pager {
background: $gray-normal;
border: 1px solid $border-gray-normal;
&:hover {
background: $gray-dark;
border: 1px solid $border-gray-dark;
......@@ -271,7 +263,7 @@
}
}
a {
a:not(.issuable-pager) {
&:hover {
color: $md-link-color;
text-decoration: none;
......@@ -330,7 +322,7 @@
margin-left: 5px;
a {
color: $gl-placeholder-color;
color: #8c8c8c;
}
}
......
app/assets/stylesheets/pages/labels.scss
View file @ 452c076a
......@@ -115,13 +115,6 @@
}
}
.draggable-handler {
display: inline-block;
opacity: 0;
transition: opacity .3s;
color: $gray-darkest;
}
.prioritized-labels {
margin-bottom: 30px;
......@@ -129,13 +122,6 @@
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 @ 452c076a
......@@ -313,13 +313,3 @@
}
}
}
.merged-buttons {
.btn {
float: left;
&:not(:last-child) {
margin-right: 10px;
}
}
}
app/assets/stylesheets/pages/notes.scss
View file @ 452c076a
......@@ -139,12 +139,6 @@ ul.notes {
@media (min-width: $screen-sm-min) {
padding-right: 0;
}
@media (max-width: $screen-xs-min) {
.inline {
display: block;
}
}
}
.note-emoji-button {
......@@ -265,10 +259,6 @@ ul.notes {
right: 0;
top: 0;
.note-action-button {
margin-left: 10px;
}
@media (min-width: $screen-sm-min) {
position: relative;
}
......
app/assets/stylesheets/pages/projects.scss
View file @ 452c076a
......@@ -5,12 +5,10 @@
font-weight: normal;
}
}
.no-ssh-key-message, .project-limit-message {
background-color: #f28d35;
margin-bottom: 0;
}
.new_project,
.edit-project {
fieldset.features {
......@@ -20,6 +18,13 @@
}
}
.project-name-holder {
.help-inline {
vertical-align: top;
padding: 7px;
}
}
.project-home-panel {
background: $white-light;
text-align: left;
......@@ -224,20 +229,13 @@
right: 16px;
bottom: 0;
@media (max-width: $screen-lg-min) {
top: 0;
.btn {
padding: 3px 10px;
background-color: $background-color;
}
.access-request-button {
position: absolute;
right: 0;
bottom: 61px;
@media (max-width: $screen-lg-min) {
position: relative;
bottom: 0;
margin-right: 10px;
}
@media (max-width: 1304px) {
top: 0;
}
}
......@@ -288,6 +286,10 @@
color: #555;
}
.project_member_row form {
margin: 0;
}
.transfer-project .select2-container {
min-width: 200px;
}
......@@ -371,7 +373,6 @@ a.deploy-project-label {
.project-import .btn {
float: left;
margin-bottom: 10px;
margin-right: 10px;
}
......
app/assets/stylesheets/pages/tree.scss
View file @ 452c076a
......@@ -101,7 +101,7 @@
margin: 0;
.commit {
padding: 0 0 0 55px;
padding: 0;
.commit-row-title {
.commit-row-message {
......@@ -129,6 +129,4 @@
.tree-controls {
float: right;
margin-top: 11px;
position: relative;
z-index: 2;
}
app/controllers/autocomplete_controller.rb
View file @ 452c076a
......@@ -35,7 +35,6 @@ 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 deleted 100644 → 0
View file @ 13e37a3e
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)
return render_403 unless @member
source_type = @member.real_source_type.humanize(capitalize: false)
if can?(current_user, action_member_permission(:destroy, @member), @member)
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
@member.destroy
redirect_to [:dashboard, @member.real_source_type.tableize], notice: notice
else
if cannot_leave?
alert = "You can not leave the \"#{@member.source.human_name}\" #{source_type}."
alert << " Transfer or delete the #{source_type}."
redirect_to polymorphic_url(membershipable), alert: alert
else
render_403
end
end
end
protected
def membershipable
raise NotImplementedError
end
def cannot_leave?
raise NotImplementedError
end
end
app/controllers/groups/group_members_controller.rb
View file @ 452c076a
class Groups::GroupMembersController < Groups::ApplicationController
include MembershipActions
# Authorize
before_action :authorize_admin_group_member!, except: [:index, :leave, :request_access]
before_action :authorize_admin_group_member!, except: [:index, :leave]
def index
@project = @group.projects.find(params[:project_id]) if params[:project_id]
@members = @group.group_members
@members = @members.non_pending unless can?(current_user, :admin_group, @group)
@members = @members.non_invite unless can?(current_user, :admin_group, @group)
if params[:search].present?
users = @group.users.search(params[:search]).to_a
......@@ -60,16 +58,25 @@ class Groups::GroupMembersController < Groups::ApplicationController
end
end
protected
def leave
@group_member = @group.group_members.find_by(user_id: current_user)
def member_params
params.require(:group_member).permit(:access_level, :user_id)
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
# MembershipActions concern
alias_method :membershipable, :group
protected
def cannot_leave?
@group.last_owner?(current_user)
def member_params
params.require(:group_member).permit(:access_level, :user_id)
end
end
app/controllers/jwt_controller.rb
View file @ 452c076a
......@@ -42,7 +42,7 @@ class JwtController < ApplicationController
end
def authenticate_user(login, password)
user = Gitlab::Auth.find_with_user_password(login, password)
user = Gitlab::Auth.find_in_gitlab_or_ldap(login, password)
Gitlab::Auth.rate_limit!(request.ip, success: user.present?, login: login)
user
end
......
app/controllers/profiles/notifications_controller.rb
View file @ 452c076a
......@@ -3,11 +3,10 @@ class Profiles::NotificationsController < Profiles::ApplicationController
@user = current_user
@group_notifications = current_user.notification_settings.for_groups
@project_notifications = current_user.notification_settings.for_projects
@global_notification_setting = current_user.global_notification_setting
end
def update
if current_user.update_attributes(user_params) && update_notification_settings
if current_user.update_attributes(user_params)
flash[:notice] = "Notification settings saved"
else
flash[:alert] = "Failed to save new settings"
......@@ -17,18 +16,6 @@ class Profiles::NotificationsController < Profiles::ApplicationController
end
def user_params
params.require(:user).permit(:notification_email)
end
def global_notification_setting_params
params.require(:global_notification_setting).permit(:level)
end
private
def update_notification_settings
return true unless global_notification_setting_params
current_user.global_notification_setting.update_attributes(global_notification_setting_params)
params.require(:user).permit(:notification_email, :notification_level)
end
end
app/controllers/projects/artifacts_controller.rb
View file @ 452c076a
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)
......@@ -30,17 +34,8 @@ 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 @ 452c076a
......@@ -51,7 +51,7 @@ class Projects::BuildsController < Projects::ApplicationController
return render_404
end
build = Ci::Build.retry(@build, current_user)
build = Ci::Build.retry(@build)
redirect_to build_path(build)
end
......
app/controllers/projects/commit_controller.rb
View file @ 452c076a
......@@ -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, current_user)
Ci::Build.retry(build)
end
end
......
app/controllers/projects/environments_controller.rb deleted 100644 → 0
View file @ 13e37a3e
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/git_http_controller.rb
View file @ 452c076a
......@@ -43,7 +43,7 @@ class Projects::GitHttpController < Projects::ApplicationController
return if project && project.public? && upload_pack?
authenticate_or_request_with_http_basic do |login, password|
auth_result = Gitlab::Auth.find_for_git_client(login, password, project: project, ip: request.ip)
auth_result = Gitlab::Auth.find(login, password, project: project, ip: request.ip)
if auth_result.type == :ci && upload_pack?
@ci = true
......
app/controllers/projects/merge_requests_controller.rb
View file @ 452c076a
......@@ -204,19 +204,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@merge_request.update(merge_error: nil)
if params[:merge_when_build_succeeds].present?
if @merge_request.pipeline && @merge_request.pipeline.active?
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
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/pipelines_controller.rb
View file @ 452c076a
......@@ -32,7 +32,7 @@ class Projects::PipelinesController < Projects::ApplicationController
end
def retry
pipeline.retry_failed(current_user)
pipeline.retry_failed
redirect_back_or_default default: namespace_project_pipelines_path(project.namespace, project)
end
......
app/controllers/projects/project_members_controller.rb
View file @ 452c076a
class Projects::ProjectMembersController < Projects::ApplicationController
include MembershipActions
# Authorize
before_action :authorize_admin_project_member!, except: [:index, :leave, :request_access]
before_action :authorize_admin_project_member!, except: [:leave, :index]
def index
@project_members = @project.project_members
@project_members = @project_members.non_pending unless can?(current_user, :admin_project, @project)
@project_members = @project_members.non_invite unless can?(current_user, :admin_project, @project)
if params[:search].present?
users = @project.users.search(params[:search]).to_a
......@@ -16,10 +14,9 @@ class Projects::ProjectMembersController < Projects::ApplicationController
@project_members = @project_members.order('access_level DESC')
@group = @project.group
if @group
@group_members = @group.group_members
@group_members = @group_members.non_pending unless can?(current_user, :admin_group, @group)
@group_members = @group_members.non_invite unless can?(current_user, :admin_group, @group)
if params[:search].present?
users = @group.users.search(params[:search]).to_a
......@@ -76,6 +73,26 @@ class Projects::ProjectMembersController < Projects::ApplicationController
end
end
def leave
@project_member = @project.project_members.find_by(user_id: current_user)
if can?(current_user, :destroy_project_member, @project_member)
@project_member.destroy
respond_to do |format|
format.html { redirect_to dashboard_projects_path, notice: "You left the project." }
format.js { head :ok }
end
else
if current_user == @project.owner
message = 'You can not leave your own project. Transfer or delete the project.'
redirect_back_or_default(default: { action: 'index' }, options: { alert: message })
else
render_403
end
end
end
def apply_import
source_project = Project.find(params[:source_project_id])
......@@ -95,11 +112,4 @@ class Projects::ProjectMembersController < Projects::ApplicationController
def member_params
params.require(:project_member).permit(:user_id, :access_level)
end
# MembershipActions concern
alias_method :membershipable, :project
def cannot_leave?
current_user == @project.owner
end
end
app/controllers/projects/todos_controller.rb deleted 100644 → 0
View file @ 13e37a3e
class Projects::TodosController < Projects::ApplicationController
def create
todos = TodoService.new.mark_todo(issuable, current_user)
render json: {
todo: todos,
count: current_user.todos.pending.count,
}
end
def update
current_user.todos.find_by_id(params[:id]).update(state: :done)
render json: {
count: current_user.todos.pending.count,
}
end
private
def issuable
@issuable ||= begin
case params[:issuable_type]
when "issue"
@project.issues.find(params[:issuable_id])
when "merge_request"
@project.merge_requests.find(params[:issuable_id])
end
end
end
end
app/controllers/projects/wikis_controller.rb
View file @ 452c076a
......@@ -16,9 +16,6 @@ class Projects::WikisController < Projects::ApplicationController
if @page
render 'show'
elsif file = @project_wiki.find_file(params[:id], params[:version_id])
response.headers['Content-Security-Policy'] = "default-src 'none'"
response.headers['X-Content-Security-Policy'] = "default-src 'none'"
if file.on_disk?
send_file file.on_disk_path, disposition: 'inline'
else
......
app/controllers/sessions_controller.rb
View file @ 452c076a
......@@ -40,7 +40,7 @@ class SessionsController < Devise::SessionsController
# Handle an "initial setup" state, where there's only one user, it's an admin,
# and they require a password change.
def check_initial_setup
return unless User.limit(2).count == 1 # Count as much 2 to know if we have exactly one
return unless User.count == 1
user = User.admins.last
......
app/finders/notes_finder.rb
View file @ 452c076a
......@@ -12,7 +12,7 @@ class NotesFinder
when "commit"
project.notes.for_commit_id(target_id).non_diff_notes
when "issue"
project.issues.visible_to_user(current_user).find(target_id).notes.inc_author
project.issues.find(target_id).notes.inc_author
when "merge_request"
project.merge_requests.find(target_id).mr_and_commit_notes.inc_author
when "snippet", "project_snippet"
......
app/finders/snippets_finder.rb
View file @ 452c076a
......@@ -51,7 +51,7 @@ class SnippetsFinder
snippets = project.snippets.fresh
if current_user
if project.team.member?(current_user) || current_user.admin?
if project.team.member?(current_user.id) || current_user.admin?
snippets
else
snippets.public_and_internal
......
app/finders/todos_finder.rb
View file @ 452c076a
......@@ -36,7 +36,7 @@ class TodosFinder
private
def action_id?
action_id.present? && [Todo::ASSIGNED, Todo::MENTIONED, Todo::BUILD_FAILED, Todo::MARKED].include?(action_id.to_i)
action_id.present? && [Todo::ASSIGNED, Todo::MENTIONED, Todo::BUILD_FAILED].include?(action_id.to_i)
end
def action_id
......
app/helpers/blob_helper.rb
View file @ 452c076a
......@@ -116,7 +116,7 @@ module BlobHelper
end
def blob_text_viewable?(blob)
blob && blob.text? && !blob.lfs_pointer? && !blob.only_display_raw?
blob && blob.text? && !blob.lfs_pointer?
end
def blob_size(blob)
......
app/helpers/branches_helper.rb
View file @ 452c076a
......@@ -14,8 +14,4 @@ module BranchesHelper
::Gitlab::GitAccess.new(current_user, project).can_push_to_branch?(branch_name)
end
def project_branches
options_for_select(@project.repository.branch_names, @project.default_branch)
end
end
app/helpers/button_helper.rb
View file @ 452c076a
......@@ -17,15 +17,7 @@ module ButtonHelper
def clipboard_button(data = {})
content_tag :button,
icon('clipboard'),
class: "btn",
data: data,
type: :button
end
def clipboard_button_with_class(data = {}, css_class: 'btn-clipboard')
content_tag :button,
icon('clipboard'),
class: "btn #{css_class}",
class: 'btn btn-clipboard',
data: data,
type: :button
end
......
app/helpers/ci_status_helper.rb
View file @ 452c076a
......@@ -38,10 +38,10 @@ module CiStatusHelper
icon(icon_name + ' fw')
end
def render_commit_status(commit, tooltip_placement: 'auto left', cssclass: '')
def render_commit_status(commit, tooltip_placement: 'auto left')
project = commit.project
path = builds_namespace_project_commit_path(project.namespace, project, commit)
render_status_with_link('commit', commit.status, path, tooltip_placement, cssclass: cssclass)
render_status_with_link('commit', commit.status, path, tooltip_placement)
end
def render_pipeline_status(pipeline, tooltip_placement: 'auto left')
......@@ -57,10 +57,10 @@ module CiStatusHelper
private
def render_status_with_link(type, status, path, tooltip_placement, cssclass: '')
def render_status_with_link(type, status, path, tooltip_placement)
link_to ci_icon_for_status(status),
path,
class: "ci-status-link ci-status-icon-#{status.dasherize} #{cssclass}",
class: "ci-status-link ci-status-icon-#{status.dasherize}",
title: "#{type.titleize}: #{ci_label_for_status(status)}",
data: { toggle: 'tooltip', placement: tooltip_placement }
end
......
app/helpers/commits_helper.rb
View file @ 452c076a
......@@ -16,16 +16,6 @@ module CommitsHelper
commit_person_link(commit, options.merge(source: :committer))
end
def commit_author_avatar(commit, options = {})
options = options.merge(source: :author)
user = commit.send(options[:source])
source_email = clean(commit.send "#{options[:source]}_email".to_sym)
person_email = user.try(:email) || source_email
image_tag(avatar_icon(person_email, options[:size]), class: "avatar #{"s#{options[:size]}" if options[:size]} hidden-xs", width: options[:size], alt: "")
end
def image_diff_class(diff)
if diff.deleted_file
"deleted"
......@@ -112,24 +102,24 @@ module CommitsHelper
if current_controller?(:projects, :commits)
if @repo.blob_at(commit.id, @path)
return link_to(
"Browse File",
"Browse File »",
namespace_project_blob_path(project.namespace, project,
tree_join(commit.id, @path)),
class: "btn btn-default"
class: "pull-right"
)
elsif @path.present?
return link_to(
"Browse Directory",
"Browse Directory »",
namespace_project_tree_path(project.namespace, project,
tree_join(commit.id, @path)),
class: "btn btn-default"
class: "pull-right"
)
end
end
link_to(
"Browse Files",
namespace_project_tree_path(project.namespace, project, commit),
class: "btn btn-default"
class: "pull-right"
)
end
......@@ -139,7 +129,7 @@ module CommitsHelper
tooltip = "Revert this #{commit.change_type_title} in a new merge request" if has_tooltip
if can_collaborate_with_project?
btn_class = "btn btn-warning btn-#{btn_class}" unless btn_class.nil?
btn_class = "btn btn-grouped btn-close btn-#{btn_class}" unless btn_class.nil?
link_to 'Revert', '#modal-revert-commit', 'data-toggle' => 'modal', 'data-container' => 'body', title: (tooltip if has_tooltip), class: "#{btn_class} #{'has-tooltip' if has_tooltip}"
elsif can?(current_user, :fork_project, @project)
continue_params = {
......@@ -151,7 +141,7 @@ module CommitsHelper
namespace_key: current_user.namespace.id,
continue: continue_params)
btn_class = "btn btn-grouped btn-warning" unless btn_class.nil?
btn_class = "btn btn-grouped btn-close" unless btn_class.nil?
link_to 'Revert', fork_path, class: btn_class, method: :post, 'data-toggle' => 'tooltip', 'data-container' => 'body', title: (tooltip if has_tooltip)
end
......@@ -163,7 +153,7 @@ module CommitsHelper
tooltip = "Cherry-pick this #{commit.change_type_title} in a new merge request"
if can_collaborate_with_project?
btn_class = "btn btn-default btn-#{btn_class}" unless btn_class.nil?
btn_class = "btn btn-default btn-grouped btn-#{btn_class}" unless btn_class.nil?
link_to 'Cherry-pick', '#modal-cherry-pick-commit', 'data-toggle' => 'modal', 'data-container' => 'body', title: (tooltip if has_tooltip), class: "#{btn_class} #{'has-tooltip' if has_tooltip}"
elsif can?(current_user, :fork_project, @project)
continue_params = {
......@@ -197,10 +187,12 @@ module CommitsHelper
source_email = clean(commit.send "#{options[:source]}_email".to_sym)
person_name = user.try(:name) || source_name
person_email = user.try(:email) || source_email
text =
if options[:avatar]
%Q{<span class="commit-#{options[:source]}-name">#{person_name}</span>}
avatar = image_tag(avatar_icon(person_email, options[:size]), class: "avatar #{"s#{options[:size]}" if options[:size]}", width: options[:size], alt: "")
%Q{#{avatar} <span class="commit-#{options[:source]}-name">#{person_name}</span>}
else
person_name
end
......
app/helpers/diff_helper.rb
View file @ 452c076a
......@@ -135,11 +135,6 @@ module DiffHelper
toggle_whitespace_link(url, options)
end
def diff_compare_whitespace_link(project, from, to, options)
url = namespace_project_compare_path(project.namespace, project, from, to, params_with_whitespace)
toggle_whitespace_link(url, options)
end
private
def hide_whitespace?
......
app/helpers/gitlab_routing_helper.rb
View file @ 452c076a
......@@ -13,23 +13,10 @@
# merge_request_path(merge_request)
#
module GitlabRoutingHelper
# Project
def project_path(project, *args)
namespace_project_path(project.namespace, project, *args)
end
def project_url(project, *args)
namespace_project_url(project.namespace, project, *args)
end
def edit_project_path(project, *args)
edit_namespace_project_path(project.namespace, project, *args)
end
def edit_project_url(project, *args)
edit_namespace_project_url(project.namespace, project, *args)
end
def project_files_path(project, *args)
namespace_project_tree_path(project.namespace, project, @ref || project.repository.root_ref)
end
......@@ -42,10 +29,6 @@ module GitlabRoutingHelper
namespace_project_pipelines_path(project.namespace, project, *args)
end
def project_environments_path(project, *args)
namespace_project_environments_path(project.namespace, project, *args)
end
def project_builds_path(project, *args)
namespace_project_builds_path(project.namespace, project, *args)
end
......@@ -58,6 +41,10 @@ module GitlabRoutingHelper
activity_namespace_project_path(project.namespace, project, *args)
end
def edit_project_path(project, *args)
edit_namespace_project_path(project.namespace, project, *args)
end
def runners_path(project, *args)
namespace_project_runners_path(project.namespace, project, *args)
end
......@@ -78,6 +65,14 @@ module GitlabRoutingHelper
namespace_project_milestone_path(entity.project.namespace, entity.project, entity, *args)
end
def project_url(project, *args)
namespace_project_url(project.namespace, project, *args)
end
def edit_project_url(project, *args)
edit_namespace_project_url(project.namespace, project, *args)
end
def issue_url(entity, *args)
namespace_project_issue_url(entity.project.namespace, entity.project, entity, *args)
end
......@@ -97,56 +92,4 @@ module GitlabRoutingHelper
toggle_subscription_namespace_project_merge_request_path(entity.project.namespace, entity.project, entity)
end
end
## Members
def project_members_url(project, *args)
namespace_project_project_members_url(project.namespace, project)
end
def project_member_path(project_member, *args)
namespace_project_project_member_path(project_member.source.namespace, project_member.source, project_member)
end
def request_access_project_members_path(project, *args)
request_access_namespace_project_project_members_path(project.namespace, project)
end
def leave_project_members_path(project, *args)
leave_namespace_project_project_members_path(project.namespace, project)
end
def approve_access_request_project_member_path(project_member, *args)
approve_access_request_namespace_project_project_member_path(project_member.source.namespace, project_member.source, project_member)
end
def resend_invite_project_member_path(project_member, *args)
resend_invite_namespace_project_project_member_path(project_member.source.namespace, project_member.source, project_member)
end
# Groups
## Members
def group_members_url(group, *args)
group_group_members_url(group, *args)
end
def group_member_path(group_member, *args)
group_group_member_path(group_member.source, group_member)
end
def request_access_group_members_path(group, *args)
request_access_group_group_members_path(group)
end
def leave_group_members_path(group, *args)
leave_group_group_members_path(group)
end
def approve_access_request_group_member_path(group_member, *args)
approve_access_request_group_group_member_path(group_member.source, group_member)
end
def resend_invite_group_member_path(group_member, *args)
resend_invite_group_group_member_path(group_member.source, group_member)
end
end
app/helpers/groups_helper.rb
View file @ 452c076a
module GroupsHelper
def remove_user_from_group_message(group, member)
if member.user
"Are you sure you want to remove \"#{member.user.name}\" from \"#{group.name}\"?"
else
"Are you sure you want to revoke the invitation for \"#{member.invite_email}\" to join \"#{group.name}\"?"
end
end
def leave_group_message(group)
"Are you sure you want to leave \"#{group}\" group?"
end
def should_user_see_group_roles?(user, group)
if user
user.is_admin? || group.members.exists?(user_id: user.id)
else
false
end
end
def can_change_group_visibility_level?(group)
can?(current_user, :change_visibility_level, group)
end
......
app/helpers/issuables_helper.rb
View file @ 452c076a
......@@ -67,12 +67,6 @@ module IssuablesHelper
end
end
def has_todo(issuable)
unless current_user.nil?
current_user.todos.find_by(target_id: issuable.id, state: :pending)
end
end
private
def sidebar_gutter_collapsed?
......
app/helpers/members_helper.rb deleted 100644 → 0
View file @ 13e37a3e
module MembersHelper
# Returns a `<action>_<source>_member` association, e.g.:
# - admin_project_member, update_project_member, destroy_project_member
# - admin_group_member, update_group_member, destroy_group_member
def action_member_permission(action, member)
"#{action}_#{member.type.underscore}".to_sym
end
def remove_member_message(member, user: nil)
user = current_user if defined?(current_user)
text = 'Are you sure you want to '
action =
if member.request?
if member.user == user
'withdraw your access request for'
else
"deny #{member.user.name}'s request to join"
end
elsif member.invite?
"revoke the invitation for #{member.invite_email} to join"
else
"remove #{member.user.name} from"
end
text << action << " the #{member.source.human_name} #{member.real_source_type.humanize(capitalize: false)}?"
end
def remove_member_title(member)
text = " from #{member.real_source_type.humanize(capitalize: false)}"
text.prepend(member.request? ? 'Deny access request' : 'Remove user')
end
def leave_confirmation_message(member_source)
"Are you sure you want to leave the " \
"\"#{member_source.human_name}\" #{member_source.class.to_s.humanize(capitalize: false)}?"
end
end
app/helpers/nav_helper.rb
View file @ 452c076a
......@@ -12,10 +12,10 @@ module NavHelper
end
def page_sidebar_class
if pinned_nav?
"page-sidebar-expanded page-sidebar-pinned"
else
if nav_menu_collapsed?
"page-sidebar-collapsed"
else
"page-sidebar-expanded"
end
end
......@@ -36,15 +36,7 @@ module NavHelper
end
def nav_header_class
class_name = ''
class_name << " with-horizontal-nav" if defined?(nav) && nav
if pinned_nav?
class_name << " header-expanded header-pinned-nav"
else
class_name << " header-collapsed"
end
class_name = " with-horizontal-nav" if defined?(nav) && nav
class_name
end
......@@ -55,8 +47,4 @@ module NavHelper
def nav_control_class
"nav-control" if current_user
end
def pinned_nav?
cookies[:pin_nav] == 'true'
end
end
app/helpers/notifications_helper.rb
View file @ 452c076a
......@@ -61,23 +61,4 @@ module NotificationsHelper
end
end
end
def notification_level_radio_buttons
html = ""
NotificationSetting.levels.each_key do |level|
level = level.to_sym
next if level == :global
html << content_tag(:div, class: "radio") do
content_tag(:label, { value: level }) do
radio_button_tag(:"global_notification_setting[level]", level, @global_notification_setting.level.to_sym == level) +
content_tag(:div, level.to_s.capitalize, class: "level-title") +
content_tag(:p, notification_description(level))
end
end
end
html.html_safe
end
end
app/helpers/projects_helper.rb
View file @ 452c076a
module ProjectsHelper
def remove_from_project_team_message(project, member)
if member.user
"You are going to remove #{member.user.name} from #{project.name} project team. Are you sure?"
else
"You are going to revoke the invitation for #{member.invite_email} to join #{project.name} project team. Are you sure?"
end
end
def link_to_project(project)
link_to [project.namespace.becomes(Namespace), project], title: h(project.name) do
title = content_tag(:span, project.name, class: 'project-name')
......@@ -41,7 +49,7 @@ module ProjectsHelper
author_html = author_html.html_safe
if opts[:name]
link_to(author_html, user_path(author), class: "author_link #{"#{opts[:extra_class]}" if opts[:extra_class]} #{"#{opts[:mobile_classes]}" if opts[:mobile_classes]}").html_safe
link_to(author_html, user_path(author), class: "author_link #{"#{opts[:mobile_classes]}" if opts[:mobile_classes]}").html_safe
else
title = opts[:title].sub(":name", sanitize(author.name))
link_to(author_html, user_path(author), class: "author_link has-tooltip", title: title, data: { container: 'body' } ).html_safe
......@@ -107,6 +115,14 @@ module ProjectsHelper
end
end
def user_max_access_in_project(user_id, project)
level = project.team.max_member_access(user_id)
if level
Gitlab::Access.options_with_owner.key(level)
end
end
def license_short_name(project)
return 'LICENSE' if project.repository.license_key.nil?
......@@ -140,10 +156,6 @@ module ProjectsHelper
nav_tabs << :container_registry
end
if can?(current_user, :read_environment, project)
nav_tabs << :environments
end
if can?(current_user, :admin_project, project)
nav_tabs << :settings
end
......@@ -274,6 +286,10 @@ module ProjectsHelper
end
end
def leave_project_message(project)
"Are you sure you want to leave \"#{project.name}\" project?"
end
def new_readme_path
ref = @repository.root_ref if @repository
ref ||= 'master'
......
app/helpers/time_helper.rb
View file @ 452c076a
......@@ -20,6 +20,7 @@ module TimeHelper
end
end
def date_from_to(from, to)
"#{from.to_s(:short)} - #{to.to_s(:short)}"
end
......
app/helpers/todos_helper.rb
View file @ 452c076a
......@@ -12,7 +12,6 @@ module TodosHelper
when Todo::ASSIGNED then 'assigned you'
when Todo::MENTIONED then 'mentioned you on'
when Todo::BUILD_FAILED then 'The build failed for your'
when Todo::MARKED then 'marked this as a Todo for'
end
end
......
app/mailers/emails/groups.rb 0 → 100644
View file @ 452c076a
module Emails
module Groups
def group_access_granted_email(group_member_id)
@group_member = GroupMember.find(group_member_id)
@group = @group_member.group
@target_url = group_url(@group)
@current_user = @group_member.user
mail(to: @group_member.user.notification_email,
subject: subject("Access to group was granted"))
end
def group_member_invited_email(group_member_id, token)
@group_member = GroupMember.find group_member_id
@group = @group_member.group
@token = token
@target_url = group_url(@group)
@current_user = @group_member.user
mail(to: @group_member.invite_email,
subject: "Invitation to join group #{@group.name}")
end
def group_invite_accepted_email(group_member_id)
@group_member = GroupMember.find group_member_id
return if @group_member.created_by.nil?
@group = @group_member.group
@target_url = group_url(@group)
@current_user = @group_member.created_by
mail(to: @group_member.created_by.notification_email,
subject: subject("Invitation accepted"))
end
def group_invite_declined_email(group_id, invite_email, access_level, created_by_id)
return if created_by_id.nil?
@group = Group.find(group_id)
@current_user = @created_by = User.find(created_by_id)
@access_level = access_level
@invite_email = invite_email
@target_url = group_url(@group)
mail(to: @created_by.notification_email,
subject: subject("Invitation declined"))
end
end
end
app/mailers/emails/members.rb deleted 100644 → 0
View file @ 13e37a3e
module Emails
module Members
extend ActiveSupport::Concern
include MembersHelper
included do
helper_method :member_source, :member
end
def member_access_requested_email(member_source_type, member_id)
@member_source_type = member_source_type
@member_id = member_id
admins = member_source.members.owners_and_masters.includes(:user).pluck(:notification_email)
mail(to: admins,
subject: subject("Request to join the #{member_source.human_name} #{member_source.model_name.singular}"))
end
def member_access_granted_email(member_source_type, member_id)
@member_source_type = member_source_type
@member_id = member_id
mail(to: member.user.notification_email,
subject: subject("Access to the #{member_source.human_name} #{member_source.model_name.singular} was granted"))
end
def member_access_denied_email(member_source_type, source_id, user_id)
@member_source_type = member_source_type
@member_source = member_source_class.find(source_id)
requester = User.find(user_id)
mail(to: requester.notification_email,
subject: subject("Access to the #{member_source.human_name} #{member_source.model_name.singular} was denied"))
end
def member_invited_email(member_source_type, member_id, token)
@member_source_type = member_source_type
@member_id = member_id
@token = token
mail(to: member.invite_email,
subject: "Invitation to join the #{member_source.human_name} #{member_source.model_name.singular}")
end
def member_invite_accepted_email(member_source_type, member_id)
@member_source_type = member_source_type
@member_id = member_id
return unless member.created_by
mail(to: member.created_by.notification_email,
subject: subject('Invitation accepted'))
end
def member_invite_declined_email(member_source_type, source_id, invite_email, created_by_id)
return unless created_by_id
@member_source_type = member_source_type
@member_source = member_source_class.find(source_id)
@invite_email = invite_email
inviter = User.find(created_by_id)
mail(to: inviter.notification_email,
subject: subject('Invitation declined'))
end
def member
@member ||= Member.find(@member_id)
end
def member_source
@member_source ||= member.source
end
private
def member_source_class
@member_source_type.classify.constantize
end
end
end
app/mailers/emails/projects.rb
View file @ 452c076a
module Emails
module Projects
def project_access_granted_email(project_member_id)
@project_member = ProjectMember.find project_member_id
@project = @project_member.project
@target_url = namespace_project_url(@project.namespace, @project)
@current_user = @project_member.user
mail(to: @project_member.user.notification_email,
subject: subject("Access to project was granted"))
end
def project_member_invited_email(project_member_id, token)
@project_member = ProjectMember.find project_member_id
@project = @project_member.project
@token = token
@target_url = namespace_project_url(@project.namespace, @project)
@current_user = @project_member.user
mail(to: @project_member.invite_email,
subject: "Invitation to join project #{@project.name_with_namespace}")
end
def project_invite_accepted_email(project_member_id)
@project_member = ProjectMember.find project_member_id
return if @project_member.created_by.nil?
@project = @project_member.project
@target_url = namespace_project_url(@project.namespace, @project)
@current_user = @project_member.created_by
mail(to: @project_member.created_by.notification_email,
subject: subject("Invitation accepted"))
end
def project_invite_declined_email(project_id, invite_email, access_level, created_by_id)
return if created_by_id.nil?
@project = Project.find(project_id)
@current_user = @created_by = User.find(created_by_id)
@access_level = access_level
@invite_email = invite_email
@target_url = namespace_project_url(@project.namespace, @project)
mail(to: @created_by.notification_email,
subject: subject("Invitation declined"))
end
def project_was_moved_email(project_id, user_id, old_path_with_namespace)
@current_user = @user = User.find user_id
@project = Project.find project_id
......
app/mailers/notify.rb
View file @ 452c076a
......@@ -6,15 +6,13 @@ class Notify < BaseMailer
include Emails::Notes
include Emails::Projects
include Emails::Profile
include Emails::Groups
include Emails::Builds
include Emails::Members
add_template_helper MergeRequestsHelper
add_template_helper DiffHelper
add_template_helper BlobHelper
add_template_helper EmailsHelper
add_template_helper MembersHelper
add_template_helper GitlabRoutingHelper
def test_email(recipient_email, subject, body)
mail(to: recipient_email,
......
app/models/ability.rb
View file @ 452c076a
......@@ -9,6 +9,7 @@ class Ability
when CommitStatus then commit_status_abilities(user, subject)
when Project then project_abilities(user, subject)
when Issue then issue_abilities(user, subject)
when ExternalIssue then external_issue_abilities(user, subject)
when Note then note_abilities(user, subject)
when ProjectSnippet then project_snippet_abilities(user, subject)
when PersonalSnippet then personal_snippet_abilities(user, subject)
......@@ -18,7 +19,6 @@ class Ability
when GroupMember then group_member_abilities(user, subject)
when ProjectMember then project_member_abilities(user, subject)
when User then user_abilities
when ExternalIssue, Deployment, Environment then project_abilities(user, subject.project)
else []
end.concat(global_abilities(user))
end
......@@ -187,8 +187,6 @@ class Ability
project_report_rules
elsif team.guest?(user)
project_guest_rules
else
[]
end
end
......@@ -230,8 +228,6 @@ class Ability
:read_build,
:read_container_image,
:read_pipeline,
:read_environment,
:read_deployment
]
end
......@@ -250,8 +246,6 @@ class Ability
:push_code,
:create_container_image,
:update_container_image,
:create_environment,
:create_deployment
]
end
......@@ -269,8 +263,6 @@ class Ability
@project_master_rules ||= project_dev_rules + [
:push_code_to_protected_branches,
:update_project_snippet,
:update_environment,
:update_deployment,
:admin_milestone,
:admin_project_snippet,
:admin_project_member,
......@@ -281,9 +273,7 @@ class Ability
:admin_commit_status,
:admin_build,
:admin_container_image,
:admin_pipeline,
:admin_environment,
:admin_deployment
:admin_pipeline
]
end
......@@ -327,8 +317,6 @@ class Ability
unless project.builds_enabled
rules += named_abilities('build')
rules += named_abilities('pipeline')
rules += named_abilities('environment')
rules += named_abilities('deployment')
end
unless project.container_registry_enabled
......@@ -523,6 +511,10 @@ class Ability
end
end
def external_issue_abilities(user, subject)
project_abilities(user, subject.project)
end
private
def restricted_public_level?
......@@ -541,7 +533,7 @@ class Ability
def filter_confidential_issues_abilities(user, issue, rules)
return rules if user.admin? || !issue.confidential?
unless issue.author == user || issue.assignee == user || issue.project.team.member?(user, Gitlab::Access::REPORTER)
unless issue.author == user || issue.assignee == user || issue.project.team.member?(user.id)
rules.delete(:admin_issue)
rules.delete(:read_issue)
rules.delete(:update_issue)
......
app/models/blob.rb
View file @ 452c076a
......@@ -24,7 +24,7 @@ class Blob < SimpleDelegator
end
def only_display_raw?
size && truncated?
size && size > 5.megabytes
end
def svg?
......
app/models/ci/build.rb
View file @ 452c076a
......@@ -11,8 +11,6 @@ module Ci
scope :unstarted, ->() { where(runner_id: nil) }
scope :ignore_failures, ->() { where(allow_failure: false) }
scope :with_artifacts, ->() { where.not(artifacts_file: nil) }
scope :with_expired_artifacts, ->() { with_artifacts.where('artifacts_expire_at < ?', Time.now) }
mount_uploader :artifacts_file, ArtifactUploader
mount_uploader :artifacts_metadata, ArtifactUploader
......@@ -40,7 +38,7 @@ module Ci
new_build.save
end
def retry(build, user = nil)
def retry(build)
new_build = Ci::Build.new(status: 'pending')
new_build.ref = build.ref
new_build.tag = build.tag
......@@ -54,7 +52,6 @@ module Ci
new_build.stage = build.stage
new_build.stage_idx = build.stage_idx
new_build.trigger_request = build.trigger_request
new_build.user = user
new_build.save
MergeRequests::AddTodoWhenBuildFailsService.new(build.project, nil).close(new_build)
new_build
......@@ -76,17 +73,6 @@ module Ci
build.update_coverage
build.execute_hooks
end
after_transition any => [:success] do |build|
if build.environment.present?
service = CreateDeploymentService.new(build.project, build.user,
environment: build.environment,
sha: build.sha,
ref: build.ref,
tag: build.tag)
service.execute(build)
end
end
end
def retryable?
......@@ -97,6 +83,10 @@ module Ci
!self.pipeline.statuses.latest.include?(self)
end
def retry
Ci::Build.retry(self)
end
def depends_on_builds
# Get builds of the same type
latest_builds = self.pipeline.builds.latest
......@@ -327,7 +317,7 @@ module Ci
end
def artifacts?
!artifacts_expired? && artifacts_file.exists?
artifacts_file.exists?
end
def artifacts_metadata?
......@@ -338,15 +328,11 @@ module Ci
Gitlab::Ci::Build::Artifacts::Metadata.new(artifacts_metadata.path, path, **options).to_entry
end
def erase_artifacts!
remove_artifacts_file!
remove_artifacts_metadata!
end
def erase(opts = {})
return false unless erasable?
erase_artifacts!
remove_artifacts_file!
remove_artifacts_metadata!
erase_trace!
update_erased!(opts[:erased_by])
end
......@@ -359,25 +345,6 @@ module Ci
!self.erased_at.nil?
end
def artifacts_expired?
artifacts_expire_at && artifacts_expire_at < Time.now
end
def artifacts_expire_in
artifacts_expire_at - Time.now if artifacts_expire_at
end
def artifacts_expire_in=(value)
self.artifacts_expire_at =
if value
Time.now + ChronicDuration.parse(value)
end
end
def keep_artifacts!
self.update(artifacts_expire_at: nil)
end
private
def erase_trace!
......@@ -385,7 +352,7 @@ module Ci
end
def update_erased!(user = nil)
self.update(erased_by: user, erased_at: Time.now, artifacts_expire_at: nil)
self.update(erased_by: user, erased_at: Time.now)
end
def yaml_variables
......
app/models/ci/pipeline.rb
View file @ 452c076a
......@@ -76,10 +76,8 @@ module Ci
builds.running_or_pending.each(&:cancel)
end
def retry_failed(user)
builds.latest.failed.select(&:retryable?).each do |build|
Ci::Build.retry(build, user)
end
def retry_failed
builds.latest.failed.select(&:retryable?).each(&:retry)
end
def latest?
......@@ -163,10 +161,6 @@ module Ci
git_commit_message =~ /(\[ci skip\])/ if git_commit_message
end
def environments
builds.where.not(environment: nil).success.pluck(:environment).uniq
end
def notes
Note.for_commit_id(sha)
end
......
app/models/concerns/access_requestable.rb deleted 100644 → 0
View file @ 13e37a3e
# == AccessRequestable concern
#
# Contains functionality related to objects that can receive request for access.
#
# Used by Project, and Group.
#
module AccessRequestable
extend ActiveSupport::Concern
def request_access(user)
members.create(
access_level: Gitlab::Access::DEVELOPER,
user: user,
requested_at: Time.now.utc)
end
end
app/models/concerns/awardable.rb
View file @ 452c076a
......@@ -5,7 +5,7 @@ module Awardable
has_many :award_emoji, as: :awardable, dependent: :destroy
if self < Participable
participant :award_emoji_with_associations
participant :award_emoji
end
end
......@@ -34,12 +34,8 @@ module Awardable
end
end
def award_emoji_with_associations
award_emoji.includes(:user)
end
def grouped_awards(with_thumbs: true)
awards = award_emoji_with_associations.group_by(&:name)
awards = award_emoji.group_by(&:name)
if with_thumbs
awards[AwardEmoji::UPVOTE_NAME] ||= []
......
app/models/deployment.rb deleted 100644 → 0
View file @ 13e37a3e
class Deployment < ActiveRecord::Base
include InternalId
belongs_to :project, required: true, validate: true
belongs_to :environment, required: true, validate: true
belongs_to :user
belongs_to :deployable, polymorphic: true
validates :sha, presence: true
validates :ref, presence: true
delegate :name, to: :environment, prefix: true
def commit
project.commit(sha)
end
def commit_title
commit.try(:title)
end
def short_sha
Commit.truncate_sha(sha)
end
def last?
self == environment.last_deployment
end
end
app/models/environment.rb deleted 100644 → 0
View file @ 13e37a3e
class Environment < ActiveRecord::Base
belongs_to :project, required: true, validate: true
has_many :deployments
validates :name,
presence: true,
uniqueness: { scope: :project_id },
length: { within: 0..255 },
format: { with: Gitlab::Regex.environment_name_regex,
message: Gitlab::Regex.environment_name_regex_message }
def last_deployment
deployments.last
end
end
app/models/group.rb
View file @ 452c076a
......@@ -3,18 +3,11 @@ require 'carrierwave/orm/activerecord'
class Group < Namespace
include Gitlab::ConfigHelper
include Gitlab::VisibilityLevel
include AccessRequestable
include Referable
has_many :group_members, dependent: :destroy, as: :source, class_name: 'GroupMember'
alias_method :members, :group_members
has_many :users, -> { where(members: { requested_at: nil }) }, through: :group_members
has_many :owners,
-> { where(members: { access_level: Gitlab::Access::OWNER }) },
through: :group_members,
source: :user
has_many :users, through: :group_members
has_many :project_group_links, dependent: :destroy
has_many :shared_projects, through: :project_group_links, source: :project
has_many :notification_settings, dependent: :destroy, as: :source
......@@ -65,10 +58,6 @@ class Group < Namespace
"#{self.class.reference_prefix}#{name}"
end
def web_url
Gitlab::Routing.url_helpers.group_url(self)
end
def human_name
name
end
......@@ -94,6 +83,10 @@ class Group < Namespace
end
end
def owners
@owners ||= group_members.owners.includes(:user).map(&:user)
end
def add_users(user_ids, access_level, current_user = nil)
user_ids.each do |user_id|
Member.add_user(self.group_members, user_id, access_level, current_user)
......
app/models/issue.rb
View file @ 452c076a
......@@ -51,18 +51,10 @@ class Issue < ActiveRecord::Base
end
def self.visible_to_user(user)
return where('issues.confidential IS NULL OR issues.confidential IS FALSE') if user.blank?
return where(confidential: false) if user.blank?
return all if user.admin?
where('
issues.confidential IS NULL
OR issues.confidential IS FALSE
OR (issues.confidential = TRUE
AND (issues.author_id = :user_id
OR issues.assignee_id = :user_id
OR issues.project_id IN(:project_ids)))',
user_id: user.id,
project_ids: user.authorized_projects(Gitlab::Access::REPORTER).select(:id))
where('issues.confidential = false OR (issues.confidential = true AND (issues.author_id = :user_id OR issues.assignee_id = :user_id OR issues.project_id IN(:project_ids)))', user_id: user.id, project_ids: user.authorized_projects.select(:id))
end
def self.reference_prefix
......
app/models/member.rb
View file @ 452c076a
......@@ -26,28 +26,20 @@ class Member < ActiveRecord::Base
allow_nil: true
}
scope :invite, -> { where.not(invite_token: nil) }
scope :non_invite, -> { where(invite_token: nil) }
scope :request, -> { where.not(requested_at: nil) }
scope :non_request, -> { where(requested_at: nil) }
scope :non_pending, -> { non_request.non_invite }
scope :invite, -> { where(user_id: nil) }
scope :non_invite, -> { where("user_id IS NOT NULL") }
scope :guests, -> { where(access_level: GUEST) }
scope :reporters, -> { where(access_level: REPORTER) }
scope :developers, -> { where(access_level: DEVELOPER) }
scope :masters, -> { where(access_level: MASTER) }
scope :owners, -> { where(access_level: OWNER) }
scope :owners_and_masters, -> { where(access_level: [OWNER, MASTER]) }
before_validation :generate_invite_token, on: :create, if: -> (member) { member.invite_email.present? }
after_create :send_invite, if: :invite?
after_create :send_request, if: :request?
after_create :create_notification_setting, unless: :pending?
after_create :post_create_hook, unless: :pending?
after_update :post_update_hook, unless: :pending?
after_destroy :post_destroy_hook, unless: :pending?
after_destroy :post_decline_request, if: :request?
after_create :create_notification_setting, unless: :invite?
after_create :post_create_hook, unless: :invite?
after_update :post_update_hook, unless: :invite?
after_destroy :post_destroy_hook, unless: :invite?
delegate :name, :username, :email, to: :user, prefix: true
......@@ -104,31 +96,10 @@ class Member < ActiveRecord::Base
end
end
def real_source_type
source_type
end
def invite?
self.invite_token.present?
end
def request?
requested_at.present?
end
def pending?
invite? || request?
end
def accept_request
return false unless request?
updated = self.update(requested_at: nil)
after_accept_request if updated
updated
end
def accept_invite!(new_user)
return false unless invite?
......@@ -186,10 +157,6 @@ class Member < ActiveRecord::Base
# override in subclass
end
def send_request
# override in subclass
end
def post_create_hook
system_hook_service.execute_hooks_for(self, :create)
end
......@@ -210,14 +177,6 @@ class Member < ActiveRecord::Base
# override in subclass
end
def after_accept_request
post_create_hook
end
def post_decline_request
# override in subclass
end
def system_hook_service
SystemHooksService.new
end
......
app/models/members/group_member.rb
View file @ 452c076a
......@@ -8,6 +8,9 @@ class GroupMember < Member
validates_format_of :source_type, with: /\ANamespace\z/
default_scope { where(source_type: SOURCE_TYPE) }
scope :with_group, ->(group) { where(source_id: group.id) }
scope :with_user, ->(user) { where(user_id: user.id) }
def self.access_level_roles
Gitlab::Access.options_with_owner
end
......@@ -20,11 +23,6 @@ class GroupMember < Member
access_level
end
# Because source_type is `Namespace`...
def real_source_type
'Group'
end
private
def send_invite
......@@ -33,12 +31,6 @@ class GroupMember < Member
super
end
def send_request
notification_service.new_group_access_request(self)
super
end
def post_create_hook
notification_service.new_group_member(self)
......@@ -64,10 +56,4 @@ class GroupMember < Member
super
end
def post_decline_request
notification_service.decline_group_access_request(self)
super
end
end
app/models/members/project_member.rb
View file @ 452c076a
......@@ -11,6 +11,8 @@ class ProjectMember < Member
default_scope { where(source_type: SOURCE_TYPE) }
scope :in_project, ->(project) { where(source_id: project.id) }
scope :in_projects, ->(projects) { where(source_id: projects.pluck(:id)) }
scope :with_user, ->(user) { where(user_id: user.id) }
before_destroy :delete_member_todos
......@@ -82,7 +84,7 @@ class ProjectMember < Member
Gitlab::Access.sym_options
end
def access_level_roles
def access_roles
Gitlab::Access.options
end
end
......@@ -111,12 +113,6 @@ class ProjectMember < Member
super
end
def send_request
notification_service.new_project_access_request(self)
super
end
def post_create_hook
unless owner?
event_service.join_project(self.project, self.user)
......@@ -152,12 +148,6 @@ class ProjectMember < Member
super
end
def post_decline_request
notification_service.decline_project_access_request(self)
super
end
def event_service
EventCreateService.new
end
......
app/models/note.rb
View file @ 452c076a
......@@ -88,9 +88,22 @@ class Note < ActiveRecord::Base
table = arel_table
pattern = "%#{query}%"
Note.joins('LEFT JOIN issues ON issues.id = noteable_id').
where(table[:note].matches(pattern)).
merge(Issue.visible_to_user(as_user))
found_notes = joins('LEFT JOIN issues ON issues.id = noteable_id').
where(table[:note].matches(pattern))
if as_user
found_notes.where('
issues.confidential IS NULL
OR issues.confidential IS FALSE
OR (issues.confidential IS TRUE
AND (issues.author_id = :user_id
OR issues.assignee_id = :user_id
OR issues.project_id IN(:project_ids)))',
user_id: as_user.id,
project_ids: as_user.authorized_projects.select(:id))
else
found_notes.where('issues.confidential IS NULL OR issues.confidential IS FALSE')
end
end
end
......@@ -187,10 +200,6 @@ class Note < ActiveRecord::Base
award_emoji_supported? && contains_emoji_only?
end
def emoji_awardable?
!system?
end
def clear_blank_line_code!
self.line_code = nil if self.line_code.blank?
end
......
app/models/notification_setting.rb
View file @ 452c076a
......@@ -7,6 +7,7 @@ class NotificationSetting < ActiveRecord::Base
belongs_to :source, polymorphic: true
validates :user, presence: true
validates :source, presence: true
validates :level, presence: true
validates :user_id, uniqueness: { scope: [:source_type, :source_id],
message: "already exists in source",
......
app/models/project.rb
View file @ 452c076a
......@@ -5,7 +5,6 @@ class Project < ActiveRecord::Base
include Gitlab::ShellAdapter
include Gitlab::VisibilityLevel
include Gitlab::CurrentSettings
include AccessRequestable
include Referable
include Sortable
include AfterCommitQueue
......@@ -81,7 +80,7 @@ class Project < ActiveRecord::Base
has_one :jira_service, dependent: :destroy
has_one :redmine_service, dependent: :destroy
has_one :custom_issue_tracker_service, dependent: :destroy
has_one :gitlab_issue_tracker_service, dependent: :destroy, inverse_of: :project
has_one :gitlab_issue_tracker_service, dependent: :destroy
has_one :external_wiki_service, dependent: :destroy
has_one :forked_project_link, dependent: :destroy, foreign_key: "forked_to_project_id"
......@@ -104,8 +103,7 @@ class Project < ActiveRecord::Base
has_many :hooks, dependent: :destroy, class_name: 'ProjectHook'
has_many :protected_branches, dependent: :destroy
has_many :project_members, dependent: :destroy, as: :source, class_name: 'ProjectMember'
alias_method :members, :project_members
has_many :users, -> { where(members: { requested_at: nil }) }, through: :project_members
has_many :users, through: :project_members
has_many :deploy_keys_projects, dependent: :destroy
has_many :deploy_keys, through: :deploy_keys_projects
has_many :users_star_projects, dependent: :destroy
......@@ -127,8 +125,6 @@ class Project < ActiveRecord::Base
has_many :runners, through: :runner_projects, source: :runner, class_name: 'Ci::Runner'
has_many :variables, dependent: :destroy, class_name: 'Ci::Variable', foreign_key: :gl_project_id
has_many :triggers, dependent: :destroy, class_name: 'Ci::Trigger', foreign_key: :gl_project_id
has_many :environments, dependent: :destroy
has_many :deployments, dependent: :destroy
accepts_nested_attributes_for :variables, allow_destroy: true
......@@ -150,6 +146,7 @@ class Project < ActiveRecord::Base
message: Gitlab::Regex.project_path_regex_message }
validates :issues_enabled, :merge_requests_enabled,
:wiki_enabled, inclusion: { in: [true, false] }
validates :issues_tracker_id, length: { maximum: 255 }, allow_blank: true
validates :namespace, presence: true
validates_uniqueness_of :name, scope: :namespace_id
validates_uniqueness_of :path, scope: :namespace_id
......@@ -592,6 +589,10 @@ class Project < ActiveRecord::Base
update_column(:has_external_issue_tracker, services.external_issue_trackers.any?)
end
def can_have_issues_tracker_id?
self.issues_enabled && !self.default_issues_tracker?
end
def build_missing_services
services_templates = Service.where(template: true)
......@@ -684,6 +685,16 @@ class Project < ActiveRecord::Base
end
end
def project_member_by_name_or_email(name = nil, email = nil)
user = users.find_by('name like ? or email like ?', name, email)
project_members.where(user: user) if user
end
# Get Team Member record by user id
def project_member_by_id(user_id)
project_members.find_by(user_id: user_id)
end
def name_with_namespace
@name_with_namespace ||= begin
if namespace
......@@ -693,7 +704,6 @@ class Project < ActiveRecord::Base
end
end
end
alias_method :human_name, :name_with_namespace
def path_with_namespace
if namespace
......
app/models/project_team.rb
View file @ 452c076a
This diff is collapsed.
app/models/repository.rb
View file @ 452c076a
This diff is collapsed.
app/models/service.rb
View file @ 452c076a
This diff is collapsed.
app/models/todo.rb
View file @ 452c076a
This diff is collapsed.
app/models/user.rb
View file @ 452c076a
This diff is collapsed.
app/services/ci/create_builds_service.rb
View file @ 452c076a
This diff is collapsed.
app/services/ci/register_build_service.rb
View file @ 452c076a
This diff is collapsed.
app/services/create_deployment_service.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
app/services/git_hooks_service.rb
View file @ 452c076a
This diff is collapsed.
app/services/notification_service.rb
View file @ 452c076a
This diff is collapsed.
app/services/todo_service.rb
View file @ 452c076a
This diff is collapsed.
app/views/admin/background_jobs/_head.html.haml deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
app/views/admin/builds/index.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/admin/dashboard/_head.html.haml deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
app/views/admin/dashboard/index.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/admin/groups/index.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/admin/groups/show.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/admin/health_check/show.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/admin/logs/show.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/admin/projects/index.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/admin/projects/show.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/admin/users/groups.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/admin/users/index.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/admin/users/projects.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/dashboard/issues.atom.builder
View file @ 452c076a
This diff is collapsed.
app/views/groups/group_members/_group_member.html.haml 0 → 100644
View file @ 452c076a
This diff is collapsed.
app/views/groups/issues.atom.builder
View file @ 452c076a
This diff is collapsed.
app/views/groups/show.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/issues/_issue.atom.builder
View file @ 452c076a
This diff is collapsed.
app/views/layouts/_page.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/layouts/_search.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/layouts/admin.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/layouts/application.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/layouts/header/_default.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/layouts/nav/_admin.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/layouts/nav/_dashboard.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/layouts/nav/_project.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/notify/group_access_granted_email.html.haml 0 → 100644
View file @ 452c076a
This diff is collapsed.
app/views/notify/group_access_granted_email.text.erb 0 → 100644
View file @ 452c076a
This diff is collapsed.
app/views/notify/group_invite_accepted_email.html.haml 0 → 100644
View file @ 452c076a
This diff is collapsed.
app/views/notify/group_invite_accepted_email.text.erb 0 → 100644
View file @ 452c076a
This diff is collapsed.
app/views/notify/group_invite_declined_email.html.haml 0 → 100644
View file @ 452c076a
This diff is collapsed.
app/views/notify/group_invite_declined_email.text.erb 0 → 100644
View file @ 452c076a
This diff is collapsed.
app/views/notify/member_access_denied_email.html.haml deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
app/views/notify/member_access_denied_email.text.erb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
app/views/notify/member_access_granted_email.html.haml deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
app/views/notify/member_access_granted_email.text.erb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
app/views/notify/member_invite_accepted_email.text.erb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
app/views/notify/member_invite_declined_email.text.erb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
app/views/notify/project_access_granted_email.html.haml 0 → 100644
View file @ 452c076a
This diff is collapsed.
app/views/notify/project_access_granted_email.text.erb 0 → 100644
View file @ 452c076a
This diff is collapsed.
app/views/notify/project_invite_accepted_email.html.haml 0 → 100644
View file @ 452c076a
This diff is collapsed.
app/views/notify/project_invite_accepted_email.text.erb 0 → 100644
View file @ 452c076a
This diff is collapsed.
app/views/notify/project_invite_declined_email.html.haml 0 → 100644
View file @ 452c076a
This diff is collapsed.
app/views/notify/project_invite_declined_email.text.erb 0 → 100644
View file @ 452c076a
This diff is collapsed.
app/views/notify/project_member_invited_email.html.haml 0 → 100644
View file @ 452c076a
This diff is collapsed.
app/views/notify/project_member_invited_email.text.erb 0 → 100644
View file @ 452c076a
This diff is collapsed.
app/views/projects/_home_panel.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/projects/buttons/_star.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/projects/commit/_change.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/projects/commits/_head.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/projects/commits/show.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/projects/deployments/_commit.html.haml deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
app/views/projects/deployments/_deployment.html.haml deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
app/views/projects/diffs/_diffs.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/projects/diffs/_file.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/projects/environments/_environment.html.haml deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
app/views/projects/environments/_form.html.haml deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
app/views/projects/environments/index.html.haml deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
app/views/projects/environments/new.html.haml deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
app/views/projects/environments/show.html.haml deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
app/views/projects/issues/_head.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/projects/labels/index.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/projects/network/show.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/projects/new.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/projects/project_members/_project_member.html.haml 0 → 100644
View file @ 452c076a
This diff is collapsed.
app/views/shared/_label_row.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/shared/_merge_requests.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/shared/groups/_group.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/shared/issuable/_form.html.haml
View file @ 452c076a
This diff is collapsed.
app/views/shared/members/_member.html.haml deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
app/views/shared/members/_requests.html.haml deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
app/views/u2f/_register.html.haml
View file @ 452c076a
This diff is collapsed.
app/workers/expire_build_artifacts_worker.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
app/workers/stuck_ci_builds_worker.rb
View file @ 452c076a
This diff is collapsed.
config/application.rb
View file @ 452c076a
This diff is collapsed.
config/gitlab.yml.example
View file @ 452c076a
This diff is collapsed.
config/initializers/1_settings.rb
View file @ 452c076a
This diff is collapsed.
config/initializers/chronic_duration.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
config/initializers/doorkeeper.rb
View file @ 452c076a
This diff is collapsed.
config/initializers/metrics.rb
View file @ 452c076a
This diff is collapsed.
config/routes.rb
View file @ 452c076a
This diff is collapsed.
db/fixtures/development/15_award_emoji.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
db/migrate/20160416190505_remove_note_is_award.rb 0 → 100644
View file @ 452c076a
This diff is collapsed.
db/migrate/20160610204157_add_deployments.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
db/migrate/20160610204158_add_environments.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
db/migrate/20160610211845_add_environment_to_builds.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
db/schema.rb
View file @ 452c076a
This diff is collapsed.
doc/README.md
View file @ 452c076a
This diff is collapsed.
doc/administration/logs.md deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
doc/api/README.md
View file @ 452c076a
This diff is collapsed.
doc/api/builds.md
View file @ 452c076a
This diff is collapsed.
doc/api/ci/README.md deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
doc/api/ci/builds.md deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
doc/api/ci/runners.md deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
doc/api/issues.md
View file @ 452c076a
This diff is collapsed.
doc/ci/README.md
View file @ 452c076a
This diff is collapsed.
doc/ci/api/README.md
View file @ 452c076a
This diff is collapsed.
doc/ci/api/builds.md
View file @ 452c076a
This diff is collapsed.
doc/ci/api/runners.md
View file @ 452c076a
This diff is collapsed.
doc/ci/docker/using_docker_build.md
View file @ 452c076a
This diff is collapsed.
doc/ci/docker/using_docker_images.md
View file @ 452c076a
This diff is collapsed.
doc/ci/examples/php.md
View file @ 452c076a
This diff is collapsed.
doc/ci/runners/README.md
View file @ 452c076a
This diff is collapsed.
doc/ci/variables/README.md
View file @ 452c076a
This diff is collapsed.
doc/ci/yaml/README.md
View file @ 452c076a
This diff is collapsed.
doc/container_registry/README.md
View file @ 452c076a
This diff is collapsed.
doc/development/doc_styleguide.md
View file @ 452c076a
This diff is collapsed.
doc/development/instrumentation.md
View file @ 452c076a
This diff is collapsed.
doc/development/migration_style_guide.md
View file @ 452c076a
This diff is collapsed.
doc/logs/logs.md
View file @ 452c076a
This diff is collapsed.
doc/permissions/permissions.md
View file @ 452c076a
This diff is collapsed.
features/admin/active_tab.feature
View file @ 452c076a
This diff is collapsed.
features/steps/admin/active_tab.rb
View file @ 452c076a
This diff is collapsed.
features/steps/dashboard/group.rb
View file @ 452c076a
This diff is collapsed.
features/steps/dashboard/new_project.rb
View file @ 452c076a
This diff is collapsed.
features/steps/group/members.rb
View file @ 452c076a
This diff is collapsed.
features/steps/project/team_management.rb
View file @ 452c076a
This diff is collapsed.
lib/api/builds.rb
View file @ 452c076a
This diff is collapsed.
lib/api/entities.rb
View file @ 452c076a
This diff is collapsed.
lib/api/project_members.rb
View file @ 452c076a
This diff is collapsed.
lib/api/session.rb
View file @ 452c076a
This diff is collapsed.
lib/banzai/pipeline/description_pipeline.rb
View file @ 452c076a
This diff is collapsed.
lib/banzai/reference_parser/issue_parser.rb
View file @ 452c076a
This diff is collapsed.
lib/ci/api/builds.rb
View file @ 452c076a
This diff is collapsed.
lib/ci/api/entities.rb
View file @ 452c076a
This diff is collapsed.
lib/ci/gitlab_ci_yaml_processor.rb
View file @ 452c076a
This diff is collapsed.
lib/container_registry/blob.rb
View file @ 452c076a
This diff is collapsed.
lib/container_registry/client.rb
View file @ 452c076a
This diff is collapsed.
lib/container_registry/tag.rb
View file @ 452c076a
This diff is collapsed.
lib/gitlab/auth.rb
View file @ 452c076a
This diff is collapsed.
lib/gitlab/backend/grack_auth.rb
View file @ 452c076a
This diff is collapsed.
lib/gitlab/backend/shell_env.rb 0 → 100644
View file @ 452c076a
This diff is collapsed.
lib/gitlab/ci/config.rb
View file @ 452c076a
This diff is collapsed.
lib/gitlab/ci/config/node/configurable.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
lib/gitlab/ci/config/node/entry.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
lib/gitlab/ci/config/node/factory.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
lib/gitlab/ci/config/node/global.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
lib/gitlab/ci/config/node/null.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
lib/gitlab/ci/config/node/script.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
lib/gitlab/ci/config/node/validation_helpers.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
lib/gitlab/database.rb
View file @ 452c076a
This diff is collapsed.
lib/gitlab/database/migration_helpers.rb
View file @ 452c076a
This diff is collapsed.
lib/gitlab/gl_id.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
lib/gitlab/metrics/instrumentation.rb
View file @ 452c076a
This diff is collapsed.
lib/gitlab/metrics/rack_middleware.rb
View file @ 452c076a
This diff is collapsed.
lib/gitlab/metrics/sampler.rb
View file @ 452c076a
This diff is collapsed.
lib/gitlab/regex.rb
View file @ 452c076a
This diff is collapsed.
lib/gitlab/workhorse.rb
View file @ 452c076a
This diff is collapsed.
scripts/prepare_build.sh
View file @ 452c076a
This diff is collapsed.
spec/controllers/blob_controller_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/factories/deployments.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
spec/factories/environments.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
spec/factories/projects.rb
View file @ 452c076a
This diff is collapsed.
spec/features/admin/admin_hooks_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/features/atom/dashboard_issues_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/features/builds_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/features/environments_spec.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
spec/features/issues/filter_issues_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/features/issues/move_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/features/issues/todo_spec.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
spec/features/issues_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/features/search_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/features/u2f_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/finders/notes_finder_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/fixtures/container_registry/tag_manifest_1.json deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
spec/helpers/gitlab_routing_helper_spec.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
spec/helpers/issues_helper_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/helpers/members_helper_spec.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
spec/helpers/projects_helper_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/javascripts/application_spec.js.coffee deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
spec/javascripts/fixtures/application.html.haml deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
spec/javascripts/notes_spec.js.coffee
View file @ 452c076a
This diff is collapsed.
spec/javascripts/search_autocomplete_spec.js.coffee deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
spec/lib/container_registry/tag_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/lib/gitlab/auth_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/lib/gitlab/ci/config/node/configurable_spec.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
spec/lib/gitlab/ci/config/node/factory_spec.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
spec/lib/gitlab/ci/config/node/global_spec.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
spec/lib/gitlab/ci/config/node/null_spec.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
spec/lib/gitlab/ci/config/node/script_spec.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
spec/lib/gitlab/ci/config_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/lib/gitlab/metrics/sampler_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/lib/gitlab/search_results_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/mailers/notify_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/models/build_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/models/concerns/access_requestable_spec.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
spec/models/concerns/milestoneish_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/models/deployment_spec.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
spec/models/environment_spec.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
spec/models/event_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/models/group_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/models/member_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/models/members/group_member_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/models/members/project_member_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/models/note_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/models/notification_setting_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/models/project_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/models/project_team_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/requests/api/builds_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/requests/api/issues_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/requests/api/milestones_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/requests/ci/api/builds_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/requests/git_http_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/requests/jwt_controller_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/services/create_deployment_service_spec.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
spec/services/notification_service_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/services/todo_service_spec.rb
View file @ 452c076a
This diff is collapsed.
spec/support/test_env.rb
View file @ 452c076a
This diff is collapsed.
spec/workers/expire_build_artifacts_worker_spec.rb deleted 100644 → 0
View file @ 13e37a3e
This diff is collapsed.
spec/workers/stuck_ci_builds_worker_spec.rb
View file @ 452c076a
This diff is collapsed.
vendor/assets/javascripts/raphael.js deleted 100644 → 0
View file @ 13e37a3e
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