summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-06-02 01:25:14 -0700
committerStan Hu <stanhu@gmail.com>2018-06-02 01:25:14 -0700
commit93b4402bd1ed3ca66e8f8725dc2c149f7f2606a9 (patch)
treeaba19c124f10ddb146032474672f191bf11eff88
parentfe0ebf76c49e2512b211c5d43152275c536f7e3a (diff)
downloadgitlab-ce-sh-revert-db-key-base-truncate.tar.gz
Test revert of db_key_base truncationsh-revert-db-key-base-truncate
-rw-r--r--config/settings.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/settings.rb b/config/settings.rb
index 58f38d103ea..925aa838544 100644
--- a/config/settings.rb
+++ b/config/settings.rb
@@ -93,7 +93,7 @@ class Settings < Settingslogic
#
# The default mode for the attr_encrypted gem is to use a 256-bit key.
# We truncate the 128-byte string to 32 bytes.
- Gitlab::Application.secrets.db_key_base[0..31]
+ Gitlab::Application.secrets.db_key_base
end
private