From 3f1ece26909f90e538a50cd724b64da28f0b7308 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Fri, 13 Jun 2014 16:19:08 +0200 Subject: Detect closing issues in Merge Request description --- app/models/commit.rb | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'app/models/commit.rb') diff --git a/app/models/commit.rb b/app/models/commit.rb index 81875e1be2d..82876e10446 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -111,22 +111,10 @@ class Commit description.present? end - # Regular expression that identifies commit message clauses that trigger issue closing. - def issue_closing_regex - @issue_closing_regex ||= Regexp.new(Gitlab.config.gitlab.issue_closing_pattern) - end - # Discover issues should be closed when this commit is pushed to a project's # default branch. def closes_issues project - md = issue_closing_regex.match(safe_message) - if md - extractor = Gitlab::ReferenceExtractor.new - extractor.analyze(md[0]) - extractor.issues_for(project) - else - [] - end + Gitlab::ClosingIssueExtractor.closed_by_message_in_project(safe_message, project) end # Mentionable override. -- cgit v1.2.1