diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index d8af1063c01a5e4b9df11cba431f930bcefaeec6..9581ccf3ec9e9736d2f59a1e52613be0b4afb537 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -213,7 +213,7 @@ def edited_time_ago_with_tooltip(editable_object, placement: 'top', html_class: timeago = time_ago_with_tooltip(editable_object.last_edited_at, placement: placement, html_class: html_class) if !exclude_author && editable_object.last_edited_by - author_link = link_to_member(editable_object.project, editable_object.last_edited_by, avatar: false, extra_class: 'gl-hover-text-decoration-underline gl-text-gray-700', author_class: nil) + author_link = link_to_member(editable_object.last_edited_by, avatar: false, extra_class: 'gl-hover-text-decoration-underline gl-text-gray-700', author_class: nil) output = safe_format(_("Edited %{timeago} by %{author}"), timeago: timeago, author: author_link) else output = safe_format(_("Edited %{timeago}"), timeago: timeago) diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 545f796b00102f66120fecb40a41fd010496859f..de7c854f97087419154d6dd75bcfeab6f94c990b 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -303,8 +303,8 @@ def merge_request_source_branch(merge_request) link_to branch, branch_path, title: branch_title, class: 'ref-container gl-display-inline-block gl-text-truncate gl-max-w-26 gl-ml-2' end - def merge_request_header(project, merge_request) - link_to_author = link_to_member(project, merge_request.author, size: 24, extra_class: 'gl-font-bold gl-mr-2', avatar: false) + def merge_request_header(merge_request) + link_to_author = link_to_member(merge_request.author, size: 24, extra_class: 'gl-font-bold gl-mr-2', avatar: false) copy_action_description = _('Copy branch name') copy_action_shortcut = 'b' copy_button_title = "#{copy_action_description} <kbd class='flat ml-1' aria-hidden=true>#{copy_action_shortcut}</kbd>" diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index a5c2c2340b80ee8f35dd8a9c2d0d5a5d33a68605..13e05207a71364314f862bad9da1628392c6e692 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -56,7 +56,7 @@ def author_content_tag(author, opts = {}) content_tag(:span, username, name_tag_options) end - def link_to_member(_project, author, opts = {}, &block) + def link_to_member(author, opts = {}, &block) default_opts = { avatar: true, name: true, title: ":name" } opts = default_opts.merge(opts) diff --git a/app/views/projects/_issue.html.haml b/app/views/projects/_issue.html.haml index 1dd2b2edd01ea183dca81c445a24d9e086b91c8f..951f705e53a83c92e5e7e7702824771d485cb27e 100644 --- a/app/views/projects/_issue.html.haml +++ b/app/views/projects/_issue.html.haml @@ -20,9 +20,9 @@ %span.issuable-authored.gl-hidden.sm:gl-inline-block · - if issue.service_desk_reply_to - #{_('created %{timeAgoString} by %{email} via %{user}').html_safe % { timeAgoString: time_ago_with_tooltip(issue.created_at, placement: 'bottom'), email: issue.present(current_user: current_user).service_desk_reply_to, user: link_to_member(@project, issue.author, avatar: false) }} + #{_('created %{timeAgoString} by %{email} via %{user}').html_safe % { timeAgoString: time_ago_with_tooltip(issue.created_at, placement: 'bottom'), email: issue.present(current_user: current_user).service_desk_reply_to, user: link_to_member(issue.author, avatar: false) }} - else - #{s_('IssueList|created %{timeAgoString} by %{user}').html_safe % { timeAgoString: time_ago_with_tooltip(issue.created_at, placement: 'bottom'), user: link_to_member(@project, issue.author, avatar: false) }} + #{s_('IssueList|created %{timeAgoString} by %{user}').html_safe % { timeAgoString: time_ago_with_tooltip(issue.created_at, placement: 'bottom'), user: link_to_member(issue.author, avatar: false) }} - if issue.milestone %span.issuable-milestone.gl-hidden.sm:gl-inline-block diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 171a36fac9728d0285e40896f48bb918a1624e32..90bea3fba9b305544bce03018115b5e1c45f1cb1 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -24,7 +24,7 @@ #{issuable_reference(merge_request)} %span.issuable-authored.gl-inline-block.gl-text-gray-500! · - #{s_('IssueList|created %{timeAgoString} by %{user}').html_safe % { timeAgoString: time_ago_with_tooltip(merge_request.created_at, placement: 'bottom'), user: link_to_member(@project, merge_request.author, avatar: false, extra_class: 'gl-text-gray-500!') }} + #{s_('IssueList|created %{timeAgoString} by %{user}').html_safe % { timeAgoString: time_ago_with_tooltip(merge_request.created_at, placement: 'bottom'), user: link_to_member(merge_request.author, avatar: false, extra_class: 'gl-text-gray-500!') }} - if merge_request.milestone %span.issuable-milestone.gl-inline-block.gl-text-truncate.gl-max-w-26.gl-align-bottom diff --git a/app/views/projects/merge_requests/_mr_box.html.haml b/app/views/projects/merge_requests/_mr_box.html.haml index 6a6771497e63c04d6d7cf3b7f4e2e73c28c79dfb..b9ea41d26104f18a2eff1db6ec2b5b309ef9ac8f 100644 --- a/app/views/projects/merge_requests/_mr_box.html.haml +++ b/app/views/projects/merge_requests/_mr_box.html.haml @@ -1,3 +1,3 @@ .detail-page-description.gl-pt-2.gl-pb-4.gl-display-flex.gl-align-items-baseline.gl-flex-wrap{ class: "#{'is-merge-request' if !fluid_layout}" } .js-mr-header{ data: { project_path: @merge_request.project.path_with_namespace, hidden: @merge_request.hidden?.to_s, imported: @merge_request.imported?.to_s, iid: @merge_request.iid, state: @merge_request.state } } - = merge_request_header(@project, @merge_request) + = merge_request_header(@merge_request) diff --git a/app/views/search/results/_issuable.html.haml b/app/views/search/results/_issuable.html.haml index df41eb8104f229606c865cd58e2b762a46672801..01c51f767e50971a55117bf26173923f80c95ac8 100644 --- a/app/views/search/results/_issuable.html.haml +++ b/app/views/search/results/_issuable.html.haml @@ -10,7 +10,7 @@ .gl-text-secondary.gl-mb-3.gl-mt-2.gl-font-sm = issuable_project_reference(issuable) · - = sprintf(s_('created %{issuable_created} by %{author}'), { issuable_created: time_ago_with_tooltip(issuable.created_at, placement: 'bottom'), author: link_to_member(@project, issuable.author, avatar: false) }).html_safe + = sprintf(s_('created %{issuable_created} by %{author}'), { issuable_created: time_ago_with_tooltip(issuable.created_at, placement: 'bottom'), author: link_to_member(issuable.author, avatar: false) }).html_safe - if (target_branch = issuable_visible_target_branch(issuable)) %span.project-ref-path.has-tooltip.gl-inline-block.gl-text-truncate.gl-max-w-26.gl-align-bottom{ title: _('Target branch: %{target_branch}') % {target_branch: target_branch} } diff --git a/app/views/search/results/_note.html.haml b/app/views/search/results/_note.html.haml index fa2050f79e5abecf99e8c7f06dd939443f6904eb..a73dffdab0dcbee21f36f7c7be7e0b134c3c111c 100644 --- a/app/views/search/results/_note.html.haml +++ b/app/views/search/results/_note.html.haml @@ -9,7 +9,7 @@ .note-search-caption.gl-max-w-full .gl-font-sm.gl-text-secondary.gl-float-right= time_ago_with_tooltip(note.created_at, placement: 'bottom', html_class: 'note-created-ago') .gl-display-inline-block.gl-text-truncate.search-max-w-inherit.gl-align-bottom - .gl-font-bold= link_to_member(project, note.author, avatar: true, extra_class: 'gl-text-black-normal') + .gl-font-bold= link_to_member(note.author, avatar: true, extra_class: 'gl-text-black-normal') .gl-text-secondary = _("Commented on %{link_to_project}").html_safe % { link_to_project: link_to(project.full_name, project) } · diff --git a/app/views/shared/issuable/_assignees.html.haml b/app/views/shared/issuable/_assignees.html.haml index 1ae9ce4eecdecce42f898835aac00fcd3cc58e7b..f7b21d6fe3d6abe1445dc6a26f7216d32fe56bfd 100644 --- a/app/views/shared/issuable/_assignees.html.haml +++ b/app/views/shared/issuable/_assignees.html.haml @@ -4,7 +4,7 @@ - more_assignees_count = issuable.assignees.size - render_count - issuable.assignees.take(render_count).each do |assignee| # rubocop: disable CodeReuse/ActiveRecord - = link_to_member(@project, assignee, name: false, title: s_("MrList|Assigned to %{name}") % { name: assignee.name}) + = link_to_member(assignee, name: false, title: s_("MrList|Assigned to %{name}") % { name: assignee.name}) - if more_assignees_count > 0 %span{ class: 'avatar-counter has-tooltip', data: { container: 'body', placement: 'bottom', 'line-type' => 'old' }, title: _("+%{more_assignees_count} more assignees") % { more_assignees_count: more_assignees_count} } diff --git a/app/views/shared/issuable/_reviewers.html.haml b/app/views/shared/issuable/_reviewers.html.haml index 4adb7096181350742846218d8bc3b7e7c43d6f73..4da81a0f64344059cf7afae0a35c72f54dd5b449 100644 --- a/app/views/shared/issuable/_reviewers.html.haml +++ b/app/views/shared/issuable/_reviewers.html.haml @@ -4,7 +4,7 @@ - more_reviewers_count = issuable.reviewers.size - render_count - issuable.reviewers.take(render_count).each do |reviewer| # rubocop: disable CodeReuse/ActiveRecord - = link_to_member(@project, reviewer, name: false, title: s_("MrList|Review requested from %{name}") % { name: reviewer.name}) + = link_to_member(reviewer, name: false, title: s_("MrList|Review requested from %{name}") % { name: reviewer.name}) - if more_reviewers_count > 0 %span{ class: 'avatar-counter has-tooltip', data: { container: 'body', placement: 'bottom', 'line-type' => 'old' }, title: _("+%{more_reviewers_count} more reviewers") % { more_reviewers_count: more_reviewers_count} } diff --git a/ee/app/views/search/results/_epic.html.haml b/ee/app/views/search/results/_epic.html.haml index f81e0f4954fe7221e195fa393555f76e963b7a27..37aa29f318882bd8b1aa04411d29f9289f2ba510 100644 --- a/ee/app/views/search/results/_epic.html.haml +++ b/ee/app/views/search/results/_epic.html.haml @@ -12,7 +12,7 @@ = link_to group_epic_path(epic.group, epic), data: { event_tracking: 'click_search_result', event_label: @scope, event_value: position, event_property: @search_term }, class: 'gl-w-full' do %span.term.str-truncated.gl-font-bold.gl-ml-2= epic.title .gl-text-secondary.gl-mb-3.gl-font-sm - = sprintf(s_('%{group_name}&%{epic_iid} · created %{epic_created} by %{author}'), { group_name: epic.group.full_name, epic_iid: epic.iid, epic_created: time_ago_with_tooltip(epic.created_at, placement: 'bottom'), author: link_to_member(@project, epic.author, avatar: false) }).html_safe + = sprintf(s_('%{group_name}&%{epic_iid} · created %{epic_created} by %{author}'), { group_name: epic.group.full_name, epic_iid: epic.iid, epic_created: time_ago_with_tooltip(epic.created_at, placement: 'bottom'), author: link_to_member(epic.author, avatar: false) }).html_safe · = _('updated %{time_ago}').html_safe % { time_ago: time_ago_with_tooltip(epic.updated_at, placement: 'bottom') } - if epic.description.present? diff --git a/spec/helpers/projects_helper_spec.rb b/spec/helpers/projects_helper_spec.rb index ba497fc7e6c80ed9e2ff4ef755e9602f4eddc34d..3c59b23854a06141078edfebd902afbe59fbceaf 100644 --- a/spec/helpers/projects_helper_spec.rb +++ b/spec/helpers/projects_helper_spec.rb @@ -355,13 +355,13 @@ describe 'using the default options' do it 'returns an HTML link to the user' do - link = helper.link_to_member(project, user) + link = helper.link_to_member(user) expect(link).to match(%r{/#{user.username}}) end it 'HTML escapes the name of the user' do - link = helper.link_to_member(project, user) + link = helper.link_to_member(user) expect(link).to include(ERB::Util.html_escape(user.name)) expect(link).not_to include(user.name) @@ -370,7 +370,7 @@ context 'when user is nil' do it 'returns "(deleted)"' do - link = helper.link_to_member(project, nil) + link = helper.link_to_member(nil) expect(link).to eq("(deleted)") end