diff options
| author | Katarzyna Kobierska <kkobierska@gmail.com> | 2016-09-16 16:08:19 +0200 |
|---|---|---|
| committer | Katarzyna Kobierska <kkobierska@gmail.com> | 2016-09-16 17:47:59 +0200 |
| commit | 63493944b829883e9601ff0a0f1ca3679c936674 (patch) | |
| tree | 3adde98f0b83bc0e88fec947006f4b07dfd648c4 | |
| parent | 9498c4d52a3e6533da6e41443041edfbd042333f (diff) | |
| download | gitlab-ce-63493944b829883e9601ff0a0f1ca3679c936674.tar.gz | |
Render invalid template for merge requests without source project and open
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index aa8645ba8cc..0288ee87717 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -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? |