diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-19 14:21:25 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-19 14:21:25 +0300 |
| commit | ff97afdd589b0c3dd93db9eca83b13a09a704a2e (patch) | |
| tree | 896a5b2389b0eb80b31e499b3efdac352e1fed5b /app/views | |
| parent | 7794a5157ca3e29826e344c90e23601c9bc9e357 (diff) | |
| parent | aa2e2cacb46485eae1356ba9cf684bbf2bb41d42 (diff) | |
Merge branch '33461-display-user-id' into 'master'
Display own user id in account settings pages
Closes #33461
See merge request !12141
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/profiles/show.html.haml | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index fcfd350f0da..15672289c65 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -42,10 +42,17 @@ - if current_user.ldap_user? Some options are unavailable for LDAP accounts .col-lg-9 - .form-group - = f.label :name, class: "label-light" - = f.text_field :name, class: "form-control", required: true - %span.help-block Enter your name, so people you know can recognize you. + .row + .form-group.col-md-9 + = f.label :name, class: "label-light" + = f.text_field :name, class: "form-control", required: true + %span.help-block Enter your name, so people you know can recognize you. + + .form-group.col-md-3 + = f.label :id, class: 'label-light' do + User ID + = f.text_field :id, class: 'form-control', readonly: true + .form-group = f.label :email, class: "label-light" |