diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-09-16 16:26:56 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-09-16 16:26:56 -0400 |
| commit | b1f26540ce29cf4ff403cc7b65b20c891ca64118 (patch) | |
| tree | fd7a83ebb963dc5f0208dc4dba00aa2f730a364e /docker | |
| parent | 4e11fa23d750afbefad099638530b754776a3357 (diff) | |
| parent | 47e6a33a4505e13ba4edf37ff1f8fbdadb279ee3 (diff) | |
| download | chat-b1f26540ce29cf4ff403cc7b65b20c891ca64118.tar.gz chat-b1f26540ce29cf4ff403cc7b65b20c891ca64118.tar.bz2 chat-b1f26540ce29cf4ff403cc7b65b20c891ca64118.zip | |
Merge pull request #693 from mattermost/mm-1419
Implement OAuth2 service provider functionality.
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/dev/config_docker.json | 3 | ||||
| -rw-r--r-- | docker/local/config_docker.json | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json index 794ac95ae..bc42951b8 100644 --- a/docker/dev/config_docker.json +++ b/docker/dev/config_docker.json @@ -23,7 +23,8 @@ "UseLocalStorage": true, "StorageDirectory": "/mattermost/data/", "AllowedLoginAttempts": 10, - "DisableEmailSignUp": false + "DisableEmailSignUp": false, + "EnableOAuthServiceProvider": false }, "SSOSettings": { "gitlab": { diff --git a/docker/local/config_docker.json b/docker/local/config_docker.json index 794ac95ae..bc42951b8 100644 --- a/docker/local/config_docker.json +++ b/docker/local/config_docker.json @@ -23,7 +23,8 @@ "UseLocalStorage": true, "StorageDirectory": "/mattermost/data/", "AllowedLoginAttempts": 10, - "DisableEmailSignUp": false + "DisableEmailSignUp": false, + "EnableOAuthServiceProvider": false }, "SSOSettings": { "gitlab": { |