Add suffix for merge request event

Fix

ok

Add spec

Fix

ok

Fix

Add changelog

Fix

Add memoization

a

fix

1 files changed, 10 insertions, 10 deletions

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index ca941ca4331..317f965da1c 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -60,9 +60,9 @@ module Ci
 
     validates :sha, presence: { unless: :importing? }
     validates :ref, presence: { unless: :importing? }
-    validates :merge_request, presence: { if: :merge_request? }
-    validates :merge_request, absence: { unless: :merge_request? }
-    validates :tag, inclusion: { in: [false], if: :merge_request? }
+    validates :merge_request, presence: { if: :merge_request_event? }
+    validates :merge_request, absence: { unless: :merge_request_event? }
+    validates :tag, inclusion: { in: [false], if: :merge_request_event? }
     validates :status, presence: { unless: :importing? }
     validate :valid_commit_sha, unless: :importing?
     validates :source, exclusion: { in: %w(unknown), unless: :importing? }, on: :create
@@ -179,7 +179,7 @@ module Ci
 
     scope :sort_by_merge_request_pipelines, -> do
       sql = 'CASE ci_pipelines.source WHEN (?) THEN 0 ELSE 1 END, ci_pipelines.id DESC'
-      query = ActiveRecord::Base.send(:sanitize_sql_array, [sql, sources[:merge_request]]) # rubocop:disable GitlabSecurity/PublicSend
+      query = ActiveRecord::Base.send(:sanitize_sql_array, [sql, sources[:merge_request_event]]) # rubocop:disable GitlabSecurity/PublicSend
 
       order(query)
     end
@@ -196,7 +196,7 @@ module Ci
     end
 
     scope :triggered_by_merge_request, -> (merge_request) do
-      where(source: :merge_request, merge_request: merge_request)
+      where(source: :merge_request_event, merge_request: merge_request)
     end
 
     scope :detached_merge_request_pipelines, -> (merge_request) do
@@ -639,7 +639,7 @@ module Ci
         variables.append(key: 'CI_COMMIT_TITLE', value: git_commit_full_title.to_s)
         variables.append(key: 'CI_COMMIT_DESCRIPTION', value: git_commit_description.to_s)
 
-        if merge_request? && merge_request
+        if merge_request_event? && merge_request
           variables.append(key: 'CI_MERGE_REQUEST_SOURCE_BRANCH_SHA', value: source_sha.to_s)
           variables.append(key: 'CI_MERGE_REQUEST_TARGET_BRANCH_SHA', value: target_sha.to_s)
           variables.concat(merge_request.predefined_variables)
@@ -669,7 +669,7 @@ module Ci
     # All the merge requests for which the current pipeline runs/ran against
     def all_merge_requests
       @all_merge_requests ||=
-        if merge_request?
+        if merge_request_event?
           MergeRequest.where(id: merge_request_id)
         else
           MergeRequest.where(source_project_id: project_id, source_branch: ref)
@@ -714,7 +714,7 @@ module Ci
     # * nil: Modified path can not be evaluated
     def modified_paths
       strong_memoize(:modified_paths) do
-        if merge_request?
+        if merge_request_event?
           merge_request.modified_paths
         elsif branch_updated?
           push_details.modified_paths
@@ -727,7 +727,7 @@ module Ci
     end
 
     def triggered_by_merge_request?
-      merge_request? && merge_request_id.present?
+      merge_request_event? && merge_request_id.present?
     end
 
     def detached_merge_request_pipeline?
@@ -773,7 +773,7 @@ module Ci
     end
 
     def git_ref
-      if merge_request?
+      if merge_request_event?
         ##
         # In the future, we're going to change this ref to
         # merge request's merged reference, such as "refs/merge-requests/:iid/merge".