Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 0 deletions

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index eb98bf3da7f..f769fc0b961 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -73,6 +73,14 @@ class MergeRequest < ApplicationRecord
   has_many :merge_request_assignees
   has_many :assignees, class_name: "User", through: :merge_request_assignees
 
+  has_many :deployment_merge_requests
+
+  # These are deployments created after the merge request has been merged, and
+  # the merge request was tracked explicitly (instead of implicitly using a CI
+  # build).
+  has_many :deployments,
+    through: :deployment_merge_requests
+
   KNOWN_MERGE_PARAMS = [
     :auto_merge_strategy,
     :should_remove_source_branch,
@@ -1475,6 +1483,10 @@ class MergeRequest < ApplicationRecord
     true
   end
 
+  def recent_visible_deployments
+    deployments.visible.includes(:environment).order(id: :desc).limit(10)
+  end
+
   private
 
   def with_rebase_lock