diff options
| author | Sam Bigelow <sbigelow@gitlab.com> | 2019-06-03 17:35:39 -0400 |
|---|---|---|
| committer | Sam Bigelow <sbigelow@gitlab.com> | 2019-06-05 17:29:18 -0400 |
| commit | c763d98ed76a2a23c05b9816dee3245779313ecf (patch) | |
| tree | 41302535a23ed5aae40204ec5383b65a378d4c58 /app/controllers/projects/merge_requests/application_controller.rb | |
| parent | e6a88b024fa7f8e1ec5b712744d0e0d118b026e6 (diff) | |
| download | gitlab-ce-c763d98ed76a2a23c05b9816dee3245779313ecf.tar.gz | |
Backport of EE Displaying Blocking MRsee-9688-fe-mr-merge-order
This MR is a backport of an EE merge request
Diffstat (limited to 'app/controllers/projects/merge_requests/application_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests/application_controller.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/controllers/projects/merge_requests/application_controller.rb b/app/controllers/projects/merge_requests/application_controller.rb index eb469d2d714..f2a6268b3e9 100644 --- a/app/controllers/projects/merge_requests/application_controller.rb +++ b/app/controllers/projects/merge_requests/application_controller.rb @@ -7,11 +7,15 @@ class Projects::MergeRequests::ApplicationController < Projects::ApplicationCont private - # rubocop: disable CodeReuse/ActiveRecord def merge_request - @issuable = @merge_request ||= @project.merge_requests.includes(author: :status).find_by!(iid: params[:id]) + @issuable = + @merge_request ||= + merge_request_includes(@project.merge_requests).find_by_iid!(params[:id]) + end + + def merge_request_includes(association) + association.includes(:metrics, :assignees, author: :status) # rubocop:disable CodeReuse/ActiveRecord end - # rubocop: enable CodeReuse/ActiveRecord def merge_request_params params.require(:merge_request).permit(merge_request_params_attributes) |