summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorPeter Golm <golm.peter@gmail.com>2014-01-09 14:25:29 +0100
committerPeter Golm <golm.peter@gmail.com>2014-01-09 14:25:29 +0100
commit4eef64bb9a1a7be4d71ba65475e1078f762e62fb (patch)
tree7682e31d8eb9035f5c000f7dfac6c8b71d8e702c /config
parent1f838a4f98fafa80ae5cfd7759b883b00870072f (diff)
downloadgitlab-ci-4eef64bb9a1a7be4d71ba65475e1078f762e62fb.tar.gz
fix deprections warnings
Diffstat (limited to 'config')
-rw-r--r--config/application.rb1
-rw-r--r--config/initializers/secret_token.rb10
2 files changed, 8 insertions, 3 deletions
diff --git a/config/application.rb b/config/application.rb
index ad29b57..3a57d7c 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -21,6 +21,7 @@ module GitlabCi
# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
# config.time_zone = 'Central Time (US & Canada)'
+ I18n.enforce_available_locales = true
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
# config.i18n.default_locale = :de
diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb
index ccbda95..de6f772 100644
--- a/config/initializers/secret_token.rb
+++ b/config/initializers/secret_token.rb
@@ -1,8 +1,12 @@
# Be sure to restart your server when you modify this file.
-# Your secret key for verifying the integrity of signed cookies.
+# Your secret key is used for verifying the integrity of signed cookies.
# If you change this key, all old signed cookies will become invalid!
+
# Make sure the secret is at least 30 characters and all random,
# no regular words or you'll be exposed to dictionary attacks.
-GitlabCi::Application.config.secret_token = '41cff934d5a788409310b2b4dc931ca9be9c5113ede94f41d44bf71b403f007d8031efa855d6d111393d33ca839722db98445a1a6f020331a3f43bd29a50c93e'
-GitlabCi::Application.config.secret_key_token = '41cff934d5a788409310b2b4dc931ca9be9c5113ede94f41d44bf71b403f007d8031efa855d6d111393d33ca839722db98445a1a6f020331a3f43bd29a50c93e'
+# You can use `rake secret` to generate a secure secret key.
+
+# Make sure your secret_key_base is kept private
+# if you're sharing your code publicly.
+GitlabCi::Application.config.secret_key_base = '41cff934d5a788409310b2b4dc931ca9be9c5113ede94f41d44bf71b403f007d8031efa855d6d111393d33ca839722db98445a1a6f020331a3f43bd29a50c93e'