diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-01-19 11:18:57 +0100 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-01-19 11:18:57 +0100 |
| commit | b4d61ac46babc04f67bb191c477dddc88e10ad45 (patch) | |
| tree | 5c956996de67438678ba59d5e02e3627713b2e2f /.gitlab-ci.yml | |
| parent | 1ede975cde6d32a74b2d4d523e5c0e242c89d50d (diff) | |
| parent | 2becc6fae9b82479b644c0ca10b758cf8447bc19 (diff) | |
| download | gitlab-ce-doc_refactor_commits_api.tar.gz | |
Merge branch 'master' into doc_refactor_commits_apidoc_refactor_commits_api
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c23a7a3bf0e..ac8390074f4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ before_script: - touch log/application.log - touch log/test.log - bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}" - - bundle exec rake db:reset db:create RAILS_ENV=test + - RAILS_ENV=test bundle exec rake db:drop db:create db:schema:load db:migrate spec:feature: script: @@ -118,7 +118,7 @@ flay: - mysql bundler:audit: - script: + script: - "bundle exec bundle-audit update" - "bundle exec bundle-audit check" tags: |