Merge branch 'regex-for-colons' into 'master'

Add optional colon.



See merge request !3591

4 files changed, 118 insertions, 2 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 1d1e541e65f..c6febbd93d3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -29,6 +29,7 @@ v 8.7.0 (unreleased)
   - Fix admin/projects when using visibility levels on search (PotHix)
   - Build status notifications
   - API: Expose user location (Robert Schilling)
+  - ClosingIssueExtractor regex now also works with colons. e.g. "Fixes: #1234" !3591
 
 v 8.6.5 (unreleased)
   - Only update repository language if it is not set to improve performance
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index ddee467b14b..35c7c425a5a 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -80,7 +80,7 @@ production: &base
     # This happens when the commit is pushed or merged into the default branch of a project.
     # When not specified the default issue_closing_pattern as specified below will be used.
     # Tip: you can test your closing pattern at http://rubular.com.
-    # issue_closing_pattern: '((?:[Cc]los(?:e[sd]?|ing)|[Ff]ix(?:e[sd]|ing)?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?))+)'
+    # issue_closing_pattern: '((?:[Cc]los(?:e[sd]?|ing)|[Ff]ix(?:e[sd]|ing)?|[Rr]esolv(?:e[sd]?|ing))(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+)'
 
     ## Default project features settings
     default_projects_features:
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 2b989015279..72c4d8d61ce 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -176,7 +176,7 @@ Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].
 Settings.gitlab['signin_enabled'] ||= true if Settings.gitlab['signin_enabled'].nil?
 Settings.gitlab['restricted_visibility_levels'] = Settings.send(:verify_constant_array, Gitlab::VisibilityLevel, Settings.gitlab['restricted_visibility_levels'], [])
 Settings.gitlab['username_changing_enabled'] = true if Settings.gitlab['username_changing_enabled'].nil?
-Settings.gitlab['issue_closing_pattern'] = '((?:[Cc]los(?:e[sd]?|ing)|[Ff]ix(?:e[sd]|ing)?|[Rr]esolv(?:e[sd]?|ing)) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+)' if Settings.gitlab['issue_closing_pattern'].nil?
+Settings.gitlab['issue_closing_pattern'] = '((?:[Cc]los(?:e[sd]?|ing)|[Ff]ix(?:e[sd]|ing)?|[Rr]esolv(?:e[sd]?|ing))(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+)' if Settings.gitlab['issue_closing_pattern'].nil?
 Settings.gitlab['default_projects_features'] ||= {}
 Settings.gitlab['webhook_timeout'] ||= 10
 Settings.gitlab['max_attachment_size'] ||= 10
diff --git a/spec/lib/gitlab/closing_issue_extractor_spec.rb b/spec/lib/gitlab/closing_issue_extractor_spec.rb
index a1f51429a79..e9b8ce6b5bb 100644
--- a/spec/lib/gitlab/closing_issue_extractor_spec.rb
+++ b/spec/lib/gitlab/closing_issue_extractor_spec.rb
@@ -23,11 +23,21 @@ describe Gitlab::ClosingIssueExtractor, lib: true do
       end
 
       it do
+        message = "Awesome commit (Closes: #{reference})"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
+      it do
         message = "Awesome commit (closes #{reference})"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
       it do
+        message = "Awesome commit (closes: #{reference})"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
+      it do
         message = "Closed #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
@@ -38,105 +48,210 @@ describe Gitlab::ClosingIssueExtractor, lib: true do
       end
 
       it do
+        message = "closed: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
+      it do
         message = "Closing #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
       it do
+        message = "Closing: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
+      it do
         message = "closing #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
       it do
+        message = "closing: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
+      it do
         message = "Close #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
       it do
+        message = "Close: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
+      it do
         message = "close #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
       it do
+        message = "close: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
+      it do
         message = "Awesome commit (Fixes #{reference})"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
       it do
+        message = "Awesome commit (Fixes: #{reference})"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
+      it do
         message = "Awesome commit (fixes #{reference})"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
       it do
+        message = "Awesome commit (Fixes: #{reference})"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
+      it do
         message = "Fixed #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
       it do
+        message = "Fixed: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
+      it do
         message = "fixed #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
       it do
+        message = "fixed: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
+      it do
         message = "Fixing #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
       it do
+        message = "Fixing: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
+      it do
         message = "fixing #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
       it do
+        message = "fixing: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
+      it do
         message = "Fix #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
       it do
+        message = "Fix: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
+      it do
         message = "fix #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
       it do
+        message = "fix: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
+      it do
         message = "Awesome commit (Resolves #{reference})"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
       it do
+        message = "Awesome commit (Resolves: #{reference})"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
+      it do
         message = "Awesome commit (resolves #{reference})"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
       it do
+        message = "Awesome commit (resolves: #{reference})"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
+      it do
         message = "Resolved #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
       it do
+        message = "Resolved: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
+      it do
         message = "resolved #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
       it do
+        message = "resolved: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
+      it do
         message = "Resolving #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
       it do
+        message = "Resolving: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
+      it do
         message = "resolving #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
       it do
+        message = "resolving: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
+      it do
         message = "Resolve #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
       it do
+        message = "Resolve: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
+      it do
         message = "resolve #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
+      it do
+        message = "resolve: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
       context 'with an external issue tracker reference' do
         it 'extracts the referenced issue' do
           jira_project = create(:jira_project, name: 'JIRA_EXT1')