summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorSimon Welsh <simon@simon.geek.nz>2016-06-23 20:09:54 +1000
committerSimon Welsh <simon@simon.geek.nz>2016-06-25 11:38:06 +1000
commit0550f2a5e7d8a7ed65632190b8febe2a9e01d6a0 (patch)
tree114d3ce610fdc1bdd4a4fec7d68d1b8eab14be29 /app
parent2fc91c48659b84375173b038b4e7957e56294aa4 (diff)
downloadgitlab-ce-0550f2a5e7d8a7ed65632190b8febe2a9e01d6a0.tar.gz
Add support for "skip ci" too
Diffstat (limited to 'app')
-rw-r--r--app/models/ci/pipeline.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 89434abca05..10324bf2257 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -163,7 +163,7 @@ module Ci
end
def skip_ci?
- git_commit_message =~ /(\[ci skip\])/i if git_commit_message
+ git_commit_message =~ /\[(ci skip|skip ci)\]/i if git_commit_message
end
def environments