Merge branch '62178-remove-manual-sorting-feature-flag' into 'master'

Remove the manual sorting feature flag

See merge request gitlab-org/gitlab-ce!30131
This commit is contained in:
Sean McGivern 2019-08-01 09:48:10 +00:00
commit 4f750ccfe5
4 changed files with 2 additions and 10 deletions

View File

@ -21,7 +21,7 @@ const updateIssue = (url, issueList, { move_before_id, move_after_id }) =>
const initManualOrdering = () => {
const issueList = document.querySelector('.manual-ordering');
if (!issueList || !(gon.features && gon.features.manualSorting) || !(gon.current_user_id > 0)) {
if (!issueList || !(gon.current_user_id > 0)) {
return;
}

View File

@ -7,10 +7,6 @@ class GroupsController < Groups::ApplicationController
include PreviewMarkdown
include RecordUserLastActivity
before_action do
push_frontend_feature_flag(:manual_sorting, default_enabled: true)
end
respond_to :html
prepend_before_action(only: [:show, :issues]) { authenticate_sessionless_user!(:rss) }

View File

@ -10,10 +10,6 @@ class Projects::IssuesController < Projects::ApplicationController
include SpammableActions
include RecordUserLastActivity
before_action do
push_frontend_feature_flag(:manual_sorting, default_enabled: true)
end
def issue_except_actions
%i[index calendar new create bulk_update import_csv]
end

View File

@ -1,7 +1,7 @@
- sort_value = @sort
- sort_title = issuable_sort_option_title(sort_value)
- viewing_issues = controller.controller_name == 'issues' || controller.action_name == 'issues'
- manual_sorting = viewing_issues && controller.controller_name != 'dashboard' && Feature.enabled?(:manual_sorting, default_enabled: true)
- manual_sorting = viewing_issues && controller.controller_name != 'dashboard'
.dropdown.inline.prepend-left-10.issue-sort-dropdown
.btn-group{ role: 'group' }