diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-19 00:06:37 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-19 00:06:37 +0300 |
| commit | 4682f5015a5a2d7eedb66b3c90aee931d3789d0b (patch) | |
| tree | 6240a8a5cf3584a893c6c3351141446e7856dc12 /app/views/profiles | |
| parent | 6d59e989185a7d2645792b713d1b5d95d46651fd (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/profiles')
| -rw-r--r-- | app/views/profiles/show.html.haml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index 0576f51fa83..68b7efc6fb4 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -94,6 +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' } + = f.select :role, ::User.roles.keys.map { |role| [role.titleize, role] }, {}, class: 'input-md' = render_if_exists 'profiles/email_settings', form: f = f.text_field :skype, class: 'input-md', placeholder: s_("Profiles|username") |