diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-02-10 13:32:59 +0300 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-02-22 14:29:18 +0300 |
| commit | ad88cf3e1747f1214d6d5de45862cdac98b11504 (patch) | |
| tree | bdbc00d0262fe5b7298492458c8b8c7cc8eeada1 /app/services/ci | |
| parent | 7bf28a4adaabac7b974ef7d829e604d77eb9d9df (diff) | |
updated ci skip regex to accept underscores and hyphens
Diffstat (limited to 'app/services/ci')
| -rw-r--r-- | app/services/ci/create_pipeline_service.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb index e3bc9847200..38a85e9fc42 100644 --- a/app/services/ci/create_pipeline_service.rb +++ b/app/services/ci/create_pipeline_service.rb @@ -59,7 +59,8 @@ module Ci private def skip_ci? - pipeline.git_commit_message =~ /\[(ci skip|skip ci)\]/i if pipeline.git_commit_message + return false unless pipeline.git_commit_message + pipeline.git_commit_message =~ /\[(ci[ _-]skip|skip[ _-]ci)\]/i end def commit |