kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '22248-fix-namespace-undefined-method' into 'master'

Browse source 
Render invalid template for open merge requests without source project

If source project was removed and merge request for some reason wasn't closed is rendered `invalid` template. Fix !6177

Fix #22248 

See merge request !6383
This commit is contained in:
Rémy Coutable 2016-09-19 08:41:15 +00:00
commit 1e7ea64e62
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/projects/merge_requests_controller.rb
View file

@ -428,6 +428,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
def validates_merge_request
# If source project was removed and merge request for some reason
# wasn't close (Ex. mr from fork to origin)
return invalid_mr if !@merge_request.source_project && @merge_request.open?
# Show git not found page
# if there is no saved commits between source & target branch
if @merge_request.commits.blank?