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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
45d463e4
Commit
45d463e4
authored
May 06, 2021
by
Robert May
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adjust cache options
parent
12b0712e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
lib/api/helpers/caching.rb
lib/api/helpers/caching.rb
+1
-1
lib/api/merge_requests.rb
lib/api/merge_requests.rb
+1
-1
No files found.
lib/api/helpers/caching.rb
View file @
45d463e4
...
...
@@ -40,7 +40,7 @@ module API
# @param expires_in [ActiveSupport::Duration, Integer] an expiry time for the cache entry
# @param presenter_args [Hash] keyword arguments to be passed to the entity
# @return [Gitlab::Json::PrecompiledJson]
def
present_cached
(
obj_or_collection
,
with
:,
cache_context:
->
(
_
)
{
current_user
.
cache_key
},
expires_in:
DEFAULT_EXPIRY
,
**
presenter_args
)
def
present_cached
(
obj_or_collection
,
with
:,
cache_context:
->
(
_
)
{
current_user
&
.
cache_key
},
expires_in:
DEFAULT_EXPIRY
,
**
presenter_args
)
json
=
if
obj_or_collection
.
is_a?
(
Enumerable
)
cached_collection
(
...
...
lib/api/merge_requests.rb
View file @
45d463e4
...
...
@@ -202,7 +202,7 @@ module API
options
[
:project
]
=
user_project
if
Feature
.
enabled?
(
:api_caching_merge_requests
,
user_project
,
type: :development
,
default_enabled: :yaml
)
present_cached
merge_requests
,
**
options
present_cached
merge_requests
,
expires_in:
10
.
minutes
,
**
options
else
present
merge_requests
,
options
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