Browse Source

Merge branch 'develop' of github.com:gogits/gogs into develop

pull/1814/head
Unknwon 9 years ago
parent
commit
eac91a74d8
  1. 2
      .gopmfile
  2. 2
      modules/setting/setting_memcache.go
  3. 4
      modules/setting/setting_redis.go

2
.gopmfile

@ -24,6 +24,8 @@ github.com/go-macaron/i18n =
github.com/go-macaron/session = github.com/go-macaron/session =
github.com/go-macaron/toolbox = github.com/go-macaron/toolbox =
github.com/klauspost/compress = github.com/klauspost/compress =
github.com/klauspost/crc32 =
github.com/klauspost/cpuid =
github.com/mattn/go-sqlite3 = commit:b808f01f66 github.com/mattn/go-sqlite3 = commit:b808f01f66
github.com/mcuadros/go-version = commit:d52711f8d6 github.com/mcuadros/go-version = commit:d52711f8d6
github.com/microcosm-cc/bluemonday = commit:85ba47ef2c github.com/microcosm-cc/bluemonday = commit:85ba47ef2c

2
modules/setting/setting_memcache.go

@ -7,7 +7,7 @@
package setting package setting
import ( import (
_ "github.com/macaron-contrib/cache/memcache" _ "github.com/go-macaron/cache/memcache"
) )
func init() { func init() {

4
modules/setting/setting_redis.go

@ -7,8 +7,8 @@
package setting package setting
import ( import (
_ "github.com/macaron-contrib/cache/redis" _ "github.com/go-macaron/cache/redis"
_ "github.com/macaron-contrib/session/redis" _ "github.com/go-macaron/session/redis"
) )
func init() { func init() {

Loading…
Cancel
Save