diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 12:07:52 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 12:07:52 +0300 |
| commit | 7e019504f5ac6decde690565857238e7e59aa034 (patch) | |
| tree | fab8832b40e25fc9bc1ae54b9303b95ea146b5d5 /app/controllers/projects/merge_requests_controller.rb | |
| parent | 116d4e56e83a1f408afe710ce070e699ba206475 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index e87f1728cbb..a81fd0f7dc9 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -29,6 +29,10 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo push_frontend_feature_flag(:vue_issuable_sidebar, @project.group) end + before_action only: :show do + push_frontend_feature_flag(:sort_discussions, @project) + end + around_action :allow_gitaly_ref_name_caching, only: [:index, :show, :discussions] def index |