Download as
Browse Code »

Commit fe2d8a4b6d6fc61c376d031af3415c5e46daf2dc

Authored by Dmitriy Zaporozhets
2 parents 43369948 e9409d1f
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge pull request #6763 from Razer6/sync_issue_pattern 

Sync default issue closing pattern in doc and implementation
Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
config/gitlab.yml.example
  Diff comments   View file @fe2d8a4
... ... @@ -20,7 +20,7 @@ production: &base
20 20 https: false
21 21  
22 22 # Uncomment and customize the last line to run in a non-root path
23   - # WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this.
  23 + # WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this.
24 24 # Note that four settings need to be changed for this to work.
25 25 # 1) In your application.rb file: config.relative_url_root = "/gitlab"
26 26 # 2) In your gitlab.yml file: relative_url_root: /gitlab
... ... @@ -69,7 +69,7 @@ production: &base
69 69 # If a commit message matches this regular expression, all issues referenced from the matched text will be closed.
70 70 # This happens when the commit is pushed or merged into the default branch of a project.
71 71 # When not specified the default issue_closing_pattern as specified below will be used.
72   - # issue_closing_pattern: '([Cc]lose[sd]|[Ff]ixe[sd]) +#\d+'
  72 + # issue_closing_pattern: '([Cc]lose[sd]|[Ff]ixe[sd]) #(\d+)'
73 73  
74 74 ## Default project features settings
75 75 default_projects_features:
... ... @@ -107,7 +107,7 @@ production: &base
107 107 # ## :project_id - GitLab project identifier
108 108 # ## :issues_tracker_id - Project Name or Id in external issue tracker
109 109 # new_issue_url: "http://redmine.sample/projects/:issues_tracker_id/issues/new"
110   - #
  110 + #
111 111 # jira:
112 112 # title: "Atlassian Jira"
113 113 # project_url: "http://jira.sample/issues/?jql=project=:issues_tracker_id"
... ...
config/initializers/1_settings.rb
  Diff comments   View file @fe2d8a4
... ... @@ -90,7 +90,7 @@ Settings.gitlab['signup_enabled'] ||= false
90 90 Settings.gitlab['signin_enabled'] ||= true if Settings.gitlab['signin_enabled'].nil?
91 91 Settings.gitlab['restricted_visibility_levels'] = Settings.send(:verify_constant_array, Gitlab::VisibilityLevel, Settings.gitlab['restricted_visibility_levels'], [])
92 92 Settings.gitlab['username_changing_enabled'] = true if Settings.gitlab['username_changing_enabled'].nil?
93   -Settings.gitlab['issue_closing_pattern'] = '([Cc]loses|[Ff]ixes) #(\d+)' if Settings.gitlab['issue_closing_pattern'].nil?
  93 +Settings.gitlab['issue_closing_pattern'] = '([Cc]lose[sd]|[Ff]ixe[sd]) #(\d+)' if Settings.gitlab['issue_closing_pattern'].nil?
94 94 Settings.gitlab['default_projects_features'] ||= {}
95 95 Settings.gitlab.default_projects_features['issues'] = true if Settings.gitlab.default_projects_features['issues'].nil?
96 96 Settings.gitlab.default_projects_features['merge_requests'] = true if Settings.gitlab.default_projects_features['merge_requests'].nil?
... ...