diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-08-06 15:44:40 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-08-06 15:44:40 +0000 |
commit | b4415c01740430cef58baf9bb0cbda2fb1055edb (patch) | |
tree | 89ddade2adcb40d95b710760d4fc806c52f94ada /spec/presenters | |
parent | 415b2f943ba80ef3b6746af0a98c6dbe062e803c (diff) | |
parent | fdb5f285f924e653400f7bbe18d13718c469d74f (diff) | |
download | gitlab-ce-b4415c01740430cef58baf9bb0cbda2fb1055edb.tar.gz |
Merge branch 'issue_44821' into 'master'
Retrieve merge request closing issues from database cache
Closes #44821
See merge request gitlab-org/gitlab-ce!20911
Diffstat (limited to 'spec/presenters')
-rw-r--r-- | spec/presenters/merge_request_presenter_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/presenters/merge_request_presenter_spec.rb b/spec/presenters/merge_request_presenter_spec.rb index 46ba6f442f5..a1b52d8692d 100644 --- a/spec/presenters/merge_request_presenter_spec.rb +++ b/spec/presenters/merge_request_presenter_spec.rb @@ -117,9 +117,9 @@ describe MergeRequestPresenter do before do project.add_developer(user) - allow(resource.project).to receive(:default_branch) .and_return(resource.target_branch) + resource.cache_merge_request_closes_issues! end describe '#closing_issues_links' do |