diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /app/controllers/invites_controller.rb | |
parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'app/controllers/invites_controller.rb')
-rw-r--r-- | app/controllers/invites_controller.rb | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb index a78d87eceea..5bd9ac7f275 100644 --- a/app/controllers/invites_controller.rb +++ b/app/controllers/invites_controller.rb @@ -1,12 +1,17 @@ # frozen_string_literal: true class InvitesController < ApplicationController + include Gitlab::Utils::StrongMemoize + before_action :member skip_before_action :authenticate_user!, only: :decline + helper_method :member?, :current_user_matches_invite? + respond_to :html def show + accept if skip_invitation_prompt? end def accept @@ -38,6 +43,20 @@ class InvitesController < ApplicationController private + def skip_invitation_prompt? + !member? && current_user_matches_invite? + end + + def current_user_matches_invite? + @member.invite_email == current_user.email + end + + def member? + strong_memoize(:is_member) do + @member.source.users.include?(current_user) + end + end + def member return @member if defined?(@member) |