Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2019-09-09 16:27:11 +0300
committerKamil Trzciński <ayufan@ayufan.eu>2019-09-09 16:27:11 +0300
commitcbb35ea882cdc40c09f7f6cd44bca8d72e506092 (patch)
tree0f83b09e3ff1e4f75977d17762be2fbd7f0bf5b8 /config/initializers/1_settings.rb
parent2bf5a1ace2b9e6d7beeb794c4c7fa9af6552ef5a (diff)
parent477ba2b3465736cdccfb6cb6a36f78447942e310 (diff)
Merge branch '61927-skeleton-pages-internal-api' into 'master'
Add skeleton Pages internal API See merge request gitlab-org/gitlab-ce!32732
Diffstat (limited to 'config/initializers/1_settings.rb')
-rw-r--r--config/initializers/1_settings.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 4160f488a7a..dbbb7ba1b60 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -292,6 +292,7 @@ Settings.pages['artifacts_server'] ||= Settings.pages['enabled'] if Settings.pa
Settings.pages['admin'] ||= Settingslogic.new({})
Settings.pages.admin['certificate'] ||= ''
+Settings.pages['secret_file'] ||= Rails.root.join('.gitlab_pages_shared_secret')
#
# Geo