From 63493944b829883e9601ff0a0f1ca3679c936674 Mon Sep 17 00:00:00 2001
From: Katarzyna Kobierska <kkobierska@gmail.com>
Date: Fri, 16 Sep 2016 16:08:19 +0200
Subject: [PATCH] Render invalid template for merge requests without source
project and open
---
app/controllers/projects/merge_requests_controller.rb | 4 ++++
1 file changed, 4 insertions(+)
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?
--
GitLab