Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
73b4eecd
Commit
73b4eecd
authored
Sep 22, 2016
by
Rubén Dávila Santos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch '22364-rails-cache-redis-connection-pool' into 'master'"
This reverts merge request !6429
parent
b62995fe
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
5 deletions
+0
-5
CHANGELOG
CHANGELOG
+0
-1
config/application.rb
config/application.rb
+0
-4
No files found.
CHANGELOG
View file @
73b4eecd
...
...
@@ -170,7 +170,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
...
...
config/application.rb
View file @
73b4eecd
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment