diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-04-12 16:11:35 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-12 16:11:35 +0800 |
| commit | 330292518ec9e5839eb85fbf0ae5887ec8b6b081 (patch) | |
| tree | ca7ee936a5c70347dba17a09051443b5fd6e237d /.gitlab-ci.yml | |
| parent | eeb89a6010fce509f0cb6735e1ae9dc3cc5336d1 (diff) | |
| parent | d59f48987baceb25aa87dc6d87551f68af4bb1ed (diff) | |
| download | gitlab-ce-330292518ec9e5839eb85fbf0ae5887ec8b6b081.tar.gz | |
Merge remote-tracking branch 'upstream/master' into test-pg-mysql
* upstream/master: (90 commits)
Fixed notebooklab code including file paths
[BB Importer] Save the error trace and the whole raw document
Statisfy Robertcop and Seancop
Update documents according to:
Update licenses.csv via:
Update templates via:
Add foreign key on trigger requests
Added CHANGELOG
Added tests and fixed a typo
Fix typo on the class merge-when-pipeline_succeeds
Axil's review
remove unnecessary line
typo
fix typo
fix links
Remove an unused `cared` scope from Issue and MergeRequest
Remove an unused `Issue.open_for` scope
add topic: authentication
Fix edit button on blame page without repo perms
Don't show 'Copy content' button on text files that are not rendered as text
...
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 31db88a19fa..f0b51ce33f5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -427,8 +427,7 @@ bundler:audit: script: - git fetch origin v8.14.10 - git checkout -f FETCH_HEAD - - cp config/resque.yml.example config/resque.yml - - sed -i 's/localhost/redis/g' config/resque.yml + - bundle install --without production --jobs $(nproc) $FLAGS --retry=3 - bundle install --without production --jobs $(nproc) $FLAGS --retry=3 - bundle exec rake db:drop db:create db:schema:load db:seed_fu - git checkout $CI_COMMIT_SHA |