summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2015-07-30 14:03:25 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2015-08-05 11:38:33 +0200
commita5c6bf0317d69d5e385ac1afd72f6c294bc7a004 (patch)
tree0b7603072344d29f36ede66ef1503a4d7876a359 /app/models
parentbc0c94e7aaad67f8041c701b203ea3d912355498 (diff)
downloadgitlab-ci-a5c6bf0317d69d5e385ac1afd72f6c294bc7a004.tar.gz
Commits with [ci skip] have special skipped status
Diffstat (limited to 'app/models')
-rw-r--r--app/models/commit.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb
index eea3653..af03253 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -161,6 +161,10 @@ class Commit < ActiveRecord::Base
end
def status
+ if skip_ci?
+ return 'skipped'
+ end
+
if yaml_errors.present?
return 'failed'
end