Merge branch 'rs-config-settings-ee' into 'master'

Wrap EE-only settings in `Gitlab.ee` blocks See merge request gitlab-org/gitlab-ee!14443

Merge branch 'rs-config-settings-ee' into 'master'
Wrap EE-only settings in `Gitlab.ee` blocks See merge request gitlab-org/gitlab-ee!14443
44d8f836 · Lin Jen-Shin · 6e3c2f2c · cfdfb779 · 44d8f836
Commit 44d8f836 authored Jun 29, 2019 by Lin Jen-Shin
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 105 additions and 92 deletions

config/initializers/1_settings.rb config/initializers/1_settings.rb +105 -92

No files found.
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb