From 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 19 May 2021 15:44:42 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-12-stable-ee --- config/initializers/0_license.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/initializers/0_license.rb') 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 -- cgit v1.2.3