diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-07-16 08:55:52 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-07-16 08:55:52 +0000 |
| commit | 62563a393fb9402b441666b5b047cbd3c80bcc6b (patch) | |
| tree | 648fc7a28af28c0b7265fd63c34e5c8b21ccf258 /.gitlab-ci.yml | |
| parent | 86456af1c41f52f662659b3c84229464e07b208e (diff) | |
| parent | d3dcc9d428d21702b167deb9da753b1227737ef0 (diff) | |
| download | gitlab-ce-62563a393fb9402b441666b5b047cbd3c80bcc6b.tar.gz | |
Merge branch 'jprovazn-rails-ci' into 'master'
Trigger rails5 tests if variable is set
See merge request gitlab-org/gitlab-ce!20609
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9f6592b6278..e1b58379063 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,7 +86,9 @@ stages: .rails5: &rails5 allow_failure: true only: - - /rails5/ + variables: + - $CI_COMMIT_REF_NAME =~ /rails5/ + - $RAILS5_ENABLED variables: BUNDLE_GEMFILE: "Gemfile.rails5" RAILS5: "true" |