diff options
| author | Luke Bennett <lbennett@gitlab.com> | 2018-07-31 22:19:29 +0300 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2018-07-31 22:19:29 +0300 |
| commit | a9d4623b0872235d72a344574cc5369058e2ef36 (patch) | |
| tree | fcc02dde94ad38e65559227245a090f6dbb8d8e5 /app/models/application_setting.rb | |
| parent | 1b27c45753a55eaba3c935138da65e3e7ff105eb (diff) | |
Correct application_setting.rb conflict merge
Diffstat (limited to 'app/models/application_setting.rb')
| -rw-r--r-- | app/models/application_setting.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 4c901c1d67f..7ff7aa041b0 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -295,13 +295,8 @@ class ApplicationSetting < ActiveRecord::Base unique_ips_limit_per_user: 10, unique_ips_limit_time_window: 3600, usage_ping_enabled: Settings.gitlab['usage_ping_enabled'], - instance_statistics_visibility_private: false, - gitaly_timeout_fast: 10, - gitaly_timeout_medium: 30, - gitaly_timeout_default: 55, - allow_local_requests_from_hooks_and_services: false, - hide_third_party_offers: false, - mirror_available: true + user_default_external: false, + instance_statistics_visibility_private: false } end |