diff options
author | Rémy Coutable <remy@rymai.me> | 2016-06-27 14:53:21 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-06-27 14:53:21 +0000 |
commit | 52be433c36ec03e6bbbb1fe03dbc5232a0e6bc07 (patch) | |
tree | f0c724862cf1cc83cd9c4d0e3a07b74eda2b78e0 /app | |
parent | f48f7760c26e681e3f8b011c7c4e2b6ccfc9c3f5 (diff) | |
parent | 0550f2a5e7d8a7ed65632190b8febe2a9e01d6a0 (diff) | |
download | gitlab-ce-52be433c36ec03e6bbbb1fe03dbc5232a0e6bc07.tar.gz |
Merge branch 'case-insensitive-ci-skip' into 'master'
Allow "ci skip" to be in any case
## What does this MR do?
This MR makes the check for the [ci skip] tag in a commit message case insensitive and adds support for [skip ci].
## Are there points in the code the reviewer needs to double check?
No.
## Why was this MR needed?
I couldn't understand why some of my commits were being built, even though they contained "[CI Skip]".
## What are the relevant issue numbers?
N/A
## Screenshots (if relevant)
N/A
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !4785
Diffstat (limited to 'app')
-rw-r--r-- | app/models/ci/pipeline.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 0c9a5e42eec..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\])/ if git_commit_message + git_commit_message =~ /\[(ci skip|skip ci)\]/i if git_commit_message end def environments |