diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-12 03:10:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-12 03:10:48 +0300 |
| commit | 5e13b3a9e58a7b78e93b4aa5a12cc19bd6bca674 (patch) | |
| tree | 84215b5d11e1d837f8a65472a0252bb2b6ed3909 /app | |
| parent | c77ce73fa85c128dfeb90a45c4eb306b8c1fe0c9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/concerns/issuable_actions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/concerns/issuable_actions.rb b/app/controllers/concerns/issuable_actions.rb index 414210ee16a..8a9b66045b8 100644 --- a/app/controllers/concerns/issuable_actions.rb +++ b/app/controllers/concerns/issuable_actions.rb @@ -160,7 +160,7 @@ module IssuableActions if issuable.is_a?(MergeRequest) render_cached(discussions, with: discussion_serializer, cache_context: -> (_) { discussion_cache_context }, context: self) - elsif issuable.is_a?(Issue) && Feature.enabled?(:issue_discussions_http_cache, default_enabled: :yaml) + elsif issuable.is_a?(Issue) render json: discussion_serializer.represent(discussions, context: self) if stale?(etag: [discussion_cache_context, discussions]) else render json: discussion_serializer.represent(discussions, context: self) |