Commit dadb8f2a authored by Ash McKenzie's avatar Ash McKenzie

Merge branch 'sh-enable-ref-name-caching-discussions' into 'master'

Enable Gitaly ref name caching for discussions.json

See merge request gitlab-org/gitlab-ce!29951
parents 771e3903 30167193
...@@ -16,7 +16,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo ...@@ -16,7 +16,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
before_action :authenticate_user!, only: [:assign_related_issues] before_action :authenticate_user!, only: [:assign_related_issues]
before_action :check_user_can_push_to_source_branch!, only: [:rebase] before_action :check_user_can_push_to_source_branch!, only: [:rebase]
around_action :allow_gitaly_ref_name_caching, only: [:index, :show] around_action :allow_gitaly_ref_name_caching, only: [:index, :show, :discussions]
def index def index
@merge_requests = @issuables @merge_requests = @issuables
......
---
title: Enable Gitaly ref name caching for discussions.json
merge_request: 29951
author:
type: performance
...@@ -1001,6 +1001,8 @@ describe Projects::MergeRequestsController do ...@@ -1001,6 +1001,8 @@ describe Projects::MergeRequestsController do
before do before do
project.add_developer(user) project.add_developer(user)
sign_in(user) sign_in(user)
expect(::Gitlab::GitalyClient).to receive(:allow_ref_name_caching).and_call_original
end end
it 'returns 200' do it 'returns 200' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment