diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-14 00:06:24 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-14 00:06:24 +0000 |
| commit | eed996ac33a60d5fd8315a62fec8beaa8e907e69 (patch) | |
| tree | d8077bee50b58a170ae1a950ae76e3011c78a415 /app/views/profiles | |
| parent | b42f312df5aee0f1b832b69171e9d1cf92eb7416 (diff) | |
| download | gitlab-ce-eed996ac33a60d5fd8315a62fec8beaa8e907e69.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, 1 insertions, 2 deletions
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index 6b27db23315..cfad274f91d 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -94,8 +94,7 @@ - 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' } - - if experiment_enabled?(:signup_flow) - = f.select :role, ::User.roles.keys.map { |role| [role.titleize, role] }, { prompt: _('Select your role') }, class: 'input-md' + = f.select :role, ::User.roles.keys.map { |role| [role.titleize, role] }, { prompt: _('Select your role') }, required: true, class: 'input-md' = render_if_exists 'profiles/email_settings', form: f = f.text_field :skype, class: 'input-md', placeholder: s_("Profiles|username") |