From 88a927ae902b064bb35971e093dcfa228983a52c Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 23 Jun 2023 06:10:37 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/views/devise/shared/_signup_box.html.haml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'app/views/devise') diff --git a/app/views/devise/shared/_signup_box.html.haml b/app/views/devise/shared/_signup_box.html.haml index 684ade87720..e8d3a19fb67 100644 --- a/app/views/devise/shared/_signup_box.html.haml +++ b/app/views/devise/shared/_signup_box.html.haml @@ -71,9 +71,7 @@ .submit-container.gl-mt-5 = f.submit button_text, pajamas_button: true, class: 'gl-w-full', data: { qa_selector: 'new_user_register_button' } - - if Gitlab::CurrentSettings.sign_in_text.present? && Feature.enabled?(:restyle_login_page, @project) - .gl-pt-5 - = markdown_field(Gitlab::CurrentSettings.current_application_settings, :sign_in_text) + = render 'devise/shared/terms_of_service_notice', button_text: button_text = yield :omniauth_providers_bottom if show_omniauth_providers -- cgit v1.2.3