diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2019-06-07 14:16:29 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2019-06-07 14:16:29 +0000 |
| commit | 53da0237fae80c3e2b1b7d55d150a87d83f1c6e7 (patch) | |
| tree | 871e6b45c5c42565bff8e47f7e946a7f676de472 /app/controllers | |
| parent | 5e05ec3b8b7e8f693e3ca74fe73aca64655356a0 (diff) | |
| parent | c763d98ed76a2a23c05b9816dee3245779313ecf (diff) | |
| download | gitlab-ce-53da0237fae80c3e2b1b7d55d150a87d83f1c6e7.tar.gz | |
Merge branch 'ee-9688-fe-mr-merge-order' into 'master'
Backport of EE Displaying Blocking MRs
See merge request gitlab-org/gitlab-ce!29095
Diffstat (limited to 'app/controllers')
| -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) |