Merge remote-tracking branch 'origin/master' into 21170-cycle-analytics

1 files changed, 11 insertions, 1 deletions

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 6548b84ea7a..e7af37a6c0a 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -322,6 +322,10 @@ class MergeRequest < ActiveRecord::Base
     closed? && forked_source_project_missing?
   end
 
+  def closed_without_source_project?
+    closed? && !source_project
+  end
+
   def forked_source_project_missing?
     return false unless for_fork?
     return true unless source_project
@@ -329,6 +333,12 @@ class MergeRequest < ActiveRecord::Base
     !source_project.forked_from?(target_project)
   end
 
+  def reopenable?
+    return false if closed_without_fork? || closed_without_source_project? || merged?
+
+    closed?
+  end
+
   def ensure_merge_request_diff
     merge_request_diff || create_merge_request_diff
   end
@@ -661,7 +671,7 @@ class MergeRequest < ActiveRecord::Base
   end
 
   def environments
-    return unless diff_head_commit
+    return [] unless diff_head_commit
 
     target_project.environments.select do |environment|
       environment.includes_commit?(diff_head_commit)