diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 11:10:13 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 11:10:13 +0000 |
| commit | 0ea3fcec397b69815975647f5e2aa5fe944a8486 (patch) | |
| tree | 7979381b89d26011bcf9bdc989a40fcc2f1ed4ff /app/views/profiles/_email_settings.html.haml | |
| parent | 72123183a20411a36d607d70b12d57c484394c8e (diff) | |
| download | gitlab-ce-0ea3fcec397b69815975647f5e2aa5fe944a8486.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42
Diffstat (limited to 'app/views/profiles/_email_settings.html.haml')
| -rw-r--r-- | app/views/profiles/_email_settings.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/profiles/_email_settings.html.haml b/app/views/profiles/_email_settings.html.haml index 35cad79b6fd..457d6690a78 100644 --- a/app/views/profiles/_email_settings.html.haml +++ b/app/views/profiles/_email_settings.html.haml @@ -7,7 +7,7 @@ .form-group.gl-form-group = form.label :email, _('Email') - = form.text_field :email, required: true, class: 'gl-form-input form-control gl-form-input-lg', value: (@user.email unless @user.temp_oauth_email?), readonly: readonly || email_change_disabled + = form.text_field :email, required: true, class: 'gl-form-input form-control gl-md-form-input-lg', value: (@user.email unless @user.temp_oauth_email?), readonly: readonly || email_change_disabled %small.form-text.text-gl-muted = help_text.html_safe @@ -16,7 +16,7 @@ .form-group.gl-form-group = form.label :public_email, s_('Profiles|Public email') - .gl-form-input-lg + .gl-md-form-input-lg = form.select :public_email, options_for_select(@user.public_verified_emails, selected: @user.public_email), { include_blank: s_("Profiles|Do not show on profile") }, @@ -29,7 +29,7 @@ - commit_email_link_start = '<a href="%{url}">'.html_safe % { url: commit_email_link_url } - commit_email_docs_link = s_('Profiles|This email will be used for web based operations, such as edits and merges. %{commit_email_link_start}Learn more%{commit_email_link_end}').html_safe % { commit_email_link_start: commit_email_link_start, commit_email_link_end: '</a>'.html_safe } = form.label :commit_email, s_('Profiles|Commit email') - .gl-form-input-lg + .gl-md-form-input-lg = form.select :commit_email, options_for_select(commit_email_select_options(@user), selected: @user.commit_email), {}, |