diff options
author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-04 17:25:59 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-04 17:25:59 +0000 |
commit | c4f1bdd8ae3ec242ea1634b59c8731bee4ef804d (patch) | |
tree | 58cebf4042cf5fe5ff1a693e495023cd5647fb99 /app/models/commit.rb | |
parent | feffb36dea7830deefd1e756fbe2a82301df2061 (diff) | |
parent | a9f9fb35f99e0e0708834e3db203a6b904bd1e43 (diff) | |
download | gitlab-ci-c4f1bdd8ae3ec242ea1634b59c8731bee4ef804d.tar.gz |
Merge branch 'jobs_tabs' into 'master'
Deploy jobs
Implements #153

See merge request !124
Diffstat (limited to 'app/models/commit.rb')
-rw-r--r-- | app/models/commit.rb | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index 729b614..e92af46 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -31,7 +31,7 @@ class Commit < ActiveRecord::Base end def last_build - builds.last + builds.order(:id).last end def retry @@ -97,13 +97,13 @@ class Commit < ActiveRecord::Base end def create_builds - project.jobs.where(build_branches: true).active.map do |job| + project.jobs.where(build_branches: true).active.parallel.map do |job| create_build_from_job(job) end end def create_builds_for_tag(ref = '') - project.jobs.where(build_tags: true).active.map do |job| + project.jobs.where(build_tags: true).active.parallel.map do |job| create_build_from_job(job, ref) end end @@ -132,6 +132,16 @@ class Commit < ActiveRecord::Base @retried_builds ||= (builds - builds_without_retry) end + def run_deploy_job(ref) + if success? && !last_build.job.deploy? + project.jobs.deploy.active.each do |job| + if job.run_for_ref?(ref) + create_build_from_job(job) + end + end + end + end + def status if success? 'success' |