diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ee8ec1a3adca5..fc5eccb2db241 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2561,7 +2561,6 @@ teams.all_repositories_admin_permission_desc = This team grants Admin%s in organization %s. teams.invite.by = Invited by %s teams.invite.description = Please click the button below to join the team. -teams.invite.email_mismatch = Your email address does not match this invite. [admin] dashboard = Dashboard diff --git a/routers/web/org/teams.go b/routers/web/org/teams.go index 9a0f49b688ed1..2ce4bf5322717 100644 --- a/routers/web/org/teams.go +++ b/routers/web/org/teams.go @@ -552,7 +552,6 @@ func TeamInvite(ctx *context.Context) { ctx.Data["Organization"] = org ctx.Data["Team"] = team ctx.Data["Inviter"] = inviter - ctx.Data["EmailMismatch"] = ctx.Doer.Email != invite.Email ctx.HTML(http.StatusOK, tplTeamInvite) } @@ -569,13 +568,6 @@ func TeamInvitePost(ctx *context.Context) { return } - // check that the Doer is the invitee - if ctx.Doer.Email != invite.Email { - log.Info("invite %d does not apply to the current user %d", invite.ID, ctx.Doer.ID) - ctx.NotFound("ErrTeamInviteNotFound", err) - return - } - if err := models.AddTeamMember(team, ctx.Doer.ID); err != nil { ctx.ServerError("AddTeamMember", err) return diff --git a/templates/org/team/invite.tmpl b/templates/org/team/invite.tmpl index 8d1fad0141657..55ecd049b39d0 100644 --- a/templates/org/team/invite.tmpl +++ b/templates/org/team/invite.tmpl @@ -6,23 +6,17 @@