mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 16:40:24 +08:00 
			
		
		
		
	Merge branch 'master' of github.com:gogits/gogs
Conflicts: modules/base/conf.go
This commit is contained in:
		@@ -342,7 +342,6 @@ func NewConfigContext() {
 | 
				
			|||||||
	LogInRememberDays = Cfg.MustInt("security", "LOGIN_REMEMBER_DAYS")
 | 
						LogInRememberDays = Cfg.MustInt("security", "LOGIN_REMEMBER_DAYS")
 | 
				
			||||||
	CookieUserName = Cfg.MustValue("security", "COOKIE_USERNAME")
 | 
						CookieUserName = Cfg.MustValue("security", "COOKIE_USERNAME")
 | 
				
			||||||
	CookieRememberName = Cfg.MustValue("security", "COOKIE_REMEMBER_NAME")
 | 
						CookieRememberName = Cfg.MustValue("security", "COOKIE_REMEMBER_NAME")
 | 
				
			||||||
 | 
					 | 
				
			||||||
	PictureService = Cfg.MustValue("picture", "SERVICE")
 | 
						PictureService = Cfg.MustValue("picture", "SERVICE")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// Determine and create root git reposiroty path.
 | 
						// Determine and create root git reposiroty path.
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user