From: Dan Brown <redacted>
Date: Sun, 4 Feb 2018 17:51:30 +0000 (+0000)
Subject: Merge branch 'support_for_gitlub_auth' of git://github.com/pixwell-dev/BookStack... 
X-Git-Tag: v0.20.0~1^2~7^2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/9becc8055bc5371aff209c80b15ce8ad3e5cc5b4

Merge branch 'support_for_gitlub_auth' of git://github.com/pixwell-dev/BookStack into pixwell-dev-support_for_gitlub_auth
---

9becc8055bc5371aff209c80b15ce8ad3e5cc5b4
diff --cc .env.example
index d0a1dbb26,a5184a789..110b36500
--- a/.env.example
+++ b/.env.example
@@@ -47,9 -47,13 +47,13 @@@ GITHUB_APP_SECRET=fals
  GOOGLE_APP_ID=false
  GOOGLE_APP_SECRET=false
  OKTA_BASE_URL=false
 -OKTA_KEY=false
 -OKTA_SECRET=false
 +OKTA_APP_ID=false
 +OKTA_APP_SECRET=false
  
+ GITLAB_APP_ID=false
+ GITLAB_APP_SECRET=false
+ GITLAB_BASE_URI=false
+ 
  # External services such as Gravatar
  DISABLE_EXTERNAL_SERVICES=false