]> BookStack Code Mirror - bookstack/commitdiff
Merge branch 'support_for_gitlub_auth' of git://github.com/pixwell-dev/BookStack...
authorDan Brown <redacted>
Sun, 4 Feb 2018 17:51:30 +0000 (17:51 +0000)
committerDan Brown <redacted>
Sun, 4 Feb 2018 17:51:30 +0000 (17:51 +0000)
1  2 
.env.example

diff --combined .env.example
index d0a1dbb2638a534dce14042629f7e1d815538384,a5184a789a6c06c43a3150a9465e52e22900845c..110b365004842c2ae221ce372f5ac1e2c83ba672
@@@ -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
  
@@@ -67,4 -71,4 +71,4 @@@ MAIL_HOST=localhos
  MAIL_PORT=1025
  MAIL_USERNAME=null
  MAIL_PASSWORD=null
- MAIL_ENCRYPTION=null
+ MAIL_ENCRYPTION=null