diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-12 09:07:48 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-12 09:07:48 +0000 |
| commit | fc53ce8e6ca67bf217470179a1ea6cf139bcffad (patch) | |
| tree | 3721386728719a7779d1cd627281e9a28cc40c4a /app/controllers/projects/merge_requests_controller.rb | |
| parent | 8e22ef10e4f9c6d1ef2411aa26ddd0658e2f1461 (diff) | |
| download | gitlab-ce-fc53ce8e6ca67bf217470179a1ea6cf139bcffad.tar.gz | |
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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 07f568e2a04..69e3e7c7acb 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -20,6 +20,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo before_action :check_user_can_push_to_source_branch!, only: [:rebase] before_action only: [:show] do push_frontend_feature_flag(:diffs_batch_load, @project) + push_frontend_feature_flag(:single_mr_diff_view, @project) end before_action do |