diff options
| author | Tomasz Maczukin <tomasz@maczukin.pl> | 2016-01-14 14:59:04 +0100 |
|---|---|---|
| committer | Tomasz Maczukin <tomasz@maczukin.pl> | 2016-01-14 14:59:04 +0100 |
| commit | 2c7d9cfa7dbd4e7716793bdb1ee9e081f13c33b2 (patch) | |
| tree | 4430479ebd90419dac607a90d24242ee78873e1c | |
| parent | 405b82af230921db7b1510183063b126ef908e46 (diff) | |
| download | gitlab-ce-ci/api-builds.tar.gz | |
Move Ci::Build#available_statuses to AVAILABLE_STATUSES constant in CommitStatusci/api-builds
| -rw-r--r-- | app/models/ci/build.rb | 4 | ||||
| -rw-r--r-- | app/models/commit_status.rb | 2 | ||||
| -rw-r--r-- | lib/api/builds.rb | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 90d9669faca..a4779d06de8 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -97,10 +97,6 @@ module Ci new_build.save new_build end - - def available_statuses - state_machines[:status].states.map &:value - end end state_machine :status, initial: :pending do diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb index ff479493474..de1e3eb7eaf 100644 --- a/app/models/commit_status.rb +++ b/app/models/commit_status.rb @@ -56,6 +56,8 @@ class CommitStatus < ActiveRecord::Base scope :ordered, -> { order(:ref, :stage_idx, :name) } scope :for_ref, ->(ref) { where(ref: ref) } + AVAILABLE_STATUSES = ['pending', 'running', 'success', 'failed', 'canceled'] + state_machine :status, initial: :pending do event :run do transition pending: :running diff --git a/lib/api/builds.rb b/lib/api/builds.rb index 1337e1bb452..d293f988165 100644 --- a/lib/api/builds.rb +++ b/lib/api/builds.rb @@ -125,7 +125,7 @@ module API def filter_builds(builds, scope) return builds if scope.nil? || scope.empty? - available_statuses = Ci::Build.available_statuses + available_statuses = ::CommitStatus::AVAILABLE_STATUSES scope = if scope.is_a?(String) [scope] |