Commit 4712fd6a authored by Etienne Baqué's avatar Etienne Baqué

Merge branch 'feature/make-frontend-recaptcha-url-work-in-jh' into 'master'

Make captcha_modal.vue work in JH

See merge request gitlab-org/gitlab!68635
parents 93ea0d19 82fca7fa
// NOTE: This module will be used in https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52044 // NOTE: This module will be used in https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52044
import { memoize } from 'lodash'; import { memoize } from 'lodash';
export const RECAPTCHA_API_URL_PREFIX = 'https://www.google.com/recaptcha/api.js'; export const RECAPTCHA_API_URL_PREFIX = window.gon.recaptcha_api_server_url;
export const RECAPTCHA_ONLOAD_CALLBACK_NAME = 'recaptchaOnloadCallback'; export const RECAPTCHA_ONLOAD_CALLBACK_NAME = 'recaptchaOnloadCallback';
/** /**
......
...@@ -21,6 +21,8 @@ module Gitlab ...@@ -21,6 +21,8 @@ module Gitlab
gon.sentry_environment = Gitlab.config.sentry.environment gon.sentry_environment = Gitlab.config.sentry.environment
end end
gon.recaptcha_api_server_url = ::Recaptcha.configuration.api_server_url
gon.recaptcha_sitekey = Gitlab::CurrentSettings.recaptcha_site_key
gon.gitlab_url = Gitlab.config.gitlab.url gon.gitlab_url = Gitlab.config.gitlab.url
gon.revision = Gitlab.revision gon.revision = Gitlab.revision
gon.feature_category = Gitlab::ApplicationContext.current_context_attribute(:feature_category).presence gon.feature_category = Gitlab::ApplicationContext.current_context_attribute(:feature_category).presence
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment