diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-10-19 17:42:24 +0300 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-10-19 17:42:24 +0300 |
| commit | b1947b714b1d581c23fdea24f4eb22131c558765 (patch) | |
| tree | 3822b7d05d0430222f5788f261d38a448b7c81ff /app/views | |
| parent | cc46a0d47c5660583455c203a93f3333af42f4a8 (diff) | |
| parent | f099e36c181d3f089a18dab20b5aa0cc982da0a1 (diff) | |
Merge branch 'corrected-build-page-header-username-to-full-name' into 'master'
Changed build header username area to use the full name with the username as the tooltip
## What does this MR do?
Changes build header username to use the full name with the username as the tooltip.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
UI consistency
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Contributes to #21832
See merge request !6272
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/builds/_user.html.haml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/views/projects/builds/_user.html.haml b/app/views/projects/builds/_user.html.haml index 2642de8021d..83f299da651 100644 --- a/app/views/projects/builds/_user.html.haml +++ b/app/views/projects/builds/_user.html.haml @@ -1,4 +1,7 @@ by %a{ href: user_path(@build.user) } - = image_tag avatar_icon(@build.user, 24), class: "avatar s24" - %strong= @build.user.to_reference + %span.hidden-xs + = image_tag avatar_icon(@build.user, 24), class: "avatar s24" + %strong{ data: { toggle: 'tooltip', placement: 'top', title: @build.user.to_reference } } + = @build.user.name + %strong.visible-xs-inline= @build.user.to_reference |