Commit 98152f17 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'bw-enable-default-manual-sorting' into 'master'

Default manual_sorting feature flag to on

See merge request gitlab-org/gitlab-ce!30788
parents b2f524e7 81f10288
...@@ -8,7 +8,7 @@ class GroupsController < Groups::ApplicationController ...@@ -8,7 +8,7 @@ class GroupsController < Groups::ApplicationController
include RecordUserLastActivity include RecordUserLastActivity
before_action do before_action do
push_frontend_feature_flag(:manual_sorting) push_frontend_feature_flag(:manual_sorting, default_enabled: true)
end end
respond_to :html respond_to :html
......
...@@ -11,7 +11,7 @@ class Projects::IssuesController < Projects::ApplicationController ...@@ -11,7 +11,7 @@ class Projects::IssuesController < Projects::ApplicationController
include RecordUserLastActivity include RecordUserLastActivity
before_action do before_action do
push_frontend_feature_flag(:manual_sorting) push_frontend_feature_flag(:manual_sorting, default_enabled: true)
end end
def issue_except_actions def issue_except_actions
......
- 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) - manual_sorting = viewing_issues && controller.controller_name != 'dashboard' && Feature.enabled?(:manual_sorting, default_enabled: true)
.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