diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-08 15:08:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-08 15:08:54 +0300 |
commit | 473b876fe3d7e0b36eb6268cc44a4fe0d94f4422 (patch) | |
tree | 2f6d5f2ecad53015024b6b1509896f5933c5c3e6 /doc/administration/auth/atlassian.md | |
parent | dca8df0c90d8727d69b3501b15b481546897f3cd (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/auth/atlassian.md')
-rw-r--r-- | doc/administration/auth/atlassian.md | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/administration/auth/atlassian.md b/doc/administration/auth/atlassian.md index 45617b9965c..27e33c85761 100644 --- a/doc/administration/auth/atlassian.md +++ b/doc/administration/auth/atlassian.md @@ -29,13 +29,13 @@ To enable the Atlassian OmniAuth provider for passwordless authentication you mu 1. On your GitLab server, open the configuration file: - For Omnibus GitLab installations: + For Linux package installations: ```shell sudo editor /etc/gitlab/gitlab.rb ``` - For installations from source: + For self-compiled installations: ```shell sudo -u git -H editor /home/git/gitlab/config/gitlab.yml @@ -47,7 +47,7 @@ To enable the Atlassian OmniAuth provider for passwordless authentication you mu GitLab account. 1. Add the provider configuration for Atlassian: - For Omnibus GitLab installations: + For Linux package installations: ```ruby gitlab_rails['omniauth_providers'] = [ @@ -61,7 +61,7 @@ To enable the Atlassian OmniAuth provider for passwordless authentication you mu ] ``` - For installations from source: + For self-compiled installations: ```yaml - { name: "atlassian_oauth2", @@ -76,8 +76,8 @@ To enable the Atlassian OmniAuth provider for passwordless authentication you mu 1. Save the configuration file. 1. For the changes to take effect: - - If you installed via Omnibus, [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure). - - If you installed from source, [restart GitLab](../restart_gitlab.md#installations-from-source). + - If you installed using the Linux package, [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure). + - If you self-compiled your installation, [restart GitLab](../restart_gitlab.md#installations-from-source). On the sign-in page there should now be an Atlassian icon below the regular sign in form. Select the icon to begin the authentication process. |