diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-11-25 12:53:41 +0100 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-01-02 13:49:09 +0100 |
commit | 190d73c3c942ba5614d60bba4e47ffd9634cedd3 (patch) | |
tree | 97719d164689948ff45809e13655499b4a918d2e | |
parent | 194bc72996236297a3ccbc42bb2728e3817c1c06 (diff) | |
download | gitlab-ce-190d73c3c942ba5614d60bba4e47ffd9634cedd3.tar.gz |
Improve readability in pipeline model class
-rw-r--r-- | app/models/ci/pipeline.rb | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index d69a9dabcfc..e4de223e0f7 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -312,6 +312,12 @@ module Ci Ci::ProcessPipelineService.new(project, user).execute(self) end + def predefined_variables + [ + { key: 'CI_PIPELINE_ID', value: id.to_s, public: true } + ] + end + def update_status Gitlab::OptimisticLocking.retry_lock(self) do case latest_builds_status @@ -325,10 +331,10 @@ module Ci end end - def predefined_variables - [ - { key: 'CI_PIPELINE_ID', value: id.to_s, public: true } - ] + def update_duration + return unless started_at + + self.duration = Gitlab::Ci::PipelineDuration.from_pipeline(self) end def queued_duration @@ -338,12 +344,6 @@ module Ci seconds unless seconds.zero? end - def update_duration - return unless started_at - - self.duration = Gitlab::Ci::PipelineDuration.from_pipeline(self) - end - def execute_hooks data = pipeline_data project.execute_hooks(data, :pipeline_hooks) @@ -371,7 +371,7 @@ module Ci end def latest_builds_status - return 'failed' unless yaml_errors.blank? + return 'failed' if yaml_errors.present? statuses.latest.status || 'skipped' end |