summaryrefslogtreecommitdiff
path: root/config/initializers/1_settings.rb
diff options
context:
space:
mode:
authorJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2016-04-07 08:47:29 -0400
committerJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2016-04-07 08:47:29 -0400
commit0bbeebc8f9d97c72f2a8e93c8da4d0f0d9078af7 (patch)
tree13d9b3811141bb71265fb36eeecf357e4350a509 /config/initializers/1_settings.rb
parent8172d2c1f230329d5ad33282883ad9f14353e950 (diff)
downloadgitlab-ce-0bbeebc8f9d97c72f2a8e93c8da4d0f0d9078af7.tar.gz
Remove dumb debug statement and add many tests.
Diffstat (limited to 'config/initializers/1_settings.rb')
-rw-r--r--config/initializers/1_settings.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 8488482e4ab..72c4d8d61ce 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -177,7 +177,6 @@ Settings.gitlab['signin_enabled'] ||= true if Settings.gitlab['signin_enabled'].
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?
-puts Settings.gitlab['issue_closing_pattern']
Settings.gitlab['default_projects_features'] ||= {}
Settings.gitlab['webhook_timeout'] ||= 10
Settings.gitlab['max_attachment_size'] ||= 10