From fda314f27fe43dfbd17397f21c706213ee4296e3 Mon Sep 17 00:00:00 2001 From: Chengwei Yang Date: Sun, 13 Sep 2015 07:54:19 +0800 Subject: Fix coding style: replace tab with whitespace in mattermost config Signed-off-by: Chengwei Yang --- config/config.json | 2 +- docker/0.6/config_docker.json | 6 +++--- docker/0.7/config_docker.json | 6 +++--- docker/dev/config_docker.json | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/config/config.json b/config/config.json index cd7e221e7..3dc386ce0 100644 --- a/config/config.json +++ b/config/config.json @@ -10,7 +10,7 @@ "ServiceSettings": { "SiteName": "Mattermost", "Mode" : "dev", - "AllowTesting" : false, + "AllowTesting" : false, "UseSSL": false, "Port": "8065", "Version": "developer", diff --git a/docker/0.6/config_docker.json b/docker/0.6/config_docker.json index 157120b99..b1c72c4bd 100644 --- a/docker/0.6/config_docker.json +++ b/docker/0.6/config_docker.json @@ -10,7 +10,7 @@ "ServiceSettings": { "SiteName": "Mattermost", "Mode" : "dev", - "AllowTesting" : false, + "AllowTesting" : false, "UseSSL": false, "Port": "80", "Version": "developer", @@ -63,8 +63,8 @@ "SMTPUsername": "", "SMTPPassword": "", "SMTPServer": "", - "UseTLS": false, - "UseStartTLS": false, + "UseTLS": false, + "UseStartTLS": false, "FeedbackEmail": "", "FeedbackName": "", "ApplePushServer": "", diff --git a/docker/0.7/config_docker.json b/docker/0.7/config_docker.json index 794ac95ae..cbac2ea69 100644 --- a/docker/0.7/config_docker.json +++ b/docker/0.7/config_docker.json @@ -10,7 +10,7 @@ "ServiceSettings": { "SiteName": "Mattermost", "Mode" : "dev", - "AllowTesting" : true, + "AllowTesting" : true, "UseSSL": false, "Port": "80", "Version": "developer", @@ -65,8 +65,8 @@ "SMTPUsername": "", "SMTPPassword": "", "SMTPServer": "", - "UseTLS": false, - "UseStartTLS": false, + "UseTLS": false, + "UseStartTLS": false, "FeedbackEmail": "", "FeedbackName": "", "ApplePushServer": "", diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json index 794ac95ae..cbac2ea69 100644 --- a/docker/dev/config_docker.json +++ b/docker/dev/config_docker.json @@ -10,7 +10,7 @@ "ServiceSettings": { "SiteName": "Mattermost", "Mode" : "dev", - "AllowTesting" : true, + "AllowTesting" : true, "UseSSL": false, "Port": "80", "Version": "developer", @@ -65,8 +65,8 @@ "SMTPUsername": "", "SMTPPassword": "", "SMTPServer": "", - "UseTLS": false, - "UseStartTLS": false, + "UseTLS": false, + "UseStartTLS": false, "FeedbackEmail": "", "FeedbackName": "", "ApplePushServer": "", -- cgit v1.2.3-1-g7c22 From 432753bb4de04a66a15027356017fdb1dcc626fa Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Fri, 18 Sep 2015 08:07:31 -0400 Subject: Return false when checking if column exists, if the table does not exist with postgres. --- store/sql_store.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/store/sql_store.go b/store/sql_store.go index c0b3c2021..cf6fae6d4 100644 --- a/store/sql_store.go +++ b/store/sql_store.go @@ -144,6 +144,10 @@ func (ss SqlStore) DoesColumnExist(tableName string, columnName string) bool { ) if err != nil { + if err.Error() == "pq: relation \""+strings.ToLower(tableName)+"\" does not exist" { + return false + } + l4g.Critical("Failed to check if column exists %v", err) time.Sleep(time.Second) panic("Failed to check if column exists " + err.Error()) -- cgit v1.2.3-1-g7c22 From 5583907b5b96b73819d836e937a5fd969fd19f59 Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 18 Sep 2015 05:55:02 -0700 Subject: Adding template for contributor list request --- doc/developer/code-contribution.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/developer/code-contribution.md b/doc/developer/code-contribution.md index c796a82a5..e9b088beb 100644 --- a/doc/developer/code-contribution.md +++ b/doc/developer/code-contribution.md @@ -31,7 +31,12 @@ git checkout -b ## Submitting a Pull Request -1. Please add yourself to the contributor list prior to submitting by completing the [contributor license agreement](http://www.mattermost.org/mattermost-contributor-agreement/). +1. Please add yourself to the Mattermost [approved contributor list](https://docs.google.com/spreadsheets/d/1NTCeG-iL_VS9bFqtmHSfwETo5f-8MQ7oMDE5IUYJi_Y/pubhtml?gid=0&single=true) prior to submitting by completing the [contributor license agreement](http://www.mattermost.org/mattermost-contributor-agreement/). + + For pull requests made by contributors not yet added to the approved contributor list, a reviewer may respond: + + ```Thanks @[username] for the pull request! Before we can review, we need to add you to the list of [approved contributors](https://docs.google.com/spreadsheets/d/1NTCeG-iL_VS9bFqtmHSfwETo5f-8MQ7oMDE5IUYJi_Y/pubhtml?gid=0&single=true). Please help complete the Mattermost [contribution license agreement](http://www.mattermost.org/mattermost-contributor-agreement/), which is a standard procedure for many open source projects. More information is in the above link. Please let us know if you have any questions. We are very happy to have you join our growing community!``` + 2. When you submit your pull request please include the Ticket ID at the beginning of your pull request comment, followed by a colon. -- cgit v1.2.3-1-g7c22