diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
tree | 5423a1c7516cffe36384133ade12572cf709398d /app/views/registrations | |
parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'app/views/registrations')
-rw-r--r-- | app/views/registrations/invites/new.html.haml | 18 | ||||
-rw-r--r-- | app/views/registrations/welcome/show.html.haml | 1 |
2 files changed, 19 insertions, 0 deletions
diff --git a/app/views/registrations/invites/new.html.haml b/app/views/registrations/invites/new.html.haml new file mode 100644 index 00000000000..6e6ff7aaeee --- /dev/null +++ b/app/views/registrations/invites/new.html.haml @@ -0,0 +1,18 @@ +- page_title _('Join your team') +- add_page_specific_style 'page_bundles/signup' +- content_for :page_specific_javascripts do + = render "layouts/google_tag_manager_head" += render "layouts/google_tag_manager_body" + +%h2.center.pt-6.pb-3.gl-mb-0 + = _('Join your team') +%p.gl-text-center= _('Create your own profile to collaborate with your teammates in issues, merge requests, and more.') + +.signup-page + = render 'devise/shared/signup_box', + url: users_sign_up_invites_path, + button_text: _('Continue'), + show_omniauth_providers: social_signin_enabled?, + omniauth_providers_placement: :top, + suggestion_path: nil + = render 'devise/shared/sign_in_link' diff --git a/app/views/registrations/welcome/show.html.haml b/app/views/registrations/welcome/show.html.haml index bf5e35a1224..e85ce1ba6ac 100644 --- a/app/views/registrations/welcome/show.html.haml +++ b/app/views/registrations/welcome/show.html.haml @@ -25,6 +25,7 @@ = f.text_field :other_role, class: 'form-control' = render_if_exists "registrations/welcome/setup_for_company", f: f = render 'devise/shared/email_opted_in', f: f + = render_if_exists "registrations/welcome/jobs_to_be_done", f: f .row .form-group.col-sm-12.gl-mb-0 - if partial_exists? "registrations/welcome/button" |