diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-14 15:08:04 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-14 15:08:04 +0000 |
| commit | 8c4225a66b12683bcf1bba9bb9328fcf65395b6d (patch) | |
| tree | d3b583abd26fcbbcbf0db828aee2b940414e1649 /app/controllers/projects/merge_requests/application_controller.rb | |
| parent | 075c890053f626018ba680e4da21a93743acb244 (diff) | |
| download | gitlab-ce-8c4225a66b12683bcf1bba9bb9328fcf65395b6d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/merge_requests/application_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests/application_controller.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/projects/merge_requests/application_controller.rb b/app/controllers/projects/merge_requests/application_controller.rb index d8da448a323..76b06b2ce9d 100644 --- a/app/controllers/projects/merge_requests/application_controller.rb +++ b/app/controllers/projects/merge_requests/application_controller.rb @@ -13,6 +13,10 @@ class Projects::MergeRequests::ApplicationController < Projects::ApplicationCont @issuable = @merge_request ||= merge_request_includes(@project.merge_requests).find_by_iid!(params[:id]) + + return render_404 unless can?(current_user, :read_merge_request, @issuable) + + @issuable end def merge_request_includes(association) |