Commit a5c6bf03 authored by Kamil Trzcinski's avatar Kamil Trzcinski
Browse files

Commits with [ci skip] have special skipped status

parent bc0c94e7
......@@ -8,6 +8,8 @@ v7.14.0 (unreleased)
- Refactor GitLab API usage to use either access_token or private_token depending on what was specified during login
- Allow to use access_token for API requests
- Added support for CI skipped status
v7.13.1
- Fix: user could steal specific runner
- Fix: don't send notifications for jobs with allow_failure set
......
......@@ -7,6 +7,8 @@ module CommitsHelper
'alert-success'
when 'failed', 'canceled'
'alert-danger'
when 'skipped'
'alert-disabled'
else
'alert-warning'
end
......
......@@ -161,6 +161,10 @@ class Commit < ActiveRecord::Base
end
def status
if skip_ci?
return 'skipped'
end
if yaml_errors.present?
return 'failed'
end
......
......@@ -60,6 +60,7 @@ describe CreateCommitService do
ci_yaml_file: gitlab_ci_yaml
)
commit.builds.any?.should be_false
commit.status.should_be "skipped"
end
it "does not skips builds creation if there is no [ci skip] tag in commit message" do
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment