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
Kazuhiko Shiozaki
gitlab-ce
Commits
9179fcec
Commit
9179fcec
authored
Nov 16, 2015
by
Valery Sizov
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'test_env_cache' into 'master'
Disabling cache for test environment See merge request !1807
parents
6c8dded2
9e0d443f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
9 deletions
+13
-9
config/environments/test.rb
config/environments/test.rb
+2
-0
config/initializers/session_store.rb
config/initializers/session_store.rb
+11
-9
No files found.
config/environments/test.rb
View file @
9179fcec
...
@@ -30,4 +30,6 @@ Gitlab::Application.configure do
...
@@ -30,4 +30,6 @@ Gitlab::Application.configure do
config
.
active_support
.
deprecation
=
:stderr
config
.
active_support
.
deprecation
=
:stderr
config
.
eager_load
=
false
config
.
eager_load
=
false
config
.
cache_store
=
:null_store
end
end
config/initializers/session_store.rb
View file @
9179fcec
...
@@ -9,12 +9,14 @@ begin
...
@@ -9,12 +9,14 @@ begin
rescue
rescue
end
end
Gitlab
::
Application
.
config
.
session_store
(
unless
Rails
.
env
.
test?
:redis_store
,
# Using the cookie_store would enable session replay attacks.
Gitlab
::
Application
.
config
.
session_store
(
servers:
Gitlab
::
Application
.
config
.
cache_store
[
1
].
merge
(
namespace:
'session:gitlab'
),
# re-use the Redis config from the Rails cache store
:redis_store
,
# Using the cookie_store would enable session replay attacks.
key:
'_gitlab_session'
,
servers:
Gitlab
::
Application
.
config
.
cache_store
[
1
].
merge
(
namespace:
'session:gitlab'
),
# re-use the Redis config from the Rails cache store
secure:
Gitlab
.
config
.
gitlab
.
https
,
key:
'_gitlab_session'
,
httponly:
true
,
secure:
Gitlab
.
config
.
gitlab
.
https
,
expire_after:
Settings
.
gitlab
[
'session_expire_delay'
]
*
60
,
httponly:
true
,
path:
(
Gitlab
::
Application
.
config
.
relative_url_root
.
nil?
)
?
'/'
:
Gitlab
::
Application
.
config
.
relative_url_root
expire_after:
Settings
.
gitlab
[
'session_expire_delay'
]
*
60
,
)
path:
(
Gitlab
::
Application
.
config
.
relative_url_root
.
nil?
)
?
'/'
:
Gitlab
::
Application
.
config
.
relative_url_root
)
end
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