Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-10-14 13:44:28 +0300
committerDouwe Maan <douwe@gitlab.com>2015-10-14 14:23:01 +0300
commitd10e3c4498e11e97548b0212887a146d19d19ffd (patch)
tree40160307c143e1796e1dad5e55caf1b9d4a7cdfb /app/services
parent3a69dd20a1d8e54c25f871f35f09a1b8b5d4b2a4 (diff)
parent82da19cecd6390d2372bad36da0a9f89b21abb38 (diff)
Merge branch 'master' into filter-label
Diffstat (limited to 'app/services')
-rw-r--r--app/services/ci/create_commit_service.rb6
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