summaryrefslogtreecommitdiff
path: root/config/initializers
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-06-01 17:59:04 +0000
committerStan Hu <stanhu@gmail.com>2018-06-01 17:59:04 +0000
commit81e899ea7141b34a7860f308327249784fb5d6cc (patch)
treedfb47ec0b8c866c8232b367d2d9d82a1887024bc /config/initializers
parent160cc6cd7b0218cdd1e210c4133fd469ffacf656 (diff)
parentb5c706326ada2c0d213dd512842c5f677d9d94f9 (diff)
downloadgitlab-ce-81e899ea7141b34a7860f308327249784fb5d6cc.tar.gz
Merge branch 'sh-bump-ruby-2.4' into 'master'
Upgrade to Ruby 2.4.4 See merge request gitlab-org/gitlab-ce!19055
Diffstat (limited to 'config/initializers')
-rw-r--r--config/initializers/01_secret_token.rb (renamed from config/initializers/secret_token.rb)3
1 files changed, 3 insertions, 0 deletions
diff --git a/config/initializers/secret_token.rb b/config/initializers/01_secret_token.rb
index 750a5b34f3b..02bded43083 100644
--- a/config/initializers/secret_token.rb
+++ b/config/initializers/01_secret_token.rb
@@ -1,3 +1,6 @@
+# This file needs to be loaded BEFORE any initializers that attempt to
+# prepend modules that require access to secrets (e.g. EE's 0_as_concern.rb).
+#
# Be sure to restart your server when you modify this file.
require 'securerandom'