diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
commit | 9dc93a4519d9d5d7be48ff274127136236a3adb3 (patch) | |
tree | 70467ae3692a0e35e5ea56bcb803eb512a10bedb /app/helpers/issuables_helper.rb | |
parent | 4b0f34b6d759d6299322b3a54453e930c6121ff0 (diff) |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43
Diffstat (limited to 'app/helpers/issuables_helper.rb')
-rw-r--r-- | app/helpers/issuables_helper.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 639a54fa9ec..8ebc773bb25 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -20,13 +20,13 @@ module IssuablesHelper end def assignees_label(issuable, include_value: true) - label = 'Assignee'.pluralize(issuable.assignees.count) + assignees = issuable.assignees if include_value sanitized_list = sanitize_name(issuable.assignee_list) - "#{label}: #{sanitized_list}" + ns_('NotificationEmail|Assignee: %{users}', 'NotificationEmail|Assignees: %{users}', assignees.count) % { users: sanitized_list } else - label + ns_('NotificationEmail|Assignee', 'NotificationEmail|Assignees', assignees.count) end end @@ -389,7 +389,8 @@ module IssuablesHelper severity: issuable[:severity], timeTrackingLimitToHours: Gitlab::CurrentSettings.time_tracking_limit_to_hours, createNoteEmail: issuable[:create_note_email], - issuableType: issuable[:type] + issuableType: issuable[:type], + projectMembersPath: project_project_members_path(@project, sort: :access_level_desc) } end |