diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-06-28 12:35:20 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-06-28 12:35:45 -0500 |
| commit | 436f9831e860820a7ceae29da3bd69fb45eb58f3 (patch) | |
| tree | 76d6cf734160fc7bd60e7415c9c2528ef740f98f | |
| parent | 828e7afb4b242cf838b76acaf8254a4c50987883 (diff) | |
| download | gitlab-ce-rs-config-settings.tar.gz | |
Move mirror settings to their own EE blockrs-config-settings
| -rw-r--r-- | config/initializers/1_settings.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index d5bf6ae65ec..c803e4615b4 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -189,9 +189,6 @@ Settings.gitlab['webhook_timeout'] ||= 10 Settings.gitlab['max_attachment_size'] ||= 10 Settings.gitlab['session_expire_delay'] ||= 10080 Settings.gitlab['unauthenticated_session_expire_delay'] ||= 2.hours.to_i -Settings.gitlab['mirror_max_delay'] ||= 300 -Settings.gitlab['mirror_max_capacity'] ||= 30 -Settings.gitlab['mirror_capacity_threshold'] ||= 15 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? @@ -206,6 +203,12 @@ Settings.gitlab['no_todos_messages'] ||= YAML.load_file(Rails.root.join('config' Settings.gitlab['impersonation_enabled'] ||= true if Settings.gitlab['impersonation_enabled'].nil? Settings.gitlab['usage_ping_enabled'] = true if Settings.gitlab['usage_ping_enabled'].nil? +Gitlab.ee do + Settings.gitlab['mirror_max_delay'] ||= 300 + Settings.gitlab['mirror_max_capacity'] ||= 30 + Settings.gitlab['mirror_capacity_threshold'] ||= 15 +end + # # Elasticseacrh # |