diff --git a/.env.example b/.env.example index 279d0f5e9..a5184a789 100644 --- a/.env.example +++ b/.env.example @@ -50,9 +50,9 @@ OKTA_BASE_URL=false OKTA_KEY=false OKTA_SECRET=false -GITLAB_KEY=false -GITLAB_SECRET=false -GITLAB_INSTANCE_URI=false +GITLAB_APP_ID=false +GITLAB_APP_SECRET=false +GITLAB_BASE_URI=false # External services such as Gravatar DISABLE_EXTERNAL_SERVICES=false diff --git a/config/services.php b/config/services.php index 17f54ab45..31d5a09cf 100644 --- a/config/services.php +++ b/config/services.php @@ -95,11 +95,11 @@ return [ ], 'gitlab' => [ - 'client_id' => env('GITLAB_KEY'), - 'client_secret' => env('GITLAB_SECRET'), - 'redirect' => env('APP_URL') . '/login/service/gitlab/callback', - 'instance_uri' => env('GITLAB_INSTANCE_URI'), // needs only for GitLab self hosted - 'name' => 'Gitlab', + 'client_id' => env('GITLAB_APP_ID'), + 'client_secret' => env('GITLAB_APP_SECRET'), + 'redirect' => env('APP_URL') . '/login/service/gitlab/callback', + 'instance_uri' => env('GITLAB_BASE_URI'), // needs only for GitLab self hosted + 'name' => 'Gitlab', ], 'ldap' => [ diff --git a/resources/assets/icons/gitlab.svg b/resources/assets/icons/gitlab.svg new file mode 100644 index 000000000..fa1e92a56 --- /dev/null +++ b/resources/assets/icons/gitlab.svg @@ -0,0 +1 @@ +