summaryrefslogtreecommitdiffstats
path: root/docker/local
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-08-28 07:33:01 -0700
committerCorey Hulen <corey@hulen.com>2015-08-28 07:33:01 -0700
commitbdf53884f567a46216fc1b8f3462fd15ab53ae92 (patch)
treeb747f0911f5e540d6f00354ab72f2e10ef0a9905 /docker/local
parent604166068ea8cd881a1c0a513cea3f992e9a65ea (diff)
parent4ea9635b502ed41f541ae27713f7736fdeda0ce7 (diff)
downloadchat-bdf53884f567a46216fc1b8f3462fd15ab53ae92.tar.gz
chat-bdf53884f567a46216fc1b8f3462fd15ab53ae92.tar.bz2
chat-bdf53884f567a46216fc1b8f3462fd15ab53ae92.zip
Merge pull request #514 from mattermost/mm-2039
MM-2039 Remove Google as a SSO service.
Diffstat (limited to 'docker/local')
-rw-r--r--docker/local/config_docker.json9
1 files changed, 0 insertions, 9 deletions
diff --git a/docker/local/config_docker.json b/docker/local/config_docker.json
index f566cea61..fdcb938b9 100644
--- a/docker/local/config_docker.json
+++ b/docker/local/config_docker.json
@@ -34,15 +34,6 @@
"AuthEndpoint": "",
"TokenEndpoint": "",
"UserApiEndpoint": ""
- },
- "google": {
- "Allow": false,
- "Secret": "",
- "Id": "",
- "Scope": "email profile",
- "AuthEndpoint": "https://accounts.google.com/o/oauth2/auth",
- "TokenEndpoint": "https://www.googleapis.com/oauth2/v3/token",
- "UserApiEndpoint": "https://www.googleapis.com/plus/v1/people/me"
}
},
"SqlSettings": {