diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2015-08-05 09:52:56 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2015-08-05 09:52:56 +0000 |
| commit | 0ac87af6ce25abf7e12a63a9cec1a2d10c841196 (patch) | |
| tree | dae8552bf095726e31e0395898fc46107750974d /spec | |
| parent | 9c0c4fd0af7353f72a4a2bc8b3767c1594cc23f7 (diff) | |
| parent | 7f81666114e1a108bb57374b0201ea8dda621c3e (diff) | |
| download | gitlab-ci-0ac87af6ce25abf7e12a63a9cec1a2d10c841196.tar.gz | |
Merge branch 'skipped_commit' into 'master'
Commits with [ci skip] have special skipped status
+ 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
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/services/create_commit_service_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/services/create_commit_service_spec.rb b/spec/services/create_commit_service_spec.rb index c8bb6bd..c72ba6b 100644 --- a/spec/services/create_commit_service_spec.rb +++ b/spec/services/create_commit_service_spec.rb @@ -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 |