diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-10-16 18:47:32 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-10-16 18:47:32 +0300 |
| commit | aeaf6686df0dabd211221b1158586136707f3bdf (patch) | |
| tree | 35e3bfceea86013311b8eb32df2075142cfa437b /app | |
| parent | 8131b64ae842cf304b049bb248560245a99bc26a (diff) | |
| parent | 2b3dab6f837b28ce4fd741d0e3e100e3a6a6e98a (diff) | |
Merge branch 'qa-handle-sign-up-with-terms' into 'master'
[QA] Handle sign-up when terms must be accepted
See merge request gitlab-org/gitlab-ce!22374
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/devise/shared/_signup_box.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/devise/shared/_signup_box.html.haml b/app/views/devise/shared/_signup_box.html.haml index 9a827523ed4..004a3528d4b 100644 --- a/app/views/devise/shared/_signup_box.html.haml +++ b/app/views/devise/shared/_signup_box.html.haml @@ -24,7 +24,7 @@ %p.gl-field-hint.text-secondary Minimum length is #{@minimum_password_length} characters - if Gitlab::CurrentSettings.current_application_settings.enforce_terms? .form-group - = check_box_tag :terms_opt_in, '1', false, required: true + = check_box_tag :terms_opt_in, '1', false, required: true, class: 'qa-new-user-accept-terms' = label_tag :terms_opt_in do - 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 } |