summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-05-22 20:40:56 -0500
committerKamil Trzcinski <ayufan@ayufan.eu>2016-06-03 17:08:18 +0200
commite275b6d2510fc94ea32e94acb44429cfcec28543 (patch)
tree6878b29924040c2bb892b0daa94abee60c5acc1f
parent77f8deec2ccbde0e502ecf35e1484f2c2e4e8a54 (diff)
downloadgitlab-ce-e275b6d2510fc94ea32e94acb44429cfcec28543.tar.gz
fix yml
-rw-r--r--.gitlab-ci.yml2
-rwxr-xr-xRakefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5065693b5a..61136564623 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,6 +22,7 @@ before_script:
- cp config/gitlab.yml.example config/gitlab.yml
- bundle --version
- retry bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}"
+ - retry gem install knapsack-gitlab
- '[ "$USE_DB" != "true" ] || bundle exec rake db:drop db:create db:schema:load db:migrate'
stages:
@@ -49,7 +50,6 @@ prepare:
- JOB_NAME=( $CI_BUILD_NAME )
- export CI_NODE_INDEX=${JOB_NAME[1]}
- export CI_NODE_TOTAL=${JOB_NAME[2]}
- - gem install knapsack
- knapsack ${JOB_NAME[0]}
.exec: &exec
diff --git a/Rakefile b/Rakefile
index bcfcba634d2..16261bf8ae2 100755
--- a/Rakefile
+++ b/Rakefile
@@ -3,7 +3,7 @@
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
require File.expand_path('../config/application', __FILE__)
-require 'knapsack-gitlab'
+require 'knapsack'
relative_url_conf = File.expand_path('../config/initializers/relative_url', __FILE__)
require relative_url_conf if File.exist?("#{relative_url_conf}.rb")