diff options
author | Rémy Coutable <remy@rymai.me> | 2016-07-20 20:14:46 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-07-20 20:14:46 +0300 |
commit | b4717017e7ad601eaa1d53c9238a242c7fdf0daa (patch) | |
tree | 5caea8f9c8452bc18cc2c60f1ded32167351a829 /app/views | |
parent | cf6de7dae95570c95e8e0590770d62d32a371bf6 (diff) | |
parent | 6558586f15f493968129b78544d76486cd2a6cd4 (diff) |
Merge branch 'add-link-to-commit-avatar' into 'master'
Add link to profile to commit avatar
## What does this MR do?
- links to user profiles to the avatars on commits page
- tooltips to the avatars on commits page
side effect:
- links to user profiles to the avatars on pipelines page
- tooltips to the avatars on pipelines page
- tooltips to the avatars on activity page
- mailto links to the avatars on activity page for non-registered users
## Are there points in the code the reviewer needs to double check?
Nope.
## Why was this MR needed?
There were no links nor Zeldas.
## What are the relevant issue numbers?
fixes #19644
See merge request !5163
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/events/_event.html.haml | 6 | ||||
-rw-r--r-- | app/views/projects/ci/pipelines/_pipeline.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/commits/_commit.html.haml | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml index e4629bae0e6..5c318cd3b8b 100644 --- a/app/views/events/_event.html.haml +++ b/app/views/events/_event.html.haml @@ -4,11 +4,7 @@ #{time_ago_with_tooltip(event.created_at)} = cache [event, current_application_settings, "v2.2"] do - - if event.author - = link_to user_path(event.author) do - = image_tag avatar_icon(event.author_email, 40), class: "avatar s40", alt:'' - - else - = image_tag avatar_icon(event.author_email, 40), class: "avatar s40", alt:'' + = author_avatar(event, size: 40) - if event.created_project? = render "events/event/created_project", event: event diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml index cb0ca7bc8e3..2f7d54f0bdd 100644 --- a/app/views/projects/ci/pipelines/_pipeline.html.haml +++ b/app/views/projects/ci/pipelines/_pipeline.html.haml @@ -27,7 +27,7 @@ %p.commit-title - if commit = pipeline.commit - = commit_author_avatar(commit, size: 20) + = author_avatar(commit, size: 20) = link_to_gfm truncate(commit.title, length: 60), namespace_project_commit_path(@project.namespace, @project, commit.id), class: "commit-row-message" - else Cant find HEAD commit for this branch diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml index c8c7b858baa..ab9afb06afb 100644 --- a/app/views/projects/commits/_commit.html.haml +++ b/app/views/projects/commits/_commit.html.haml @@ -9,7 +9,8 @@ = cache(cache_key) do %li.commit.js-toggle-container{ id: "commit-#{commit.short_id}" } - = commit_author_avatar(commit, size: 36) + = author_avatar(commit, size: 36) + .commit-info-block .commit-row-title %span.item-title |