BookStackApp · jozefbalun · Nov 30, 2015 · Dec 1, 2015 · Dec 21, 2017
diff --git a/.env.example b/.env.example
@@ -49,6 +49,9 @@ GOOGLE_APP_SECRET=false
 OKTA_BASE_URL=false
 OKTA_KEY=false
 OKTA_SECRET=false
+GITLAB_KEY=false
+GITLAB_SECRET=false
+GITLAB_INSTANCE_URI=false
 
 # External services such as Gravatar
 DISABLE_EXTERNAL_SERVICES=false

diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
@@ -18,6 +18,7 @@ class EventServiceProvider extends ServiceProvider
             'SocialiteProviders\Slack\SlackExtendSocialite@handle',
             'SocialiteProviders\Azure\AzureExtendSocialite@handle',
             'SocialiteProviders\Okta\OktaExtendSocialite@handle',
+            'SocialiteProviders\GitLab\GitLabExtendSocialite@handle',
         ],
     ];
 

diff --git a/app/Services/SocialAuthService.php b/app/Services/SocialAuthService.php
@@ -16,7 +16,7 @@ class SocialAuthService
     protected $socialite;
     protected $socialAccount;
 
-    protected $validSocialDrivers = ['google', 'github', 'facebook', 'slack', 'twitter', 'azure', 'okta'];
+    protected $validSocialDrivers = ['google', 'github', 'facebook', 'slack', 'twitter', 'azure', 'okta', 'gitlab'];
 
     /**
      * SocialAuthService constructor.

diff --git a/composer.json b/composer.json
@@ -18,7 +18,8 @@
         "barryvdh/laravel-snappy": "^0.4.0",
         "socialiteproviders/slack": "^3.0",
         "socialiteproviders/microsoft-azure": "^3.0",
-        "socialiteproviders/okta": "^1.0"
+        "socialiteproviders/okta": "^1.0",
+        "socialiteproviders/gitlab": "^3.0"
     },
     "require-dev": {
         "filp/whoops": "~2.0",

diff --git a/composer.lock b/composer.lock
diff --git a/config/services.php b/config/services.php
@@ -86,7 +86,15 @@
         'redirect' => env('APP_URL') . '/login/service/okta/callback', 
         'base_url' => env('OKTA_BASE_URL'), 
         'name'          => 'Okta',
-    ], 
+    ],
+
+    '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',
+    ],
 
     'ldap' => [
         'server' => env('LDAP_SERVER', false),

diff --git a/public/build/css/print-styles-88bf3b16e2.css b/public/build/css/print-styles-88bf3b16e2.css
diff --git a/public/build/css/styles-9bbd48e72b.css b/public/build/css/styles-9bbd48e72b.css
diff --git a/public/build/js/common-80db108453.js b/public/build/js/common-80db108453.js
diff --git a/public/build/rev-manifest.json b/public/build/rev-manifest.json
@@ -0,0 +1,5 @@
+{
+  "css/print-styles.css": "css/print-styles-88bf3b16e2.css",
+  "css/styles.css": "css/styles-9bbd48e72b.css",
+  "js/common.js": "js/common-80db108453.js"
+}
diff --git a/resources/assets/icons/gitlab.svg b/resources/assets/icons/gitlab.svg