diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2019-07-17 09:04:37 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-17 09:04:37 +0800 |
| commit | ce087c58efc16e36ba5786c3396c44e123461b37 (patch) | |
| tree | c293572f83bce0468c68bae613aa2a1bb0f76a58 | |
| parent | 2771619acfd8a690c610363b12dd5b8e12f62e12 (diff) | |
| download | gitea-ce087c58efc16e36ba5786c3396c44e123461b37.tar.gz gitea-ce087c58efc16e36ba5786c3396c44e123461b37.zip | |
Remove settting dependency on modules/session (#7237)
* remove settting dependency on modules/session
* fix fmt
* fix tests
* fix lint
| -rw-r--r-- | modules/setting/cache.go | 3 | ||||
| -rw-r--r-- | modules/setting/session.go | 2 | ||||
| -rw-r--r-- | modules/setting/setting.go | 8 | ||||
| -rw-r--r-- | routers/routes/routes.go | 3 |
4 files changed, 6 insertions, 10 deletions
diff --git a/modules/setting/cache.go b/modules/setting/cache.go index babb62baea..1f79404e00 100644 --- a/modules/setting/cache.go +++ b/modules/setting/cache.go @@ -9,6 +9,9 @@ import ( "time" "code.gitea.io/gitea/modules/log" + + _ "github.com/go-macaron/cache/memcache" // memcache plugin for cache + _ "github.com/go-macaron/cache/redis" ) // Cache represents cache settings diff --git a/modules/setting/session.go b/modules/setting/session.go index 7009576ccb..bed3a9d8c0 100644 --- a/modules/setting/session.go +++ b/modules/setting/session.go @@ -11,8 +11,6 @@ import ( "strings" "code.gitea.io/gitea/modules/log" - // This ensures that VirtualSessionProvider is available - _ "code.gitea.io/gitea/modules/session" "github.com/go-macaron/session" ) diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 6a5c5a36d7..97bdc03cc9 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -29,14 +29,6 @@ import ( "github.com/Unknwon/cae/zip" "github.com/Unknwon/com" - _ "github.com/go-macaron/cache/memcache" // memcache plugin for cache - _ "github.com/go-macaron/cache/redis" - _ "github.com/go-macaron/session/couchbase" // couchbase plugin for session store - _ "github.com/go-macaron/session/memcache" // memcache plugin for session store - _ "github.com/go-macaron/session/mysql" // mysql plugin for session store - _ "github.com/go-macaron/session/nodb" // nodb plugin for session store - _ "github.com/go-macaron/session/postgres" // postgres plugin for session store - _ "github.com/go-macaron/session/redis" // redis plugin for store session shellquote "github.com/kballard/go-shellquote" version "github.com/mcuadros/go-version" ini "gopkg.in/ini.v1" diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 196420dfe4..6169aa563c 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -35,6 +35,9 @@ import ( "code.gitea.io/gitea/routers/user" userSetting "code.gitea.io/gitea/routers/user/setting" + // to registers all internal adapters + _ "code.gitea.io/gitea/modules/session" + "github.com/go-macaron/binding" "github.com/go-macaron/cache" "github.com/go-macaron/captcha" |