Commit 0ac87af6 authored by Kamil Trzciński's avatar Kamil Trzciński
Browse files

Merge branch 'skipped_commit' into 'master'

Commits with [ci skip] have special skipped status

![Screen_Shot_2015-07-30_at_14.02.50](https://gitlab.com/gitlab-org/gitlab-ci/uploads/f200af385679b564cd15d730bd4ccd20/Screen_Shot_2015-07-30_at_14.02.50.png)

+ Commits with [ci skip] are marked as skipped
+ Commits without builds are marked as skipped

Resolution for:
+ https://dev.gitlab.org/gitlab/gitlab-ci/issues/264
+ https://dev.gitlab.org/gitlab/gitlab-ci/issues/266

This requires CE update:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1073

/cc @vsizov @sytses 

See merge request !216
parents 9c0c4fd0 7f816661
......@@ -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? || builds.none?
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 == "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