summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.travis.yml11
-rw-r--r--Makefile5
-rw-r--r--config/config.json2
-rw-r--r--doc/README.md2
-rw-r--r--doc/developer/code-contribution.md7
-rw-r--r--docker/0.6/config_docker.json6
-rw-r--r--docker/0.7/config_docker.json6
-rw-r--r--docker/dev/config_docker.json6
-rw-r--r--store/sql_store.go4
-rw-r--r--web/react/components/new_channel_modal.jsx2
-rw-r--r--web/react/utils/text_formatting.jsx2
11 files changed, 39 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml
index 877977dd4..02e1234d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,10 @@
language: go
go:
- 1.4.2
+- 1.5.1
+env:
+- TRAVIS_DB=mysql
+- TRAVIS_DB=postgres
before_install:
- gem install compass
- sudo apt-get update -qq
@@ -24,6 +28,9 @@ before_script:
- mysql -e "CREATE DATABASE IF NOT EXISTS mattermost_test ;" -uroot
- mysql -e "CREATE USER 'mmuser'@'%' IDENTIFIED BY 'mostest' ;" -uroot
- mysql -e "GRANT ALL ON mattermost_test.* TO 'mmuser'@'%' ;" -uroot
+- psql -c "create database mattermost_test ;" -U postgres
+- psql -c "create user mmuser with password 'mostest' ;" -U postgres
+- psql -c 'grant all privileges on database "mattermost_test" to mmuser ;' -U postgres
services:
- redis-server
addons:
@@ -38,6 +45,8 @@ deploy:
on:
repo: mattermost/platform
tags: true
+ go: 1.4.2
+ condition: $TRAVIS_DB = mysql
- provider: s3
access_key_id: AKIAJCO3KJYEGWJIKDIQ
@@ -52,3 +61,5 @@ deploy:
on:
repo: mattermost/platform
branch: master
+ go: 1.4.2
+ condition: $TRAVIS_DB = mysql
diff --git a/Makefile b/Makefile
index eb9f69e49..4459da9dd 100644
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,11 @@ all: travis
travis:
@echo building for travis
+ if [ "$(TRAVIS_DB)" = "postgres" ]; then \
+ sed -i'.bak' 's|mysql|postgres|g' config/config.json; \
+ sed -i'.bak' 's|mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8|postgres://mmuser:mostest@dockerhost:5432/mattermost_test?sslmode=disable\&connect_timeout=10|g' config/config.json; \
+ fi
+
rm -Rf $(DIST_ROOT)
@$(GO) clean $(GOFLAGS) -i ./...
diff --git a/config/config.json b/config/config.json
index f0b859fad..3ef2c317b 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",
"Shards": {
diff --git a/doc/README.md b/doc/README.md
index 491c75b9b..6bf96492a 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -11,7 +11,7 @@
- [Software and Hardware Requirements](install/requirements.md)
- [Local Machine Setup ](install/single-container-install.md)
- [AWS Elastic Beanstalk Setup](install/aws-ebs-setup.md)
-- [Developer Machine Setup](doc/install/dev-setup.md)
+- [Developer Machine Setup](install/dev-setup.md)
### Configuration
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 <branch name>
## 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.
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 bc42951b8..aceeb95b4 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",
@@ -66,8 +66,8 @@
"SMTPUsername": "",
"SMTPPassword": "",
"SMTPServer": "",
- "UseTLS": false,
- "UseStartTLS": false,
+ "UseTLS": false,
+ "UseStartTLS": false,
"FeedbackEmail": "",
"FeedbackName": "",
"ApplePushServer": "",
diff --git a/store/sql_store.go b/store/sql_store.go
index 3c41cb1fc..2f7ac2805 100644
--- a/store/sql_store.go
+++ b/store/sql_store.go
@@ -229,6 +229,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())
diff --git a/web/react/components/new_channel_modal.jsx b/web/react/components/new_channel_modal.jsx
index f3fb8da2a..fc7b8c183 100644
--- a/web/react/components/new_channel_modal.jsx
+++ b/web/react/components/new_channel_modal.jsx
@@ -150,7 +150,7 @@ export default class NewChannelModal extends React.Component {
tabIndex='2'
/>
<p className='input__help'>
- {'The purpose of your channel. To help others decide whether to join.'}
+ {'This is the purpose of your channel and helps others decide whether to join.'}
</p>
{serverError}
</div>
diff --git a/web/react/utils/text_formatting.jsx b/web/react/utils/text_formatting.jsx
index 2025e16da..54d010dbf 100644
--- a/web/react/utils/text_formatting.jsx
+++ b/web/react/utils/text_formatting.jsx
@@ -56,7 +56,7 @@ function autolinkUrls(text, tokens) {
const linkText = match.getMatchedText();
let url = linkText;
- if (!url.lastIndexOf('http', 0) === 0) {
+ if (url.lastIndexOf('http', 0) !== 0) {
url = `http://${linkText}`;
}
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-08 06:04:08 +0000