Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	app/Locale/de_DE/translations.php

1 files changed, 0 insertions, 23 deletions

diff --git a/app/User/GitlabUserProvider.php b/app/User/GitlabUserProvider.php
deleted file mode 100644
index a73472c8..00000000
--- a/app/User/GitlabUserProvider.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace Kanboard\User;
-
-/**
- * Gitlab OAuth User Provider
- *
- * @package  user
- * @author   Frederic Guillot
- */
-class GitlabUserProvider extends OAuthUserProvider
-{
-    /**
-     * Get external id column name
-     *
-     * @access public
-     * @return string
-     */
-    public function getExternalIdColumn()
-    {
-        return 'gitlab_id';
-    }
-}