From 194bb0f042c6b6d94c810520ffdafb86f90aa254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jozef=20Balu=CC=81n?= <jozef.balun@pixwell.sk>
Date: Thu, 1 Feb 2018 18:26:19 +0100
Subject: [PATCH] add missing icon, fix name conventions

---
 .env.example                      |  6 +++---
 config/services.php               | 10 +++++-----
 resources/assets/icons/gitlab.svg |  1 +
 3 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 resources/assets/icons/gitlab.svg

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 @@
+<svg viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;"><g id="Group"><path id="Fill-4" d="M32.134,64.345l11.785,-39.372l-23.569,0l11.784,39.372Z" style="fill:#e24329;"/><path id="Fill-8" d="M32.134,64.345l-11.784,-39.372l-16.515,0l28.299,39.372Z" style="fill:#fc6d26;"/><path id="Fill-12" d="M3.835,24.973l-3.581,11.965c-0.327,1.091 0.031,2.287 0.886,2.961l30.994,24.446l-28.299,-39.372Z" style="fill:#fca326;"/><path id="Fill-16" d="M3.835,24.973l16.515,0l-7.097,-23.713c-0.366,-1.22 -1.956,-1.22 -2.321,0l-7.097,23.713Z" style="fill:#e24329;"/><path id="Fill-18" d="M32.134,64.345l11.785,-39.372l16.515,0l-28.3,39.372Z" style="fill:#fc6d26;"/><path id="Fill-20" d="M60.434,24.973l3.581,11.965c0.326,1.091 -0.031,2.287 -0.886,2.961l-30.995,24.446l28.3,-39.372Z" style="fill:#fca326;"/><path id="Fill-22" d="M60.434,24.973l-16.515,0l7.097,-23.713c0.365,-1.22 1.955,-1.22 2.32,0l7.098,23.713Z" style="fill:#e24329;"/></g></svg>