diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-07-23 09:22:17 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-07-23 09:22:17 -0800 |
| commit | 8d9449c068902f51a97e7a6605cd226bf4a26f2e (patch) | |
| tree | eade41f7f9138de4f156016af9476486c227abec /config | |
| parent | c277a98b5d88c81df39f8e33ef1286f72ac04014 (diff) | |
| parent | a9d48ff994cd2d03f8e1b2438e50fc6dd0d9bdc2 (diff) | |
| download | chat-8d9449c068902f51a97e7a6605cd226bf4a26f2e.tar.gz chat-8d9449c068902f51a97e7a6605cd226bf4a26f2e.tar.bz2 chat-8d9449c068902f51a97e7a6605cd226bf4a26f2e.zip | |
Merge branch 'master' into mm-1420
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.json | 10 | ||||
| -rw-r--r-- | config/config_docker.json | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/config/config.json b/config/config.json index 085dd6de6..591e38422 100644 --- a/config/config.json +++ b/config/config.json @@ -23,6 +23,16 @@ "UseLocalStorage": true, "StorageDirectory": "./data/" }, + "SSOSettings": { + "gitlab": { + "Allow": false, + "Secret" : "", + "Id": "", + "AuthEndpoint": "", + "TokenEndpoint": "", + "UserApiEndpoint": "" + } + }, "SqlSettings": { "DriverName": "mysql", "DataSource": "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test", diff --git a/config/config_docker.json b/config/config_docker.json index 062cdef65..a9ed98f1a 100644 --- a/config/config_docker.json +++ b/config/config_docker.json @@ -23,6 +23,16 @@ "UseLocalStorage": true, "StorageDirectory": "/mattermost/data/" }, + "SSOSettings": { + "gitlab": { + "Allow": false, + "Secret" : "", + "Id": "", + "AuthEndpoint": "", + "TokenEndpoint": "", + "UserApiEndpoint": "" + } + }, "SqlSettings": { "DriverName": "mysql", "DataSource": "mmuser:mostest@tcp(localhost:3306)/mattermost_test", |