diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
| commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
| tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /app/helpers/auth_helper.rb | |
| parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) | |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'app/helpers/auth_helper.rb')
| -rw-r--r-- | app/helpers/auth_helper.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/helpers/auth_helper.rb b/app/helpers/auth_helper.rb index a57e27d23c8..7f8cb66a84f 100644 --- a/app/helpers/auth_helper.rb +++ b/app/helpers/auth_helper.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module AuthHelper - PROVIDERS_WITH_ICONS = %w(twitter github gitlab bitbucket google_oauth2 facebook azure_oauth2 authentiq salesforce).freeze + PROVIDERS_WITH_ICONS = %w(twitter github gitlab bitbucket google_oauth2 facebook azure_oauth2 authentiq salesforce atlassian_oauth2).freeze LDAP_PROVIDER = /\Aldap/.freeze def ldap_enabled? @@ -133,6 +133,8 @@ module AuthHelper # rubocop: disable CodeReuse/ActiveRecord def auth_active?(provider) + return current_user.atlassian_identity.present? if provider == :atlassian_oauth2 + current_user.identities.exists?(provider: provider.to_s) end # rubocop: enable CodeReuse/ActiveRecord |