summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroyuki Sato <sathiroyuki@gmail.com>2019-01-25 10:42:44 +0900
committerHiroyuki Sato <sathiroyuki@gmail.com>2019-01-25 10:42:44 +0900
commitba0509ed9dfd8db4b0faa1c34e3dc2735fa85aa3 (patch)
treeca4a799a82c741c0ad5d5b253ee1515715d2e9c0
parent9da3ae70923fdf35e4850676cc1d238e5d63ea16 (diff)
downloadgitlab-ce-ba0509ed9dfd8db4b0faa1c34e3dc2735fa85aa3.tar.gz
Make presence_of_commits_in_merge_request private method
-rw-r--r--app/models/ci/pipeline.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 09fcdc03577..8881e420735 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -346,12 +346,6 @@ module Ci
end
end
- def presence_of_commits_in_merge_request
- if merge_request&.has_no_commits?
- errors.add(:merge_request, "must have commits")
- end
- end
-
def git_author_name
strong_memoize(:git_author_name) do
commit.try(:author_name)
@@ -757,5 +751,11 @@ module Ci
project.repository.keep_around(self.sha, self.before_sha)
end
+
+ def presence_of_commits_in_merge_request
+ if merge_request&.has_no_commits?
+ errors.add(:merge_request, "must have commits")
+ end
+ end
end
end