Commit b27a9766 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'dblessing_admin_appearance_sign_in_form' into 'master'

Disable form on admin appearance sign-in page preview

See merge request gitlab-org/gitlab!70736
parents ddce3855 4060fbbb
= render 'devise/shared/tab_single', tab_title: _('Sign in preview') = render 'devise/shared/tab_single', tab_title: _('Sign in preview')
.login-box .login-box
%form.gl-show-field-errors %form.gl-show-field-errors
- title = _('This form is disabled in preview')
.form-group .form-group
= label_tag :login = label_tag :login
= text_field_tag :login, nil, class: "form-control gl-form-input top", title: _('Please provide your username or email address.') = text_field_tag :login, nil, disabled: true, class: "form-control gl-form-input top", title: title
.form-group .form-group
= label_tag :password = label_tag :password
= password_field_tag :password, nil, class: "form-control gl-form-input bottom", title: _('This field is required.') = password_field_tag :password, nil, disabled: true, class: "form-control gl-form-input bottom", title: title
.form-group .form-group
= button_tag _("Sign in"), class: "btn gl-button btn-confirm", type: "button" = button_tag _("Sign in"), disabled: true, class: "btn gl-button btn-confirm", type: "button", title: title
...@@ -25370,9 +25370,6 @@ msgstr "" ...@@ -25370,9 +25370,6 @@ msgstr ""
msgid "Please provide attributes to update" msgid "Please provide attributes to update"
msgstr "" msgstr ""
msgid "Please provide your username or email address."
msgstr ""
msgid "Please reach out if you have any questions and we'll be happy to assist." msgid "Please reach out if you have any questions and we'll be happy to assist."
msgstr "" msgstr ""
...@@ -34536,6 +34533,9 @@ msgstr "" ...@@ -34536,6 +34533,9 @@ msgstr ""
msgid "This field is required." msgid "This field is required."
msgstr "" msgstr ""
msgid "This form is disabled in preview"
msgstr ""
msgid "This group" msgid "This group"
msgstr "" msgstr ""
......
...@@ -34,6 +34,10 @@ RSpec.describe 'Admin Appearance' do ...@@ -34,6 +34,10 @@ RSpec.describe 'Admin Appearance' do
visit admin_application_settings_appearances_path visit admin_application_settings_appearances_path
click_link "Sign-in page" click_link "Sign-in page"
expect(find('#login')).to be_disabled
expect(find('#password')).to be_disabled
expect(find('button')).to be_disabled
expect_custom_sign_in_appearance(appearance) expect_custom_sign_in_appearance(appearance)
end end
......
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