diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-22 21:52:21 -0500 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-03 17:08:18 +0200 |
| commit | 9df2613a4e22741f8c0dfd6ff053adc7b0ff7a69 (patch) | |
| tree | 2968ab0f0e9ee225fecde3c75bfa0008bc67058f | |
| parent | e275b6d2510fc94ea32e94acb44429cfcec28543 (diff) | |
| download | gitlab-ce-9df2613a4e22741f8c0dfd6ff053adc7b0ff7a69.tar.gz | |
Fix knapsack usage
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rwxr-xr-x | Rakefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 61136564623..d573d80cdb8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,7 +50,7 @@ prepare: - JOB_NAME=( $CI_BUILD_NAME ) - export CI_NODE_INDEX=${JOB_NAME[1]} - export CI_NODE_TOTAL=${JOB_NAME[2]} - - knapsack ${JOB_NAME[0]} + - knapsack-gitlab ${JOB_NAME[0]} .exec: &exec stage: test diff --git a/Gemfile.lock b/Gemfile.lock index c04a3b1351d..0f75c231d4e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -358,7 +358,7 @@ GEM actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.10.0) - knapsack-gitlab (1.9.0) + knapsack-gitlab (1.9.2) rake timecop (>= 0.1.0) launchy (2.4.3) @@ -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' +require 'knapsack-gitlab' relative_url_conf = File.expand_path('../config/initializers/relative_url', __FILE__) require relative_url_conf if File.exist?("#{relative_url_conf}.rb") |