diff options
author | Robert Speicher <robert@gitlab.com> | 2016-08-25 18:49:03 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-08-25 18:49:03 +0000 |
commit | 34a472f674fa0d26deea1b248b54a44354f889ba (patch) | |
tree | d70a6369a22c89c6a9f92963898adb76b2cc4e89 /app/models | |
parent | 1cc59ffec6f9c255edc48348a95f030917609122 (diff) | |
parent | 23bed91b3fb21a92b836011677cc75c884188f10 (diff) | |
download | gitlab-ce-34a472f674fa0d26deea1b248b54a44354f889ba.tar.gz |
Merge branch 'statuseable-hasstatus' into 'master'
rename Statuseable to HasStatus
## What does this MR do?
- Rename all instances of Statuseable in the codebase, to HasStatus
- Rename all files from statuseable to has_status
## What are the relevant issue numbers?
Closes #21103
See merge request !6003
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/ci/pipeline.rb | 2 | ||||
-rw-r--r-- | app/models/commit_status.rb | 2 | ||||
-rw-r--r-- | app/models/concerns/has_status.rb (renamed from app/models/concerns/statuseable.rb) | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index aff908ea16c..03812cd195f 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -1,7 +1,7 @@ module Ci class Pipeline < ActiveRecord::Base extend Ci::Model - include Statuseable + include HasStatus self.table_name = 'ci_commits' diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb index 1b403fa646d..4a628924499 100644 --- a/app/models/commit_status.rb +++ b/app/models/commit_status.rb @@ -1,5 +1,5 @@ class CommitStatus < ActiveRecord::Base - include Statuseable + include HasStatus include Importable self.table_name = 'ci_builds' diff --git a/app/models/concerns/statuseable.rb b/app/models/concerns/has_status.rb index 750f937b724..f7b8352405c 100644 --- a/app/models/concerns/statuseable.rb +++ b/app/models/concerns/has_status.rb @@ -1,4 +1,4 @@ -module Statuseable +module HasStatus extend ActiveSupport::Concern AVAILABLE_STATUSES = %w[created pending running success failed canceled skipped] |