Merge branch '29278-commits-page-tooltips' into 'master'
Resolve "Commits page tooltips" Closes #29278 See merge request gitlab-org/gitlab-ce!20674
This commit is contained in:
commit
f0b1780f45
6 changed files with 12 additions and 9 deletions
|
@ -145,15 +145,14 @@ module CommitsHelper
|
|||
person_name
|
||||
end
|
||||
|
||||
options = {
|
||||
class: "commit-#{options[:source]}-link has-tooltip",
|
||||
title: source_email
|
||||
link_options = {
|
||||
class: "commit-#{options[:source]}-link"
|
||||
}
|
||||
|
||||
if user.nil?
|
||||
mail_to(source_email, text, options)
|
||||
mail_to(source_email, text, link_options)
|
||||
else
|
||||
link_to(text, user_path(user), options)
|
||||
link_to(text, user_path(user), link_options)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
- commit = blame_group[:commit]
|
||||
%td.blame-commit{ class: age_map_class(commit.committed_date, project_duration) }
|
||||
.commit
|
||||
= author_avatar(commit, size: 36)
|
||||
= author_avatar(commit, size: 36, has_tooltip: false)
|
||||
.commit-row-title
|
||||
%span.item-title.str-truncated-100
|
||||
= link_to_markdown commit.title, project_commit_path(@project, commit.id), class: "cdark", title: commit.title
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
%span.d-none.d-sm-inline authored
|
||||
#{time_ago_with_tooltip(@commit.authored_date)}
|
||||
%span= s_('ByAuthor|by')
|
||||
= author_avatar(@commit, size: 24)
|
||||
= author_avatar(@commit, size: 24, has_tooltip: false)
|
||||
%strong
|
||||
= commit_author_link(@commit, avatar: true, size: 24)
|
||||
- if @commit.different_committer?
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
%li.commit.flex-row.js-toggle-container{ id: "commit-#{commit.short_id}" }
|
||||
|
||||
.avatar-cell.d-none.d-sm-block
|
||||
= author_avatar(commit, size: 36)
|
||||
= author_avatar(commit, size: 36, has_tooltip: false)
|
||||
|
||||
.commit-detail.flex-list
|
||||
.commit-content.qa-commit-content
|
||||
|
|
5
changelogs/unreleased/29278-commits-page-tooltips.yml
Normal file
5
changelogs/unreleased/29278-commits-page-tooltips.yml
Normal file
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Remove tooltips from commit author avatar and name in commit lists
|
||||
merge_request: 20674
|
||||
author:
|
||||
type: other
|
|
@ -238,6 +238,5 @@ def check_author_link(email, author)
|
|||
author_link = find('.commit-author-link')
|
||||
|
||||
expect(author_link['href']).to eq(user_path(author))
|
||||
expect(author_link['title']).to eq(email)
|
||||
expect(find('.commit-author-name').text).to eq(author.name)
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue