summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-10-24 14:43:36 +0000
committerDouwe Maan <douwe@gitlab.com>2016-10-24 14:43:36 +0000
commitd04ce833376243c92a8714d9dd5a2f0c29a49923 (patch)
treea30b42ad750567f87dd5a94de1c5ae67520aa3b6
parent4a0e8f59e25a0b33e8e8cf33678688df912da8eb (diff)
parent4eb9056890d7789abc2f30be30fe3536336bdf42 (diff)
downloadgitlab-ce-d04ce833376243c92a8714d9dd5a2f0c29a49923.tar.gz
Merge branch 'cache-clear-build-fix' into 'master'
fixes build with cache:clear issue ## What does this MR do? Fixes a build issue that was probably introduced in commit 0c0caede. See merge request !7074
-rw-r--r--spec/tasks/gitlab/backup_rake_spec.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/tasks/gitlab/backup_rake_spec.rb b/spec/tasks/gitlab/backup_rake_spec.rb
index 548e7780c36..73bc8326f02 100644
--- a/spec/tasks/gitlab/backup_rake_spec.rb
+++ b/spec/tasks/gitlab/backup_rake_spec.rb
@@ -9,6 +9,7 @@ describe 'gitlab:app namespace rake task' do
Rake.application.rake_require 'tasks/gitlab/backup'
Rake.application.rake_require 'tasks/gitlab/shell'
Rake.application.rake_require 'tasks/gitlab/db'
+ Rake.application.rake_require 'tasks/cache'
# empty task as env is already loaded
Rake::Task.define_task :environment