diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
| commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
| tree | 5423a1c7516cffe36384133ade12572cf709398d /config/initializers/0_license.rb | |
| parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) | |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'config/initializers/0_license.rb')
| -rw-r--r-- | config/initializers/0_license.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/0_license.rb b/config/initializers/0_license.rb index 3db5ec0a91a..c1a2048b28d 100644 --- a/config/initializers/0_license.rb +++ b/config/initializers/0_license.rb @@ -5,7 +5,7 @@ load_license = lambda do |dir:, license_name:| public_key_file = File.read(Rails.root.join(dir, ".#{prefix}license_encryption_key.pub")) public_key = OpenSSL::PKey::RSA.new(public_key_file) Gitlab::License.encryption_key = public_key -rescue +rescue StandardError warn "WARNING: No valid #{license_name} encryption key provided." end |