summaryrefslogtreecommitdiff
path: root/Rakefile
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-07 19:29:33 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-06-07 20:02:03 +0200
commit88b0a9efc44a792a7fd9f2263a1c85b9ef552504 (patch)
treed2797d97a188940de5c0497e5a0c8541b0e8f06d /Rakefile
parent5b83abcc01bd4a24268126dc52019b9f11152a7c (diff)
downloadgitlab-ce-88b0a9efc44a792a7fd9f2263a1c85b9ef552504.tar.gz
Load knapsack in Rakefile only when is bundledload-knapsack-if-defined
Diffstat (limited to 'Rakefile')
-rwxr-xr-xRakefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Rakefile b/Rakefile
index 16261bf8ae2..85fff2d51eb 100755
--- a/Rakefile
+++ b/Rakefile
@@ -3,11 +3,10 @@
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
require File.expand_path('../config/application', __FILE__)
-require 'knapsack'
relative_url_conf = File.expand_path('../config/initializers/relative_url', __FILE__)
require relative_url_conf if File.exist?("#{relative_url_conf}.rb")
Gitlab::Application.load_tasks
-Knapsack.load_tasks
+Knapsack.load_tasks if defined?(Knapsack)