diff options
author | Joshua Lambert <joshua@gitlab.com> | 2017-08-14 20:18:34 -0400 |
---|---|---|
committer | Joshua Lambert <joshua@gitlab.com> | 2017-08-14 20:18:34 -0400 |
commit | 10b1237c1ab12eff15e12743afebe79cc8c32398 (patch) | |
tree | 37d31e9f6ad9fc4c90064890efc45e60be48abd2 /spec/services/issues/resolve_discussions_spec.rb | |
parent | 43f1fda8647daac10c4a0d4ebb55a173249f6639 (diff) | |
parent | 0ec54b8ff7f001807f617865884d294809844fde (diff) | |
download | gitlab-ce-10b1237c1ab12eff15e12743afebe79cc8c32398.tar.gz |
Merge branch 'master' into 36398-update-our-auto-deploy-docs-to-include-monitoring-docs36398-update-our-auto-deploy-docs-to-include-monitoring-docs
Diffstat (limited to 'spec/services/issues/resolve_discussions_spec.rb')
-rw-r--r-- | spec/services/issues/resolve_discussions_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/issues/resolve_discussions_spec.rb b/spec/services/issues/resolve_discussions_spec.rb index fac66791ffb..67a86c50fc1 100644 --- a/spec/services/issues/resolve_discussions_spec.rb +++ b/spec/services/issues/resolve_discussions_spec.rb @@ -20,7 +20,7 @@ describe Issues::ResolveDiscussions do describe "for resolving discussions" do let(:discussion) { create(:diff_note_on_merge_request, project: project, note: "Almost done").to_discussion } let(:merge_request) { discussion.noteable } - let(:other_merge_request) { create(:merge_request, source_project: project, source_branch: "other") } + let(:other_merge_request) { create(:merge_request, source_project: project, source_branch: "fix") } describe "#merge_request_for_resolving_discussion" do let(:service) { DummyService.new(project, user, merge_request_to_resolve_discussions_of: merge_request.iid) } |