diff options
| author | Mykhailo Formus <mikeformus@gmail.com> | 2018-07-12 09:55:01 +0000 |
|---|---|---|
| committer | Mykhailo Formus <mikeformus@gmail.com> | 2018-07-12 09:55:01 +0000 |
| commit | 7a21f39df92baaa88f9533316e7b19c9c70bd91e (patch) | |
| tree | 090f49a7edc682c31ac29465205c16201bdbe03d /app/models/application_setting.rb | |
| parent | 331f8d71b2c778f10b926114caeb718bce7294d6 (diff) | |
| parent | 767ccaa1725048cd2b27fbf1081cba3ba89d2926 (diff) | |
| download | gitlab-ce-mikeformus/gitlab-ce-qa-264.tar.gz | |
Merge branch 'master' into qa-264mikeformus/gitlab-ce-qa-264
Diffstat (limited to 'app/models/application_setting.rb')
| -rw-r--r-- | app/models/application_setting.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index bddeb8b0352..f770b219422 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -294,6 +294,7 @@ class ApplicationSetting < ActiveRecord::Base gitaly_timeout_medium: 30, gitaly_timeout_default: 55, allow_local_requests_from_hooks_and_services: false, + hide_third_party_offers: false, mirror_available: true } end |