Skip to content
代码片段 群组 项目
未验证 提交 790c07e3 编辑于 作者: Andrew Fontaine's avatar Andrew Fontaine 提交者: GitLab
浏览文件

Merge branch...

Merge branch '493865-use-mapping-accept-banner-only-link-to-group-if-user-has-access' into 'master' 

User mapping banner - Use link for accept invite banner only with access

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/171133



Merged-by: default avatarAndrew Fontaine <afontaine@gitlab.com>
Approved-by: default avatarBuck O'Leary <bucoleary@gitlab.com>
Approved-by: default avatarAndy Schoenen <asoiron@gitlab.com>
Approved-by: default avatarAndrew Fontaine <afontaine@gitlab.com>
Co-authored-by: default avatarJustin Ho Tuan Duong <hduong@gitlab.com>
No related branches found
No related tags found
无相关合并请求
- destination_group = current_user.can?(:read_group, source_user.namespace) ? link_to(source_user.namespace.name, group_path(source_user.namespace)) : source_user.namespace.name
= render Pajamas::AlertComponent.new(variant: :success, title: s_('UserMapping|Reassignment approved'), alert_options: { class: 'gl-mt-4' }) do |c| = render Pajamas::AlertComponent.new(variant: :success, title: s_('UserMapping|Reassignment approved'), alert_options: { class: 'gl-mt-4' }) do |c|
- c.with_body do - c.with_body do
= safe_format(s_('UserMapping|You have approved the reassignment of contributions from %{strong_open}%{source_user_name} (@%{source_username})%{strong_close} on %{strong_open}%{source_hostname}%{strong_close} to yourself on the group %{strong_open}%{destination_group}%{strong_close}. Reassignment processing is in progress.'), = safe_format(s_('UserMapping|You have approved the reassignment of contributions from %{strong_open}%{source_user_name} (@%{source_username})%{strong_close} on %{strong_open}%{source_hostname}%{strong_close} to yourself on the group %{strong_open}%{destination_group}%{strong_close}. Reassignment processing is in progress.'),
...@@ -5,7 +7,7 @@ ...@@ -5,7 +7,7 @@
source_user_name: source_user.source_name, source_user_name: source_user.source_name,
source_username: source_user.source_username, source_username: source_user.source_username,
source_hostname: source_user.source_hostname, source_hostname: source_user.source_hostname,
destination_group: link_to(source_user.namespace.name, group_path(source_user.namespace))) destination_group: destination_group)
- c.with_actions do - c.with_actions do
= render Pajamas::ButtonComponent.new(variant: :default, = render Pajamas::ButtonComponent.new(variant: :default,
href: help_page_path('user/project/import/index.md', anchor: 'accept-contribution-reassignment'), href: help_page_path('user/project/import/index.md', anchor: 'accept-contribution-reassignment'),
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册