kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source 
Default manual_sorting feature flag to on

See merge request gitlab-org/gitlab-ce!30788
This commit is contained in:
Sean McGivern 2019-07-24 10:41:47 +00:00
commit 98152f17ea
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/groups_controller.rb
View file

@ -8,7 +8,7 @@ class GroupsController < Groups::ApplicationController
include RecordUserLastActivity
before_action do
push_frontend_feature_flag(:manual_sorting)
push_frontend_feature_flag(:manual_sorting, default_enabled: true)
end
respond_to :html

2
app/controllers/projects/issues_controller.rb
View file

@ -11,7 +11,7 @@ class Projects::IssuesController < Projects::ApplicationController
include RecordUserLastActivity
before_action do
push_frontend_feature_flag(:manual_sorting)
push_frontend_feature_flag(:manual_sorting, default_enabled: true)
end
def issue_except_actions

2
app/views/shared/issuable/_sort_dropdown.html.haml
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)
- manual_sorting = viewing_issues && controller.controller_name != 'dashboard' && Feature.enabled?(:manual_sorting, default_enabled: true)
.dropdown.inline.prepend-left-10.issue-sort-dropdown
.btn-group{ role: 'group' }