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

This commit is contained in:
Dan Brown
2018-02-04 17:51:30 +00:00
7 changed files with 57 additions and 5 deletions

View File

@@ -50,6 +50,10 @@ OKTA_BASE_URL=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 @@ MAIL_HOST=localhost
MAIL_PORT=1025
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
MAIL_ENCRYPTION=null