Merge branch '22248-fix-namespace-undefined-method' into 'master'
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:
commit
1e7ea64e62
1 changed files with 4 additions and 0 deletions
|
@ -428,6 +428,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def validates_merge_request
|
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
|
# Show git not found page
|
||||||
# if there is no saved commits between source & target branch
|
# if there is no saved commits between source & target branch
|
||||||
if @merge_request.commits.blank?
|
if @merge_request.commits.blank?
|
||||||
|
|
Loading…
Reference in a new issue