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
12b0712e
Commit
12b0712e
authored
May 06, 2021
by
Robert May
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove custom cache context for now
parent
a35c3205
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
13 deletions
+1
-13
config/feature_flags/development/api_caching_merge_requests.yml
.../feature_flags/development/api_caching_merge_requests.yml
+1
-1
lib/api/merge_requests.rb
lib/api/merge_requests.rb
+0
-12
No files found.
config/feature_flags/development/api_caching_merge_requests.yml
View file @
12b0712e
---
---
name
:
api_caching_merge_requests
name
:
api_caching_merge_requests
introduced_by_url
:
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61067
rollout_issue_url
:
rollout_issue_url
:
milestone
:
'
13.12'
milestone
:
'
13.12'
type
:
development
type
:
development
...
...
lib/api/merge_requests.rb
View file @
12b0712e
...
@@ -202,18 +202,6 @@ module API
...
@@ -202,18 +202,6 @@ module API
options
[
:project
]
=
user_project
options
[
:project
]
=
user_project
if
Feature
.
enabled?
(
:api_caching_merge_requests
,
user_project
,
type: :development
,
default_enabled: :yaml
)
if
Feature
.
enabled?
(
:api_caching_merge_requests
,
user_project
,
type: :development
,
default_enabled: :yaml
)
# User-specific context in the simple MR entity is limited to
# email address exposure, which we need to check and combine
# into the cache context
options
[
:cache_context
]
=
proc
do
|
mr
|
[
options
.
values_at
(
:render_html
,
:with_labels_details
,
:skip_merge_status_recheck
),
mr
.
author
.
managed_by?
(
current_user
),
mr
.
assignees
.
map
{
|
u
|
u
.
managed_by?
(
current_user
)
},
[
mr
.
metrics
&
.
merged_by
,
mr
.
metrics
&
.
latest_closed_by
].
compact
.
map
{
|
u
|
u
.
managed_by?
(
current_user
)
}
]
end
present_cached
merge_requests
,
**
options
present_cached
merge_requests
,
**
options
else
else
present
merge_requests
,
options
present
merge_requests
,
options
...
...
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