diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2015-07-13 10:07:27 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2015-07-13 10:07:27 +0000 |
| commit | 73e3a6ad5944a1b4ead4a6d6a5c3cee45a5449e1 (patch) | |
| tree | 4ed8bcc481d08dff915cc06fee22f124177a8536 /app | |
| parent | d841ed56d39db1b33947b9b9c0291beaa7dcdd43 (diff) | |
| parent | bb1401985e55e0740ef037c5200f098de9ac8657 (diff) | |
| download | gitlab-ci-73e3a6ad5944a1b4ead4a6d6a5c3cee45a5449e1.tar.gz | |
Merge branch 'secrets-yaml' into 'master'
Use config/secrets.yml to store session secret and database encryption secret
I took the approach that config/secrets.yml is generated when key is not found.
/cc @vsizov @jacobvosmaer
See merge request !195
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/user_sessions_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/user_sessions_helper.rb b/app/helpers/user_sessions_helper.rb index df158c6..0948674 100644 --- a/app/helpers/user_sessions_helper.rb +++ b/app/helpers/user_sessions_helper.rb @@ -6,7 +6,7 @@ module UserSessionsHelper def generate_oauth_hmac(salt, return_to) return unless return_to digest = OpenSSL::Digest.new('sha256') - key = GitlabCi::Application.config.secret_key_base + salt + key = GitlabCi::Application.secrets.secret_key_base + salt OpenSSL::HMAC.hexdigest(digest, key, return_to) end |