summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2019-01-02 15:51:59 +0900
committerShinya Maeda <shinya@gitlab.com>2019-01-04 19:38:45 +0900
commitb6a9dce14e340bcc8dbd41fb6ba97b30b37e8657 (patch)
treedbe2ec65e515b0f33a8ff6cf97eb78e25628ede5
parent0d9b801a5ff9d98948954da61569668a57dde99a (diff)
downloadgitlab-ce-b6a9dce14e340bcc8dbd41fb6ba97b30b37e8657.tar.gz
Make find_actual_head_pipeline private method
a
-rw-r--r--app/models/merge_request.rb12
1 files changed, 7 insertions, 5 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index ebd1f22ebc7..613860ec31a 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -1300,11 +1300,6 @@ class MergeRequest < ActiveRecord::Base
.find_by(sha: diff_base_sha)
end
- def find_actual_head_pipeline
- source_project&.ci_pipelines
- &.latest_for_merge_request(self, source_branch, diff_head_sha)
- end
-
def discussions_rendered_on_frontend?
true
end
@@ -1348,4 +1343,11 @@ class MergeRequest < ActiveRecord::Base
source_project.repository.squash_in_progress?(id)
end
+
+ private
+
+ def find_actual_head_pipeline
+ source_project&.ci_pipelines
+ &.latest_for_merge_request(self, source_branch, diff_head_sha)
+ end
end