diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-28 15:05:58 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-28 15:05:58 +0000 |
| commit | a77db6bc47d8cdd9edae2ec22f640821d0794404 (patch) | |
| tree | 15861a5f1ec29e07c2012102e463402bb7dc8c2d /app/views/profiles | |
| parent | 6cf6996f183bdff46e73431c07bfb723066a8222 (diff) | |
| download | gitlab-ce-a77db6bc47d8cdd9edae2ec22f640821d0794404.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/profiles')
| -rw-r--r-- | app/views/profiles/show.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index 68b7efc6fb4..6b27db23315 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -94,7 +94,8 @@ - else = f.text_field :name, label: s_('Profiles|Full name'), required: true, title: s_("Profiles|Using emojis in names seems fun, but please try to set a status message instead"), wrapper: { class: 'col-md-9 qa-full-name rspec-full-name' }, help: s_("Profiles|Enter your name, so people you know can recognize you") = f.text_field :id, readonly: true, label: s_('Profiles|User ID'), wrapper: { class: 'col-md-3' } - = f.select :role, ::User.roles.keys.map { |role| [role.titleize, role] }, {}, class: 'input-md' + - if experiment_enabled?(:signup_flow) + = f.select :role, ::User.roles.keys.map { |role| [role.titleize, role] }, { prompt: _('Select your role') }, class: 'input-md' = render_if_exists 'profiles/email_settings', form: f = f.text_field :skype, class: 'input-md', placeholder: s_("Profiles|username") |