diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-14 12:44:28 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-14 13:23:01 +0200 |
| commit | d10e3c4498e11e97548b0212887a146d19d19ffd (patch) | |
| tree | 40160307c143e1796e1dad5e55caf1b9d4a7cdfb /app/services | |
| parent | 3a69dd20a1d8e54c25f871f35f09a1b8b5d4b2a4 (diff) | |
| parent | 82da19cecd6390d2372bad36da0a9f89b21abb38 (diff) | |
| download | gitlab-ce-d10e3c4498e11e97548b0212887a146d19d19ffd.tar.gz | |
Merge branch 'master' into filter-labelfilter-label
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/ci/create_commit_service.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/services/ci/create_commit_service.rb b/app/services/ci/create_commit_service.rb index fc1ae5774d5..479a2d6defc 100644 --- a/app/services/ci/create_commit_service.rb +++ b/app/services/ci/create_commit_service.rb @@ -17,8 +17,10 @@ module Ci tag = origin_ref.start_with?('refs/tags/') commit = project.gl_project.ensure_ci_commit(sha) - commit.update_committed! - commit.create_builds(ref, tag, user) + unless commit.skip_ci? + commit.update_committed! + commit.create_builds(ref, tag, user) + end commit end |