BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
f20949a3
Commit
f20949a3
authored
Jun 12, 2017
by
Z.J. van de Weg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix etag route misses
Fixes gitlab-org/gitlab-ce#33106
parent
6b3f6c9f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
environment.rb
app/models/environment.rb
+2
-1
store.rb
lib/gitlab/etag_caching/store.rb
+2
-2
No files found.
app/models/environment.rb
View file @
f20949a3
...
@@ -209,7 +209,8 @@ class Environment < ActiveRecord::Base
...
@@ -209,7 +209,8 @@ class Environment < ActiveRecord::Base
def
etag_cache_key
def
etag_cache_key
Gitlab
::
Routing
.
url_helpers
.
namespace_project_environments_path
(
Gitlab
::
Routing
.
url_helpers
.
namespace_project_environments_path
(
project
.
namespace
,
project
.
namespace
,
project
)
project
,
format: :json
)
end
end
private
private
...
...
lib/gitlab/etag_caching/store.rb
View file @
f20949a3
...
@@ -25,8 +25,8 @@ module Gitlab
...
@@ -25,8 +25,8 @@ module Gitlab
end
end
def
redis_key
(
key
)
def
redis_key
(
key
)
raise
'Invalid key'
unless
Gitlab
::
EtagCaching
::
Router
.
match
(
key
)
raise
'Invalid key'
if
!
Rails
.
env
.
production?
&&
!
Gitlab
::
EtagCaching
::
Router
.
match
(
key
)
"
#{
REDIS_NAMESPACE
}#{
key
}
"
"
#{
REDIS_NAMESPACE
}#{
key
}
"
end
end
end
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