summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUnknwon <joe2010xtmf@163.com>2015-01-17 15:17:53 +0800
committerUnknwon <joe2010xtmf@163.com>2015-01-17 15:17:53 +0800
commit7170011f4d93a50e73cf90232395484b70a3dbb3 (patch)
treed9b44fbf3abe8fa958c189e677ced20188ed5374
parentbdd6aef746230c391eec43724335c453235de5c0 (diff)
downloadgitea-7170011f4d93a50e73cf90232395484b70a3dbb3.tar.gz
gitea-7170011f4d93a50e73cf90232395484b70a3dbb3.zip
update with deps
-rw-r--r--cmd/web.go6
-rw-r--r--conf/app.ini4
2 files changed, 5 insertions, 5 deletions
diff --git a/cmd/web.go b/cmd/web.go
index 9155958310..241abf2c9c 100644
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -75,12 +75,12 @@ func checkVersion() {
// Check dependency version.
checkers := []VerChecker{
- {"github.com/Unknwon/macaron", macaron.Version, "0.4.9"},
+ {"github.com/Unknwon/macaron", macaron.Version, "0.5.0"},
{"github.com/macaron-contrib/binding", binding.Version, "0.0.4"},
- {"github.com/macaron-contrib/cache", cache.Version, "0.0.5"},
+ {"github.com/macaron-contrib/cache", cache.Version, "0.0.7"},
{"github.com/macaron-contrib/csrf", csrf.Version, "0.0.1"},
{"github.com/macaron-contrib/i18n", i18n.Version, "0.0.5"},
- {"github.com/macaron-contrib/session", session.Version, "0.1.4"},
+ {"github.com/macaron-contrib/session", session.Version, "0.1.6"},
{"gopkg.in/ini.v1", ini.Version, "1.0.1"},
}
for _, c := range checkers {
diff --git a/conf/app.ini b/conf/app.ini
index c191d105cd..99d57d6413 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -148,7 +148,7 @@ ADAPTER = memory
; For "memory" only, GC interval in seconds, default is 60
INTERVAL = 60
; For "redis" and "memcache", connection host address
-; redis: `:6039`
+; redis: network=tcp,addr=:6379,password=macaron,db=0,pool_size=100,idle_timeout=180
; memcache: `127.0.0.1:11211`
HOST =
@@ -158,7 +158,7 @@ PROVIDER = memory
; Provider config options
; memory: not have any config yet
; file: session file path, e.g. `data/sessions`
-; redis: config like redis server addr, poolSize, password, e.g. `127.0.0.1:6379,100,gogs`
+; redis: network=tcp,addr=:6379,password=macaron,db=0,pool_size=100,idle_timeout=180
; mysql: go-sql-driver/mysql dsn config string, e.g. `root:password@/session_table`
PROVIDER_CONFIG = data/sessions
; Session cookie name