summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-10-24 15:18:56 +0000
committerRobert Speicher <robert@gitlab.com>2018-10-24 15:18:56 +0000
commit821e3959071fa3730cc1cc8db54842bfddeb01f2 (patch)
treefa72b84baf942ce9806374f7475880b390882d25
parenta1ee2072f1a7c197e13bd2d5f8ca59ad1deb1c49 (diff)
parent577bf59a754813f78dca5950f6324f6eca7e6f51 (diff)
downloadgitlab-ce-821e3959071fa3730cc1cc8db54842bfddeb01f2.tar.gz
Merge branch 'remove-unused-rails5-variables' into 'master'
Remove unused rails5-variables See merge request gitlab-org/gitlab-ce!22561
-rw-r--r--.gitlab-ci.yml6
1 files changed, 0 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ccc9e640970..1ed267cfe5e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -75,11 +75,6 @@ stages:
- mysql:5.7
- redis:alpine
-.rails5-variables: &rails5-variables
- script:
- - export RAILS5=${RAILS5}
- - export BUNDLE_GEMFILE=${BUNDLE_GEMFILE}
-
.rails5: &rails5
allow_failure: true
only:
@@ -150,7 +145,6 @@ stages:
<<: *dedicated-runner
<<: *except-docs-and-qa
<<: *pull-cache
- <<: *rails5-variables
stage: test
script:
- JOB_NAME=( $CI_JOB_NAME )