Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-01-27 12:09:01 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-01-27 12:09:01 +0300
commit6e7dc3f9d6b95200abd1fcd5cc418a9ae9803e4c (patch)
tree299cedc6760e39379176bb73a08ecf2352368305 /lib/gitlab/recaptcha.rb
parentc78a5f67d0bf347da8a486d72515478e20f15d6e (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/recaptcha.rb')
-rw-r--r--lib/gitlab/recaptcha.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/recaptcha.rb b/lib/gitlab/recaptcha.rb
index f3cbe1db901..a08cea5a435 100644
--- a/lib/gitlab/recaptcha.rb
+++ b/lib/gitlab/recaptcha.rb
@@ -2,8 +2,10 @@
module Gitlab
module Recaptcha
+ extend Gitlab::Utils::StrongMemoize
+
def self.load_configurations!
- if Gitlab::CurrentSettings.recaptcha_enabled || enabled_on_login?
+ if enabled? || enabled_on_login?
::Recaptcha.configure do |config|
config.site_key = Gitlab::CurrentSettings.recaptcha_site_key
config.secret_key = Gitlab::CurrentSettings.recaptcha_private_key