Skip to content

Commit e91d9b5

Browse files
committed
support GITLAB_ISSUE_CLOSING_PATTERN
1 parent c075d3a commit e91d9b5

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -807,6 +807,7 @@ Below is the complete list of available options that can be used to customize yo
807807
| `GITLAB_EMAIL_SMIME_KEY_FILE` | Specifies the path to a S/MIME private key file in PEM format, unencrypted. Defaults to ``. |
808808
| `GITLAB_EMAIL_SMIME_CERT_FILE` | Specifies the path to a S/MIME public certificate key in PEM format. Defaults to ``. |
809809
| `GITLAB_DEFAULT_THEME` | Default theme ID, by default 2. (1 - Indigo, 2 - Dark, 3 - Light, 4 - Blue, 5 - Green, 6 - Light Indigo, 7 - Light Blue, 8 - Light Green, 9 - Red, 10 - Light Red) |
810+
| `GITLAB_ISSUE_CLOSING_PATTERN` | Issue closing pattern regex. See [GitLab's documentation](https://docs.gitlab.com/ee/administration/issue_closing_pattern.html) for more detail. Defaults to ` \b((?:[Cc]los(?:e[sd]?|ing)|\b[Ff]ix(?:e[sd]|ing)?|\b[Rr]esolv(?:e[sd]?|ing)|\b[Ii]mplement(?:s|ed|ing)?)(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+) ` . |
810811
| `GITLAB_INCOMING_EMAIL_ADDRESS` | The incoming email address for reply by email. Defaults to the value of `IMAP_USER`, else defaults to `[email protected]`. Please read the [reply by email](http://doc.gitlab.com/ce/incoming_email/README.html) documentation to currently set this parameter. |
811812
| `GITLAB_INCOMING_EMAIL_ENABLED` | Enable or disable gitlab reply by email feature. Defaults to the value of `IMAP_ENABLED`. |
812813
| `GITLAB_SIGNUP_ENABLED` | Enable or disable user signups (first run only). Default is `true`. |

assets/runtime/config/gitlabhq/gitlab.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ production: &base
138138
# This happens when the commit is pushed or merged into the default branch of a project.
139139
# When not specified the default issue_closing_pattern as specified below will be used.
140140
# Tip: you can test your closing pattern at http://rubular.com.
141-
# issue_closing_pattern: '\b((?:[Cc]los(?:e[sd]?|ing)|\b[Ff]ix(?:e[sd]|ing)?|\b[Rr]esolv(?:e[sd]?|ing)|\b[Ii]mplement(?:s|ed|ing)?)(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+)'
141+
issue_closing_pattern: '{{GITLAB_ISSUE_CLOSING_PATTERN}}'
142142

143143
## Default project features settings
144144
default_projects_features:

assets/runtime/env-defaults

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ GITLAB_UNICORN_MEMORY_MAX=${GITLAB_UNICORN_MEMORY_MAX:-1342177280}
8282
##
8383
GITLAB_TIMEZONE=${GITLAB_TIMEZONE:-UTC}
8484
GITLAB_SIGNUP_ENABLED=${GITLAB_SIGNUP_ENABLED:-true}
85+
GITLAB_ISSUE_CLOSING_PATTERN=${GITLAB_ISSUE_CLOSING_PATTERN:-'\b((?:[Cc]los(?:e[sd]?|ing)|\b[Ff]ix(?:e[sd]|ing)?|\b[Rr]esolv(?:e[sd]?|ing)|\b[Ii]mplement(?:s|ed|ing)?)(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+)'}
8586
GITLAB_PROJECTS_LIMIT=${GITLAB_PROJECTS_LIMIT:-100}
8687
GITLAB_USERNAME_CHANGE=${GITLAB_USERNAME_CHANGE:-true}
8788
GITLAB_CREATE_GROUP=${GITLAB_CREATE_GROUP:-true}

assets/runtime/functions

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1778,7 +1778,8 @@ configure_gitlab() {
17781778
GITLAB_PROJECTS_LIMIT \
17791779
GITLAB_USERNAME_CHANGE \
17801780
GITLAB_DEFAULT_THEME \
1781-
GITLAB_CREATE_GROUP
1781+
GITLAB_CREATE_GROUP \
1782+
GITLAB_ISSUE_CLOSING_PATTERN
17821783

17831784
gitlab_configure_database
17841785
gitlab_configure_redis

0 commit comments

Comments
 (0)