diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 19:00:14 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 19:00:14 +0000 |
commit | 05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch) | |
tree | 11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /app/helpers/todos_helper.rb | |
parent | ec73467c23693d0db63a797d10194da9e72a74af (diff) | |
download | gitlab-ce-05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2.tar.gz |
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'app/helpers/todos_helper.rb')
-rw-r--r-- | app/helpers/todos_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb index d7c4540544b..daaf86e55a0 100644 --- a/app/helpers/todos_helper.rb +++ b/app/helpers/todos_helper.rb @@ -28,7 +28,7 @@ module TodosHelper when Todo::UNMERGEABLE then s_('Todos|Could not merge') when Todo::MERGE_TRAIN_REMOVED then s_("Todos|Removed from Merge Train") when Todo::MEMBER_ACCESS_REQUESTED then format( - s_("Todos|has requested access to group %{which}"), which: _(todo.target.name) + s_("Todos|has requested access to %{what} %{which}"), what: _(todo.member_access_type), which: _(todo.target.name) ) end end @@ -99,7 +99,7 @@ module TodosHelper path_options[:only_path] = true Gitlab::UrlBuilder.build(todo.target, **path_options) elsif todo.member_access_requested? - todo.access_request_url + todo.access_request_url(only_path: true) else path = [todo.resource_parent, todo.target] |