Skip to content

Commit 8af47ca

Browse files
Work on GitLab 17 support
1 parent f0c2846 commit 8af47ca

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

roles/gitlab/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ gitlab_with_zsh: true
1616
gitlab_omniauth_enabled: false
1717
gitlab_omniauth_providers: []
1818

19-
gitlab_repository_version: '16-11-stable'
19+
gitlab_repository_version: '17-0-stable'
2020
gitlab_ce_version: '{{ gitlab_repository_version }}'
2121
gitlab_ee_version: '{{ gitlab_repository_version }}-ee'
2222
gitlab_path: "{{ gitlab_home }}/gitlab"

roles/gitlab/templates/gitlab/gitlab.yml.j2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -563,15 +563,15 @@ production: &base
563563

564564
## OmniAuth settings
565565
omniauth:
566-
# Allow login via Twitter, Google, etc. using OmniAuth providers
566+
# Allow login via Google, GitHub, etc. using OmniAuth providers
567567
enabled: {{ 'true' if gitlab_omniauth_enabled else 'false' }}
568568

569569
# Uncomment this to automatically sign in with a specific omniauth provider's without
570570
# showing GitLab's sign-in page (default: show the GitLab sign-in page)
571571
# auto_sign_in_with_provider: saml
572572

573573
# Sync user's profile from the specified Omniauth providers every time the user logs in (default: empty).
574-
# Define the allowed providers using an array, e.g. ["cas3", "saml", "twitter"],
574+
# Define the allowed providers using an array, e.g. ["saml", "google_oauth2"],
575575
# or as true/false to allow all providers or none.
576576
# When authenticating using LDAP, the user's email is always synced.
577577
# sync_profile_from_provider: []
@@ -584,7 +584,7 @@ production: &base
584584

585585
# CAUTION!
586586
# This allows users to login without having a user account first. Define the allowed providers
587-
# using an array, e.g. ["saml", "twitter"], or as true/false to allow all providers or none.
587+
# using an array, e.g. ["saml", "google_oauth2"], or as true/false to allow all providers or none.
588588
# User accounts will be created automatically when authentication was successful.
589589
allow_single_sign_on: ["saml"]
590590

0 commit comments

Comments
 (0)