diff options
| author | Wes Gurney <wes_gurney@cable.comcast.com> | 2014-09-12 11:38:14 -0400 |
|---|---|---|
| committer | Wes Gurney <wes_gurney@cable.comcast.com> | 2014-09-12 11:38:14 -0400 |
| commit | 81a70bf5153bb9470e96dde05102afd397528cf0 (patch) | |
| tree | 25ee372e8ac486e01810668414d813e6453b5450 /config/initializers/1_settings.rb | |
| parent | cbb44b9da3e7288200485caed7a9716013e34984 (diff) | |
| download | gitlab-ce-81a70bf5153bb9470e96dde05102afd397528cf0.tar.gz | |
Adding ability to configure webhook timeout via gitlab.yml
Diffstat (limited to 'config/initializers/1_settings.rb')
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 136622c65a2..5b7e69fbc6a 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -92,6 +92,7 @@ Settings.gitlab['restricted_visibility_levels'] = Settings.send(:verify_constant Settings.gitlab['username_changing_enabled'] = true if Settings.gitlab['username_changing_enabled'].nil? Settings.gitlab['issue_closing_pattern'] = '([Cc]lose[sd]|[Ff]ixe[sd]) #(\d+)' if Settings.gitlab['issue_closing_pattern'].nil? Settings.gitlab['default_projects_features'] ||= {} +Settings.gitlab['webhook_timeout'] ||= 10 Settings.gitlab.default_projects_features['issues'] = true if Settings.gitlab.default_projects_features['issues'].nil? Settings.gitlab.default_projects_features['merge_requests'] = true if Settings.gitlab.default_projects_features['merge_requests'].nil? Settings.gitlab.default_projects_features['wiki'] = true if Settings.gitlab.default_projects_features['wiki'].nil? |