summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2015-07-22 10:12:28 -0400
committerJoramWilander <jwawilander@gmail.com>2015-07-22 10:12:28 -0400
commit62c0603c50c7cc85003fb03ed55d1a585c32dc34 (patch)
treec5f230f7ba2d61da9a50eeafe88a7b5530025f8d /config
parent03528b9619747b8bd184b852497dcf14ee1e0081 (diff)
downloadchat-62c0603c50c7cc85003fb03ed55d1a585c32dc34.tar.gz
chat-62c0603c50c7cc85003fb03ed55d1a585c32dc34.tar.bz2
chat-62c0603c50c7cc85003fb03ed55d1a585c32dc34.zip
merged with new team domain changes and added signup/login links for gitlab
Diffstat (limited to 'config')
-rw-r--r--config/config.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/config.json b/config/config.json
index f92b873d1..84e675a72 100644
--- a/config/config.json
+++ b/config/config.json
@@ -26,8 +26,8 @@
"SSOSettings": {
"gitlab": {
"Allow": true,
- "Secret" : "8526ada64f38a1a67cafe6650d54310f1484f8a5d06ad23abb9f8e4b8af1c429",
- "Id": "0af4138195d246d5d4e958a93100379066bb087fa9892cd323b0c97bbd696008",
+ "Secret" : "0495d3d6e528d91ba46605622a3645a8409ac5971ee287b1c3a6519fe27e6f6a",
+ "Id": "87a4aeb746c67e87a54df78f6eccf85229dd30a3a797bfdb423b82ba4e749cd0",
"AuthEndpoint": "http://dockerhost:8080/oauth/authorize",
"TokenEndpoint": "http://dockerhost:8080/oauth/token",
"UserApiEndpoint": "http://dockerhost:8080/api/v3/user"