diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /app/views/invites/show.html.haml | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/views/invites/show.html.haml')
-rw-r--r-- | app/views/invites/show.html.haml | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/app/views/invites/show.html.haml b/app/views/invites/show.html.haml index 2bcd64d0690..283683511d7 100644 --- a/app/views/invites/show.html.haml +++ b/app/views/invites/show.html.haml @@ -2,28 +2,19 @@ %h3.page-title= _("Invitation") %p - You have been invited - - if inviter = @member.created_by - by + = _("You have been invited") + - inviter = @member.created_by + - if inviter + = _("by") = link_to inviter.name, user_url(inviter) - to join - - case @member.source - - when Project - - project = @member.source - project - %strong - = link_to project.full_name, project_url(project) - - when Group - - group = @member.source - group - %strong - = link_to group.name, group_url(group) - as #{@member.human_access}. + = _("to join %{source_name}") % { source_name: @invite_details[:title] } + %strong + = link_to @invite_details[:name], @invite_details[:url] + = _("as %{role}.") % { role: @member.human_access } - if member? %p - - member_source = @member.source.is_a?(Group) ? _("group") : _("project") - = _("However, you are already a member of this %{member_source}. Sign in using a different account to accept the invitation.") % { member_source: member_source } + = _("However, you are already a member of this %{member_source}. Sign in using a different account to accept the invitation.") % { member_source: @invite_details[:title] } - if !current_user_matches_invite? %p @@ -32,7 +23,7 @@ - link_to_current_user = link_to(current_user.to_reference, user_url(current_user)) = _("Note that this invitation was sent to %{mail_to_invite_email}, but you are signed in as %{link_to_current_user} with email %{mail_to_current_user}.").html_safe % { mail_to_invite_email: mail_to_invite_email, mail_to_current_user: mail_to_current_user, link_to_current_user: link_to_current_user } -- unless member? +- if !member? .actions = link_to _("Accept invitation"), accept_invite_url(@token), method: :post, class: "btn btn-success" = link_to _("Decline"), decline_invite_url(@token), method: :post, class: "btn btn-danger gl-ml-3" |