Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-06-30 20:46:20 +0300
committerRobert Speicher <robert@gitlab.com>2016-06-30 20:46:20 +0300
commit6e82c0e06ea25d6d0871037fb09301698ca972bd (patch)
tree144da3938466c90af68cdc8cafeec4f14485a4b0 /spec/services/git_push_service_spec.rb
parentf7b056167a3dd79dde7b7fdd87209b478975c546 (diff)
parent4fca633a317eb065145d3cc687f62eabcb8e8af2 (diff)
Merge branch 'fix-external-issue-rendering' into 'master'
Handle external issues in IssueReferenceFilter Rendering issue references such as `#1` was broken for projects using an external issues tracker. See gitlab-org/gitlab-ce#19036 See merge request !4988
Diffstat (limited to 'spec/services/git_push_service_spec.rb')
-rw-r--r--spec/services/git_push_service_spec.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/services/git_push_service_spec.rb b/spec/services/git_push_service_spec.rb
index 1ceb7c3e6ff..48d374883d7 100644
--- a/spec/services/git_push_service_spec.rb
+++ b/spec/services/git_push_service_spec.rb
@@ -350,6 +350,8 @@ describe GitPushService, services: true do
it "doesn't close issues when external issue tracker is in use" do
allow_any_instance_of(Project).to receive(:default_issues_tracker?).
and_return(false)
+ external_issue_tracker = double(title: 'My Tracker', issue_path: issue.iid)
+ allow_any_instance_of(Project).to receive(:external_issue_tracker).and_return(external_issue_tracker)
# The push still shouldn't create cross-reference notes.
expect do