summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2016-10-22 12:44:53 +0000
committerRémy Coutable <remy@rymai.me>2016-10-25 15:18:29 +0200
commit01bb7673ebb342d823dab7df0f56c7d49b127020 (patch)
treeee8215fa37e4ca0101b14ad470812311fec0a57e
parent627eb7d126df0abceadf8328b6647b53ea55f723 (diff)
downloadgitlab-ce-01bb7673ebb342d823dab7df0f56c7d49b127020.tar.gz
Merge branch '23653-dont-clear-db-cache-every-release' into 'master'
Stop clearing the database cache on rake cache:clear See merge request !7056 Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--CHANGELOG.md1
-rw-r--r--lib/tasks/cache.rake2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7f9aeef417..85cb85b772c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ Please view this file on the master branch, on stable branches it's out of date.
- Fix typo in project settings that prevents users from enabling container registry. !7037
- Remove extra line for empty issue description. !7045
- Fix error in generating labels. !7055
+ - Stop clearing the database cache on `rake cache:clear`. !7056
## 8.13.0 (2016-10-22)
diff --git a/lib/tasks/cache.rake b/lib/tasks/cache.rake
index a95a3455a4a..78ae187817a 100644
--- a/lib/tasks/cache.rake
+++ b/lib/tasks/cache.rake
@@ -29,5 +29,5 @@ namespace :cache do
task all: [:db, :redis]
end
- task clear: 'cache:clear:all'
+ task clear: 'cache:clear:redis'
end