diff options
| author | Markus Koller <markus-koller@gmx.ch> | 2017-09-19 17:20:49 +0200 |
|---|---|---|
| committer | Markus Koller <markus-koller@gmx.ch> | 2017-09-20 17:38:33 +0200 |
| commit | 26eadca48cc58e53e5e060efe6424f63377c7663 (patch) | |
| tree | 0e5c62b2184872737661689763b757a00b829b1c /config | |
| parent | 70dc7e9a9959997b72219ab4b48046e347b00938 (diff) | |
| download | gitlab-ce-26eadca48cc58e53e5e060efe6424f63377c7663.tar.gz | |
Upgrade doorkeeper-openid_connect
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/doorkeeper_openid_connect.rb | 2 | ||||
| -rw-r--r-- | config/initializers/secret_token.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/doorkeeper_openid_connect.rb b/config/initializers/doorkeeper_openid_connect.rb index c58f425b19b..af174def047 100644 --- a/config/initializers/doorkeeper_openid_connect.rb +++ b/config/initializers/doorkeeper_openid_connect.rb @@ -1,7 +1,7 @@ Doorkeeper::OpenidConnect.configure do issuer Gitlab.config.gitlab.url - jws_private_key Rails.application.secrets.jws_private_key + signing_key Rails.application.secrets.openid_connect_signing_key resource_owner_from_access_token do |access_token| User.active.find_by(id: access_token.resource_owner_id) diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb index f9c1d2165d3..750a5b34f3b 100644 --- a/config/initializers/secret_token.rb +++ b/config/initializers/secret_token.rb @@ -25,7 +25,7 @@ def create_tokens secret_key_base: file_secret_key || generate_new_secure_token, otp_key_base: env_secret_key || file_secret_key || generate_new_secure_token, db_key_base: generate_new_secure_token, - jws_private_key: generate_new_rsa_private_key + openid_connect_signing_key: generate_new_rsa_private_key } missing_secrets = set_missing_keys(defaults) |