diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-03-27 21:36:36 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-03-27 21:36:36 +0800 |
| commit | a236e4132e92304ee5d77f507fb98b3f98fd03bd (patch) | |
| tree | 377710f67abd62b69606773b8ae6b38775afccc9 /scripts/prepare_build.sh | |
| parent | 03cb7935187955ad68a4304a562a94a2eb1f246d (diff) | |
| parent | 40e3a70165a97526edc0caee228bc7b75f62534c (diff) | |
| download | gitlab-ce-a236e4132e92304ee5d77f507fb98b3f98fd03bd.tar.gz | |
Merge remote-tracking branch 'upstream/master' into test-pg-mysql
* upstream/master: (127 commits)
Fixed up issue boards JS specs
Implement new service for creating user
Add Changelog entry for pipeline retry fix
Do not retry jobs multiple times when retrying a pipeline
Update sentry-raven 2.0.2 -> 2.4.0
Update webmock 1.21.0 -> 1.24.6
Update spring 1.7.2 -> 2.0.1
Update simplecov 0.12.0 -> 0.14.1
Update pry-rails 0.3.4 -> 0.3.5
Update pry-byebug 3.4.1 -> 3.4.2
Update flay 2.6.1 -> 2.8.1
Optimize labels finder query
Remove Tags filter from Projects Explore dropdown
Update capybara-screenshot 1.0.11 -> 1.0.14
Update bullet 5.2.0 -> 5.5.1
Update brakeman 3.4.1 -> 3.6.1
Remove web-console gem
Update better_errors 1.0.1 -> 2.1.1
Display flash message to unauthenticated user when creating new issue
Activate group name toggle based on horizontal space
...
Diffstat (limited to 'scripts/prepare_build.sh')
| -rwxr-xr-x | scripts/prepare_build.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index 885b7eabba0..f170743aea3 100755 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -38,7 +38,7 @@ fi # Only install knapsack after bundle install! Otherwise oddly some native # gems could not be found under some circumstance. No idea why, hours wasted. -retry gem install knapsack +retry gem install knapsack fog-aws mime-types if [ "$SETUP_DB" != "false" ]; then bundle exec rake db:drop db:create db:schema:load db:migrate |