summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-03 17:39:53 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-06-03 17:39:53 +0200
commit86498d4d99472edcb70ab1631f463133995a8cbf (patch)
treefbdcb60969a717de279018be874ecbc17ae95ae4
parent792670f4ce467f278b5cdfd609a221bbbe26187d (diff)
downloadgitlab-ce-86498d4d99472edcb70ab1631f463133995a8cbf.tar.gz
Use knapsack everywhere
-rwxr-xr-xRakefile2
-rw-r--r--features/support/env.rb2
-rw-r--r--spec/spec_helper.rb2
3 files changed, 3 insertions, 3 deletions
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")
diff --git a/features/support/env.rb b/features/support/env.rb
index b4b3e7359b4..4552db8ad77 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -11,7 +11,7 @@ ENV['RAILS_ENV'] = 'test'
require './config/environment'
require 'rspec/expectations'
require 'sidekiq/testing/inline'
-require 'knapsack-gitlab'
+require 'knapsack'
require_relative 'capybara'
require_relative 'db_cleaner'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f6d8dd42249..84b9ee75f6a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -15,7 +15,7 @@ require 'rspec/rails'
require 'shoulda/matchers'
require 'sidekiq/testing/inline'
require 'rspec/retry'
-require 'knapsack-gitlab'
+require 'knapsack'
require_relative 'knapsack_merger'
Knapsack::Adapters::RSpecAdapter.bind