Commit 4f750ccf authored by Sean McGivern's avatar Sean McGivern

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

Remove the manual sorting feature flag

See merge request gitlab-org/gitlab-ce!30131
parents 4072c8e1 7b6c3794
...@@ -21,7 +21,7 @@ const updateIssue = (url, issueList, { move_before_id, move_after_id }) => ...@@ -21,7 +21,7 @@ const updateIssue = (url, issueList, { move_before_id, move_after_id }) =>
const initManualOrdering = () => { const initManualOrdering = () => {
const issueList = document.querySelector('.manual-ordering'); 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; return;
} }
......
...@@ -7,10 +7,6 @@ class GroupsController < Groups::ApplicationController ...@@ -7,10 +7,6 @@ class GroupsController < Groups::ApplicationController
include PreviewMarkdown include PreviewMarkdown
include RecordUserLastActivity include RecordUserLastActivity
before_action do
push_frontend_feature_flag(:manual_sorting, default_enabled: true)
end
respond_to :html respond_to :html
prepend_before_action(only: [:show, :issues]) { authenticate_sessionless_user!(:rss) } prepend_before_action(only: [:show, :issues]) { authenticate_sessionless_user!(:rss) }
......
...@@ -10,10 +10,6 @@ class Projects::IssuesController < Projects::ApplicationController ...@@ -10,10 +10,6 @@ class Projects::IssuesController < Projects::ApplicationController
include SpammableActions include SpammableActions
include RecordUserLastActivity include RecordUserLastActivity
before_action do
push_frontend_feature_flag(:manual_sorting, default_enabled: true)
end
def issue_except_actions def issue_except_actions
%i[index calendar new create bulk_update import_csv] %i[index calendar new create bulk_update import_csv]
end end
......
- sort_value = @sort - sort_value = @sort
- sort_title = issuable_sort_option_title(sort_value) - sort_title = issuable_sort_option_title(sort_value)
- viewing_issues = controller.controller_name == 'issues' || controller.action_name == 'issues' - 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 .dropdown.inline.prepend-left-10.issue-sort-dropdown
.btn-group{ role: 'group' } .btn-group{ role: 'group' }
......
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