Merge remote-tracking branch 'origin/issue_closing_widget'

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG

1 files changed, 8 insertions, 0 deletions

diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 81a48699cd8..1148df87ab7 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -105,6 +105,14 @@ describe MergeRequest do
 
       subject.closes_issues.should be_empty
     end
+
+    it 'detects issues mentioned in the description' do
+      issue2 = create(:issue, project: subject.project)
+      subject.description = "Closes ##{issue2.iid}"
+      subject.project.stub(default_branch: subject.target_branch)
+
+      subject.closes_issues.should include(issue2)
+    end
   end
 
   it_behaves_like 'an editable mentionable' do