diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-09 20:35:01 +0300 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-09 20:35:01 +0300 |
| commit | 1dea54c2201ec5f51bcd8772757dbc6612cc9fdc (patch) | |
| tree | 5abb49121b1632166a9524d73a7b055470f693ac /config | |
| parent | 0094d8f19644152a66b9d21b8cd86f797199311f (diff) | |
| download | gitlab-ce-1dea54c2201ec5f51bcd8772757dbc6612cc9fdc.tar.gz | |
Remove unused parts
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 1 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index f7a58753421..37639e52e66 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -184,7 +184,6 @@ production: &base # internal_host: localhost # key: config/registry.key # issuer: omnibus-certificate - # path: shared/registry # # 2. GitLab CI settings diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 140d086054a..1040d840e30 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -272,7 +272,6 @@ Settings.artifacts['max_size'] ||= 100 # in megabytes # Settings['registry'] ||= Settingslogic.new({}) Settings.registry['registry'] = false if Settings.registry['enabled'].nil? -Settings.registry['path'] = File.expand_path(Settings.registry['path'] || File.join(Settings.shared['path'], "registry"), Rails.root) Settings.registry['host'] ||= "example.com" Settings.registry['internal_host']||= "localhost" Settings.registry['key'] ||= nil |