summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2015-07-31 11:05:06 +0800
committerUnknwon <u@gogs.io>2015-07-31 11:05:06 +0800
commit42a2c5ca54974fbf24c67e10a54224c987e0aeea (patch)
tree3582c98aabf4b8484b6fbf150d6aff47814c20c7
parent3ff708b7497555797aa07ddfe0c44fa9e71f392c (diff)
downloadgitea-42a2c5ca54974fbf24c67e10a54224c987e0aeea.tar.gz
gitea-42a2c5ca54974fbf24c67e10a54224c987e0aeea.zip
#1400 use new connstr format for postgres
-rw-r--r--.gopmfile6
-rw-r--r--gogs.go2
-rw-r--r--models/models.go2
-rw-r--r--templates/.VERSION2
4 files changed, 6 insertions, 6 deletions
diff --git a/.gopmfile b/.gopmfile
index 4b73dee62f..febc511718 100644
--- a/.gopmfile
+++ b/.gopmfile
@@ -10,11 +10,11 @@ github.com/Unknwon/macaron =
github.com/Unknwon/paginater =
github.com/codegangsta/cli = commit:2bcd11f863
github.com/go-sql-driver/mysql = commit:a197e5d405
-github.com/go-xorm/core = commit:be6e7ac47d
-github.com/go-xorm/xorm = commit:1f0dd9bef2
+github.com/go-xorm/core =
+github.com/go-xorm/xorm =
github.com/gogits/chardet = commit:2404f77725
github.com/gogits/go-gogs-client = commit:92e76d616a
-github.com/lib/pq = commit:30ed2200d7
+github.com/lib/pq =
github.com/macaron-contrib/binding =
github.com/macaron-contrib/cache = commit:928d5c35cd
github.com/macaron-contrib/captcha =
diff --git a/gogs.go b/gogs.go
index eb4c3a4f64..3b736cac85 100644
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting"
)
-const APP_VER = "0.6.3.0730 Beta"
+const APP_VER = "0.6.3.0731 Beta"
func init() {
runtime.GOMAXPROCS(runtime.NumCPU())
diff --git a/models/models.go b/models/models.go
index b7986fed11..44fd563135 100644
--- a/models/models.go
+++ b/models/models.go
@@ -105,7 +105,7 @@ func getEngine() (*xorm.Engine, error) {
if len(fields) > 1 && len(strings.TrimSpace(fields[1])) > 0 {
port = fields[1]
}
- cnnstr = fmt.Sprintf("user=%s password=%s host=%s port=%s dbname=%s sslmode=%s",
+ cnnstr = fmt.Sprintf("postgres://%s:%s@%s:%s/%s?sslmode=%s",
DbCfg.User, DbCfg.Passwd, host, port, DbCfg.Name, DbCfg.SSLMode)
case "sqlite3":
if !EnableSQLite3 {
diff --git a/templates/.VERSION b/templates/.VERSION
index c7d8ff766b..302c5cc492 100644
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.6.3.0730 Beta \ No newline at end of file
+0.6.3.0731 Beta \ No newline at end of file