diff options
| author | James Lopez <james@jameslopez.es> | 2016-01-22 20:01:38 +0300 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-01-22 20:01:38 +0300 |
| commit | 3d81f1da6e9a0b7370c3318a9f7851af88918ace (patch) | |
| tree | 0265dc26079da9975184de44d9b28bfb9bd9d357 /.gitlab-ci.yml | |
| parent | ba07a4c96a90a0cbe81ae7e987f32cc8eac20323 (diff) | |
| parent | 0e51ca7c4841bb388c0decb57ecc64af86c77805 (diff) | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4
# Conflicts:
# .gitlab-ci.yml
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9bd558c7d0e..4181ea152ac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,13 @@ -# This file is generated by GitLab CI -image: ruby:2.2 +image: "ruby:2.2" + +services: + - mysql:latest + - postgres:latest + - redis:latest + +variables: + MYSQL_ALLOW_EMPTY_PASSWORD: "1" + before_script: - ./scripts/prepare_build.sh - ruby -v |