diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-23 21:08:35 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-23 21:08:35 +0000 |
| commit | 24256212ea84e6fb6509f6fb317a2d2bac3d0d06 (patch) | |
| tree | e4300d70d8e724179d9de657a68d88462aaaf04a /app/controllers/projects/merge_requests_controller.rb | |
| parent | d933bc5a8738d24898c5a82cc72ee9bd050425e6 (diff) | |
| download | gitlab-ce-24256212ea84e6fb6509f6fb317a2d2bac3d0d06.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, 0 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 22de8dd4109..7cdda071813 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -25,7 +25,6 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo before_action do push_frontend_feature_flag(:vue_issuable_sidebar, @project.group) - push_frontend_feature_flag(:async_mr_widget, @project) end around_action :allow_gitaly_ref_name_caching, only: [:index, :show, :discussions] |