diff options
| author | Phil Hughes <me@iamphill.com> | 2019-05-16 08:22:22 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-05-16 08:22:22 +0000 |
| commit | 5df79d545427b4b349c1527788c5fe0bd17a7d0c (patch) | |
| tree | a3a1d562e663d4d35cf3303eca8fcbcd156be5a8 | |
| parent | 3d2edaac04ec1e4d5074a43249c11cf6e8a8eecf (diff) | |
| parent | 3e81218d7b230de0815618e4bcc22c44711228c4 (diff) | |
| download | gitlab-ce-5df79d545427b4b349c1527788c5fe0bd17a7d0c.tar.gz | |
Merge branch 'signup-box-scb' into 'master'
Resolve CE/EE diffs in signup_box
Closes gitlab-ee#11047
See merge request gitlab-org/gitlab-ce!28336
| -rw-r--r-- | app/views/devise/shared/_signup_box.html.haml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/devise/shared/_signup_box.html.haml b/app/views/devise/shared/_signup_box.html.haml index 9c7ca6ebbd4..427db070253 100644 --- a/app/views/devise/shared/_signup_box.html.haml +++ b/app/views/devise/shared/_signup_box.html.haml @@ -29,6 +29,7 @@ - terms_link = link_to s_("I accept the|Terms of Service and Privacy Policy"), terms_path, target: "_blank" - accept_terms_label = _("I accept the %{terms_link}") % { terms_link: terms_link } = accept_terms_label.html_safe + = render_if_exists 'devise/shared/email_opted_in', f: f %div - if Gitlab::Recaptcha.enabled? = recaptcha_tags |