summaryrefslogtreecommitdiff
path: root/app/models/project.rb
diff options
context:
space:
mode:
authorFelipe Artur <fcardozo@gitlab.com>2017-09-15 20:14:53 +0000
committerFelipe Artur <fcardozo@gitlab.com>2017-09-15 20:14:53 +0000
commit25c959f94d3dda63120256735163e4a142b8711e (patch)
tree4c6e544a665dab5b59106ace9638dca16b71d806 /app/models/project.rb
parentb20595b2bd0023ebbc2ec46017f5d1cb1533fb4f (diff)
parent3dd2248605ce2183f02ab268fc1f8b0b164f0bed (diff)
downloadgitlab-ce-25c959f94d3dda63120256735163e4a142b8711e.tar.gz
Merge branch 'master' into 'issue_37640'issue_37640
# Conflicts: # db/schema.rb
Diffstat (limited to 'app/models/project.rb')
-rw-r--r--app/models/project.rb17
1 files changed, 17 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index c422819a082..94ae0acbe1a 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1163,6 +1163,23 @@ class Project < ActiveRecord::Base
pipelines.order(id: :desc).find_by(sha: sha, ref: ref)
end
+ def latest_successful_pipeline_for_default_branch
+ if defined?(@latest_successful_pipeline_for_default_branch)
+ return @latest_successful_pipeline_for_default_branch
+ end
+
+ @latest_successful_pipeline_for_default_branch =
+ pipelines.latest_successful_for(default_branch)
+ end
+
+ def latest_successful_pipeline_for(ref = nil)
+ if ref && ref != default_branch
+ pipelines.latest_successful_for(ref)
+ else
+ latest_successful_pipeline_for_default_branch
+ end
+ end
+
def enable_ci
project_feature.update_attribute(:builds_access_level, ProjectFeature::ENABLED)
end