diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-10-05 23:38:02 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-10-05 23:38:02 +0900 |
| commit | 7542a5d102bc48f5f7b8104fda22f0975b2dd931 (patch) | |
| tree | 9a94528103422fa5baaab096091e34ae6463d507 /config | |
| parent | 8deb9c010fb4ab24b56a68470ecbf4b875467248 (diff) | |
| parent | 88fa9a3c31d250ae9b88bb3250204b39eabc14b4 (diff) | |
| download | gitlab-ce-7542a5d102bc48f5f7b8104fda22f0975b2dd931.tar.gz | |
Merge branch 'master-ce' into scheduled-manual-jobs
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 1 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 1 | ||||
| -rw-r--r-- | config/routes/project.rb | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 67337f4b82f..749cdd0f869 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -210,6 +210,7 @@ production: &base ## GitLab Pages pages: enabled: false + access_control: false # The location where pages are stored (default: shared/pages). # path: shared/pages diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 0caa4962128..bd02b85c7ce 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -200,6 +200,7 @@ Settings.registry['path'] = Settings.absolute(Settings.registry['path # Settings['pages'] ||= Settingslogic.new({}) Settings.pages['enabled'] = false if Settings.pages['enabled'].nil? +Settings.pages['access_control'] = false if Settings.pages['access_control'].nil? Settings.pages['path'] = Settings.absolute(Settings.pages['path'] || File.join(Settings.shared['path'], "pages")) Settings.pages['https'] = false if Settings.pages['https'].nil? Settings.pages['host'] ||= "example.com" diff --git a/config/routes/project.rb b/config/routes/project.rb index 356a509da75..9cbd5b644f6 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -32,6 +32,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do get 'labels' get 'milestones' get 'commands' + get 'snippets' end end |