Add "implements" to the default issue closing message regex
This commit is contained in:
parent
6c33fb8466
commit
4e4a29ad75
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: "Add \"implements\" to the default issue closing message regex"
|
||||
merge_request: 14612
|
||||
author: Guilherme Vieira
|
||||
type: added
|
|
@ -89,7 +89,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)?|[Rr]esolv(?:e[sd]?|ing))(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+)'
|
||||
# issue_closing_pattern: '((?:[Cc]los(?:e[sd]?|ing)|[Ff]ix(?:e[sd]|ing)?|[Rr]esolv(?:e[sd]?|ing)|[Ii]mplement(?:s|ed|ing)?)(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+)'
|
||||
|
||||
## Default project features settings
|
||||
default_projects_features:
|
||||
|
|
|
@ -257,7 +257,7 @@ Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].
|
|||
Settings.gitlab['password_authentication_enabled'] ||= true if Settings.gitlab['password_authentication_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)|[Ii]mplement(?:s|ed|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
|
||||
|
|
|
@ -254,6 +254,46 @@ describe Gitlab::ClosingIssueExtractor do
|
|||
expect(subject.closed_by_message(message)).to eq([issue])
|
||||
end
|
||||
|
||||
it do
|
||||
message = "Implement: #{reference}"
|
||||
expect(subject.closed_by_message(message)).to eq([issue])
|
||||
end
|
||||
|
||||
it do
|
||||
message = "Implements: #{reference}"
|
||||
expect(subject.closed_by_message(message)).to eq([issue])
|
||||
end
|
||||
|
||||
it do
|
||||
message = "Implemented: #{reference}"
|
||||
expect(subject.closed_by_message(message)).to eq([issue])
|
||||
end
|
||||
|
||||
it do
|
||||
message = "Implementing: #{reference}"
|
||||
expect(subject.closed_by_message(message)).to eq([issue])
|
||||
end
|
||||
|
||||
it do
|
||||
message = "implement: #{reference}"
|
||||
expect(subject.closed_by_message(message)).to eq([issue])
|
||||
end
|
||||
|
||||
it do
|
||||
message = "implements: #{reference}"
|
||||
expect(subject.closed_by_message(message)).to eq([issue])
|
||||
end
|
||||
|
||||
it do
|
||||
message = "implemented: #{reference}"
|
||||
expect(subject.closed_by_message(message)).to eq([issue])
|
||||
end
|
||||
|
||||
it do
|
||||
message = "implementing: #{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')
|
||||
|
|
Loading…
Reference in New Issue