summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslene <vslene@gmail.com>2014-03-25 00:00:00 +0800
committerslene <vslene@gmail.com>2014-03-25 00:00:00 +0800
commit6302f5462890b455cb306fc3925c71850a6e1dfb (patch)
treecc4b37e28c09d6faacdb69930bd7ee06ba16376e
parent52959c988c5613dfa0473f3d56442f46b98a665c (diff)
parentd2ceb001d0373b0ab3aab76a53497afb6b56650a (diff)
downloadgitea-6302f5462890b455cb306fc3925c71850a6e1dfb.tar.gz
gitea-6302f5462890b455cb306fc3925c71850a6e1dfb.zip
Merge branch 'master' of github.com:gogits/gogs
-rw-r--r--README.md1
-rw-r--r--README_ZH.md1
-rw-r--r--models/repo.go2
-rw-r--r--modules/base/conf.go4
-rw-r--r--serve.go2
-rw-r--r--web.go2
6 files changed, 7 insertions, 5 deletions
diff --git a/README.md b/README.md
index 104b7eab55..a39a92a322 100644
--- a/README.md
+++ b/README.md
@@ -53,6 +53,7 @@ There are two ways to install Gogs:
- Mail Service, modules design is inspired by [WeTalk](https://github.com/beego/wetalk).
- System Monitor Status is inspired by [GoBlog](https://github.com/fuxiaohei/goblog).
- Usage and modification from [beego](http://beego.me) modules.
+- Thanks [gobuild.io](http://gobuild.io) for providing binary compile and download service.
## Contributors
diff --git a/README_ZH.md b/README_ZH.md
index 838e30a0ef..440f952f86 100644
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -49,6 +49,7 @@ Gogs 完全使用 Go 语言来实现对 Git 数据的操作,实现 **零** 依
- 基于 [GoBlog](https://github.com/fuxiaohei/goblog) 修改的系统监视状态。
- [beego](http://beego.me) 模块的使用与修改。
- [martini](http://martini.codegangsta.io/) 的路由与中间件机制。
+- 感谢 [gobuild.io](http://gobuild.io) 提供二进制编译与下载服务。
## 贡献成员
diff --git a/models/repo.go b/models/repo.go
index 6cbfaf1059..d5f9be72ac 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -109,7 +109,7 @@ func IsRepositoryExist(user *User, repoName string) (bool, error) {
var (
// Define as all lower case!!
- illegalPatterns = []string{"[.][Gg][Ii][Tt]", "user", "help", "stars", "issues", "pulls", "commits", "admin", "repo", "template", "admin"}
+ illegalPatterns = []string{"[.][Gg][Ii][Tt]", "raw", "user", "help", "stars", "issues", "pulls", "commits", "admin", "repo", "template", "admin"}
)
// IsLegalName returns false if name contains illegal characters.
diff --git a/modules/base/conf.go b/modules/base/conf.go
index b4e0de97bd..d3122a5339 100644
--- a/modules/base/conf.go
+++ b/modules/base/conf.go
@@ -100,7 +100,7 @@ func newService() {
Service.EnableCacheAvatar = Cfg.MustBool("service", "ENABLE_CACHE_AVATAR", false)
}
-func NewLogService() {
+func newLogService() {
// Get and check log mode.
LogMode = Cfg.MustValue("log", "MODE", "console")
modeSec := "log." + LogMode
@@ -296,7 +296,7 @@ func NewConfigContext() {
func NewServices() {
newService()
- NewLogService()
+ newLogService()
newCacheService()
newSessionService()
newMailService()
diff --git a/serve.go b/serve.go
index 06815b65df..c3eb233c76 100644
--- a/serve.go
+++ b/serve.go
@@ -45,6 +45,7 @@ gogs serv provide access auth for repositories`,
}
func init() {
+ os.MkdirAll("log", os.ModePerm)
log.NewLogger(10000, "file", fmt.Sprintf(`{"filename":"%s"}`, "log/serv.log"))
}
@@ -72,7 +73,6 @@ func runServ(k *cli.Context) {
base.NewConfigContext()
models.LoadModelsConfig()
models.NewEngine()
- base.NewLogService()
keys := strings.Split(os.Args[2], "-")
if len(keys) != 2 {
diff --git a/web.go b/web.go
index e4c8eb5536..0747f224b7 100644
--- a/web.go
+++ b/web.go
@@ -89,7 +89,7 @@ func runWeb(*cli.Context) {
reqSignOut := middleware.Toggle(&middleware.ToggleOptions{SignOutRequire: true})
// Routers.
- m.Get("/", reqSignIn, routers.Home)
+ m.Get("/", ignSignIn, routers.Home)
m.Get("/issues", reqSignIn, user.Issues)
m.Get("/pulls", reqSignIn, user.Pulls)
m.Get("/stars", reqSignIn, user.Stars)