Show deployment status on a MR view

3 files changed, 19 insertions, 0 deletions

diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index 1a7cd60817e..67a4f3998ec 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -36,4 +36,11 @@ class Deployment < ActiveRecord::Base
   def manual_actions
     deployable.try(:other_actions)
   end
+
+  def deployed_to(ref)
+    commit = project.commit(ref)
+    return false unless commit
+
+    project.repository.merge_base(commit.id, sha) == commit.id
+  end
 end
diff --git a/app/models/environment.rb b/app/models/environment.rb
index baed106e8c8..f6fdb8d1ecf 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -25,4 +25,10 @@ class Environment < ActiveRecord::Base
   def nullify_external_url
     self.external_url = nil if self.external_url.blank?
   end
+
+  def deployed_to?(ref)
+    return unless last_deployment
+
+    last_deployment.deployed_to(ref)
+  end
 end
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index b1fb3ce5d69..85e4d1f6b51 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -590,6 +590,12 @@ class MergeRequest < ActiveRecord::Base
     !pipeline || pipeline.success?
   end
 
+  def environments
+    target_project.environments.select do |environment|
+      environment.deployed_to?(ref_path)
+    end
+  end
+
   def state_human_name
     if merged?
       "Merged"