Remove settting dependency on modules/session (#7237)
* remove settting dependency on modules/session * fix fmt * fix tests * fix lint
This commit is contained in:
		
							parent
							
								
									2771619acf
								
							
						
					
					
						commit
						ce087c58ef
					
				
					 4 changed files with 6 additions and 10 deletions
				
			
		| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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"
 | 
			
		||||
)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue