diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-08 06:08:13 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-08 06:08:13 +0000 |
| commit | f6e985dba4d0f5b1ede95e9174d30dd6a8bedf0d (patch) | |
| tree | c1fed91ae38ad6150ba323a2fc9a68f50f648bb4 /app/controllers/projects/merge_requests_controller.rb | |
| parent | 30010b161d42bdac3ab5cd16e63cc61c2f4939f3 (diff) | |
| download | gitlab-ce-f6e985dba4d0f5b1ede95e9174d30dd6a8bedf0d.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 94b5f29eff7..5af0c835385 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -9,7 +9,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo include ToggleAwardEmoji include IssuableCollections include RecordUserLastActivity - include SourcegraphGon + include SourcegraphDecorator skip_before_action :merge_request, only: [:index, :bulk_update] before_action :whitelist_query_limiting, only: [:assign_related_issues, :update] |