diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-05-18 13:20:06 -0500 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-05-18 13:20:06 -0500 |
| commit | a410c7afbfe78ca5253e4b2e2dfcffb20e8159da (patch) | |
| tree | babb2f99624884641f60158933f6d9319b79018e /config | |
| parent | bb883387f9e4d5564b455cce7d412f730664a2f5 (diff) | |
| parent | 08fddae7441ce9ac61bc80e5b93a2eafb8441430 (diff) | |
| download | gitlab-ce-a410c7afbfe78ca5253e4b2e2dfcffb20e8159da.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 1 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 3 | ||||
| -rw-r--r-- | config/routes.rb | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index d935121d88b..0cef2794f4e 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -183,6 +183,7 @@ production: &base # api_url: http://localhost:5000/ # 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 d1fcb053bee..124d63ce3ac 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -249,9 +249,12 @@ Settings.artifacts['max_size'] ||= 100 # in megabytes Settings['registry'] ||= Settingslogic.new({}) Settings.registry['enabled'] ||= false Settings.registry['host'] ||= "example.com" +Settings.registry['port'] ||= nil Settings.registry['api_url'] ||= "http://localhost:5000/" Settings.registry['key'] ||= nil Settings.registry['issuer'] ||= nil +Settings.registry['host_port'] ||= [Settings.registry['host'], Settings.registry['port']].compact.join(':') +Settings.registry['path'] = File.expand_path(Settings.registry['path'] || File.join(Settings.shared['path'], 'registry'), Rails.root) # # Git LFS diff --git a/config/routes.rb b/config/routes.rb index f20dd771962..ff944728e3a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -694,6 +694,8 @@ Rails.application.routes.draw do end end + resources :container_registry, only: [:index, :destroy], constraints: { id: Gitlab::Regex.container_registry_reference_regex } + resources :milestones, constraints: { id: /\d+/ } do member do put :sort_issues |