diff options
| author | Tomasz Maczukin <tomasz@maczukin.pl> | 2015-11-06 00:52:55 +0100 |
|---|---|---|
| committer | Tomasz Maczukin <tomasz@maczukin.pl> | 2015-11-06 00:52:55 +0100 |
| commit | e40c13ae48e53432d76440e2037febb01edbbef4 (patch) | |
| tree | b7dfabc733fe8b446c6050a036ca4a3ca2312f6b /app/models/commit_status.rb | |
| parent | 3a52662ce3cb797a49f992d60bd976f03fbf1bb1 (diff) | |
| parent | 193bc5fb3cf4033d5904e620f367b245da3794e4 (diff) | |
| download | gitlab-ce-e40c13ae48e53432d76440e2037febb01edbbef4.tar.gz | |
Merge branch 'master' into fix/visibility-level-setting-in-forked-projects
* master:
Add CI permissions and api links to README [ci skip]
Remove duplicate documentation links
make migrations reversible
Add missing stage to builds view
CI details cleanup
Allow groups to appear in the search results if the group owner allows it
Update installation.md
update example of regex for pytest-cov
Diffstat (limited to 'app/models/commit_status.rb')
| -rw-r--r-- | app/models/commit_status.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb index 0b73ab6d2eb..7d54d83974a 100644 --- a/app/models/commit_status.rb +++ b/app/models/commit_status.rb @@ -15,8 +15,8 @@ class CommitStatus < ActiveRecord::Base scope :pending, -> { where(status: 'pending') } scope :success, -> { where(status: 'success') } scope :failed, -> { where(status: 'failed') } - scope :running_or_pending, -> { where(status:[:running, :pending]) } - scope :finished, -> { where(status:[:success, :failed, :canceled]) } + scope :running_or_pending, -> { where(status: [:running, :pending]) } + scope :finished, -> { where(status: [:success, :failed, :canceled]) } scope :latest, -> { where(id: unscope(:select).select('max(id)').group(:name, :ref)) } scope :ordered, -> { order(:ref, :stage_idx, :name) } scope :for_ref, ->(ref) { where(ref: ref) } |