diff options
| author | Rubén Dávila Santos <ruben@gitlab.com> | 2016-09-22 00:08:08 +0000 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-09-21 19:10:37 -0500 |
| commit | 302f9e68c1c174e9cfbb7d5c427f3c02bd547afa (patch) | |
| tree | f650dc61e962712fa953a09fd2f8795ebde7276f | |
| parent | 3f55188d11124f2ead67b6d54984713989c24a7d (diff) | |
| download | gitlab-ce-302f9e68c1c174e9cfbb7d5c427f3c02bd547afa.tar.gz | |
Revert "Merge branch '22364-rails-cache-redis-connection-pool' into 'master'"
This reverts merge request !6429
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | config/application.rb | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG index 8ba27d8fe1e..bdd98d8de8b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -171,7 +171,6 @@ v 8.12.0 (unreleased) - Add notification_settings API calls !5632 (mahcsig) - Remove duplication between project builds and admin builds view !5680 (Katarzyna Kobierska Ula Budziszewska) - Fix URLs with anchors in wiki !6300 (houqp) - - Use a ConnectionPool for Rails.cache on Sidekiq servers - Deleting source project with existing fork link will close all related merge requests !6177 (Katarzyna Kobierska Ula Budziszeska) - Return 204 instead of 404 for /ci/api/v1/builds/register.json if no builds are scheduled for a runner !6225 - Fix Gitlab::Popen.popen thread-safety issue diff --git a/config/application.rb b/config/application.rb index 8166b6003f6..4792f6670a8 100644 --- a/config/application.rb +++ b/config/application.rb @@ -116,10 +116,6 @@ module Gitlab redis_config_hash = Gitlab::Redis.params redis_config_hash[:namespace] = Gitlab::Redis::CACHE_NAMESPACE redis_config_hash[:expires_in] = 2.weeks # Cache should not grow forever - if Sidekiq.server? # threaded context - redis_config_hash[:pool_size] = Sidekiq.options[:concurrency] + 5 - redis_config_hash[:pool_timeout] = 1 - end config.cache_store = :redis_store, redis_config_hash config.active_record.raise_in_transactional_callbacks = true |