From 105f97e61ce3d9f2bc8ce178d0ffcbf531bd91b3 Mon Sep 17 00:00:00 2001 From: slene Date: Sun, 30 Mar 2014 10:09:59 +0800 Subject: remove Context.IsValid & verify repo in middleware repo.go --- modules/middleware/context.go | 14 +++++++- modules/middleware/repo.go | 74 ++++++++++++++++++++++++++++++++++--------- 2 files changed, 72 insertions(+), 16 deletions(-) (limited to 'modules/middleware') diff --git a/modules/middleware/context.go b/modules/middleware/context.go index d81ab999..a6aa58ee 100644 --- a/modules/middleware/context.go +++ b/modules/middleware/context.go @@ -18,6 +18,7 @@ import ( "github.com/codegangsta/martini" "github.com/gogits/cache" + "github.com/gogits/git" "github.com/gogits/session" "github.com/gogits/gogs/models" @@ -41,11 +42,18 @@ type Context struct { csrfToken string Repo struct { - IsValid bool IsOwner bool IsWatching bool + IsBranch bool + IsTag bool + IsCommit bool Repository *models.Repository Owner *models.User + Commit *git.Commit + GitRepo *git.Repository + BranchName string + CommitId string + RepoLink string CloneLink struct { SSH string HTTPS string @@ -98,6 +106,10 @@ func (ctx *Context) Handle(status int, title string, err error) { ctx.HTML(status, fmt.Sprintf("status/%d", status)) } +func (ctx *Context) Debug(msg string, args ...interface{}) { + log.Debug(msg, args...) +} + func (ctx *Context) GetCookie(name string) string { cookie, err := ctx.Req.Cookie(name) if err != nil { diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go index 54b735af..d1b68b05 100644 --- a/modules/middleware/repo.go +++ b/modules/middleware/repo.go @@ -11,6 +11,8 @@ import ( "github.com/codegangsta/martini" + "github.com/gogits/git" + "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/base" ) @@ -25,8 +27,12 @@ func RepoAssignment(redirect bool) martini.Handler { err error ) + userName := params["username"] + repoName := params["reponame"] + branchName := params["branchname"] + // get repository owner - ctx.Repo.IsOwner = ctx.IsSigned && ctx.User.LowerName == strings.ToLower(params["username"]) + ctx.Repo.IsOwner = ctx.IsSigned && ctx.User.LowerName == strings.ToLower(userName) if !ctx.Repo.IsOwner { user, err = models.GetUserByName(params["username"]) @@ -51,10 +57,8 @@ func RepoAssignment(redirect bool) martini.Handler { return } - ctx.Repo.Owner = user - // get repository - repo, err := models.GetRepositoryByName(user.Id, params["reponame"]) + repo, err := models.GetRepositoryByName(user.Id, repoName) if err != nil { if err == models.ErrRepoNotExist { ctx.Handle(404, "RepoAssignment", err) @@ -62,29 +66,69 @@ func RepoAssignment(redirect bool) martini.Handler { ctx.Redirect("/") return } - ctx.Handle(200, "RepoAssignment", err) + ctx.Handle(404, "RepoAssignment", err) + return + } + ctx.Repo.Repository = repo + + gitRepo, err := git.OpenRepository(models.RepoPath(userName, repoName)) + if err != nil { + ctx.Handle(404, "RepoAssignment Invalid repo", err) return } + ctx.Repo.GitRepo = gitRepo + + detect: + if len(branchName) > 0 { + // TODO check tag + if models.IsBranchExist(user.Name, repoName, branchName) { + ctx.Repo.IsBranch = true + ctx.Repo.BranchName = branchName + + ctx.Repo.Commit, err = gitRepo.GetCommitOfBranch(branchName) + if err != nil { + ctx.Handle(404, "RepoAssignment invalid branch", nil) + return + } + + ctx.Repo.CommitId = ctx.Repo.Commit.Oid.String() + + } else if len(branchName) == 40 { + ctx.Repo.IsCommit = true + ctx.Repo.CommitId = branchName + ctx.Repo.BranchName = branchName + + ctx.Repo.Commit, err = gitRepo.GetCommit(branchName) + if err != nil { + ctx.Handle(404, "RepoAssignment invalid commit", nil) + return + } + } else { + ctx.Handle(404, "RepoAssignment invalid repo", nil) + return + } + + } else { + branchName = "master" + goto detect + } - ctx.Repo.IsValid = true - if ctx.User != nil { + if ctx.IsSigned { ctx.Repo.IsWatching = models.IsWatching(ctx.User.Id, repo.Id) } - ctx.Repo.Repository = repo + + ctx.Repo.Owner = user ctx.Repo.CloneLink.SSH = fmt.Sprintf("%s@%s:%s/%s.git", base.RunUser, base.Domain, user.LowerName, repo.LowerName) ctx.Repo.CloneLink.HTTPS = fmt.Sprintf("%s%s/%s.git", base.AppUrl, user.LowerName, repo.LowerName) + ctx.Repo.RepoLink = "/" + user.Name + "/" + repo.Name - if len(params["branchname"]) == 0 { - params["branchname"] = "master" - } - ctx.Data["Branchname"] = params["branchname"] - - ctx.Data["IsRepositoryValid"] = true + ctx.Data["BranchName"] = ctx.Repo.BranchName + ctx.Data["CommitId"] = ctx.Repo.CommitId ctx.Data["Repository"] = repo ctx.Data["Owner"] = user ctx.Data["Title"] = user.Name + "/" + repo.Name ctx.Data["CloneLink"] = ctx.Repo.CloneLink - ctx.Data["RepositoryLink"] = ctx.Data["Title"] + ctx.Data["RepoLink"] = ctx.Repo.RepoLink ctx.Data["IsRepositoryOwner"] = ctx.Repo.IsOwner ctx.Data["IsRepositoryWatching"] = ctx.Repo.IsWatching } -- cgit v1.2.3 From 578d981d7e196728dc0685f62a211383d4c808fa Mon Sep 17 00:00:00 2001 From: slene Date: Sun, 30 Mar 2014 11:38:41 +0800 Subject: display bare repo page --- modules/middleware/repo.go | 32 ++++++++++++-------- routers/repo/repo.go | 10 ------- templates/repo/single.tmpl | 4 --- templates/repo/single_bare.tmpl | 66 +++++++++++++++++++++++------------------ 4 files changed, 57 insertions(+), 55 deletions(-) (limited to 'modules/middleware') diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go index d1b68b05..deb28286 100644 --- a/modules/middleware/repo.go +++ b/modules/middleware/repo.go @@ -73,11 +73,30 @@ func RepoAssignment(redirect bool) martini.Handler { gitRepo, err := git.OpenRepository(models.RepoPath(userName, repoName)) if err != nil { - ctx.Handle(404, "RepoAssignment Invalid repo", err) + ctx.Handle(404, "RepoAssignment Invalid repo "+models.RepoPath(userName, repoName), err) return } ctx.Repo.GitRepo = gitRepo + ctx.Repo.Owner = user + ctx.Repo.RepoLink = "/" + user.Name + "/" + repo.Name + + ctx.Data["Title"] = user.Name + "/" + repo.Name + ctx.Data["Repository"] = repo + ctx.Data["Owner"] = user + ctx.Data["RepoLink"] = ctx.Repo.RepoLink + ctx.Data["IsRepositoryOwner"] = ctx.Repo.IsOwner + + ctx.Repo.CloneLink.SSH = fmt.Sprintf("%s@%s:%s/%s.git", base.RunUser, base.Domain, user.LowerName, repo.LowerName) + ctx.Repo.CloneLink.HTTPS = fmt.Sprintf("%s%s/%s.git", base.AppUrl, user.LowerName, repo.LowerName) + ctx.Data["CloneLink"] = ctx.Repo.CloneLink + + if repo.IsBare { + ctx.Data["IsBareRepo"] = true + ctx.HTML(200, "repo/single_bare") + return + } + detect: if len(branchName) > 0 { // TODO check tag @@ -117,19 +136,8 @@ func RepoAssignment(redirect bool) martini.Handler { ctx.Repo.IsWatching = models.IsWatching(ctx.User.Id, repo.Id) } - ctx.Repo.Owner = user - ctx.Repo.CloneLink.SSH = fmt.Sprintf("%s@%s:%s/%s.git", base.RunUser, base.Domain, user.LowerName, repo.LowerName) - ctx.Repo.CloneLink.HTTPS = fmt.Sprintf("%s%s/%s.git", base.AppUrl, user.LowerName, repo.LowerName) - ctx.Repo.RepoLink = "/" + user.Name + "/" + repo.Name - ctx.Data["BranchName"] = ctx.Repo.BranchName ctx.Data["CommitId"] = ctx.Repo.CommitId - ctx.Data["Repository"] = repo - ctx.Data["Owner"] = user - ctx.Data["Title"] = user.Name + "/" + repo.Name - ctx.Data["CloneLink"] = ctx.Repo.CloneLink - ctx.Data["RepoLink"] = ctx.Repo.RepoLink - ctx.Data["IsRepositoryOwner"] = ctx.Repo.IsOwner ctx.Data["IsRepositoryWatching"] = ctx.Repo.IsWatching } } diff --git a/routers/repo/repo.go b/routers/repo/repo.go index c9c9af1e..27c806a3 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -77,10 +77,6 @@ func Single(ctx *middleware.Context, params martini.Params) { if err != nil { ctx.Handle(404, "repo.Single(GetBranches)", err) return - } else if ctx.Repo.Repository.IsBare { - ctx.Data["IsBareRepo"] = true - ctx.HTML(200, "repo/single") - return } ctx.Data["Branches"] = brs @@ -264,12 +260,6 @@ func Setting(ctx *middleware.Context, params martini.Params) { ctx.Data["IsRepoToolbarSetting"] = true - if ctx.Repo.Repository.IsBare { - ctx.Data["IsBareRepo"] = true - ctx.HTML(200, "repo/setting") - return - } - var title string if t, ok := ctx.Data["Title"].(string); ok { title = t diff --git a/templates/repo/single.tmpl b/templates/repo/single.tmpl index abaa4e89..0bf7b0aa 100644 --- a/templates/repo/single.tmpl +++ b/templates/repo/single.tmpl @@ -4,9 +4,6 @@ {{template "repo/toolbar" .}}
- {{if .IsBareRepo}} - {{template "repo/single_bare" .}} - {{else}}
{{ $n := len .Treenames}} {{if not .IsFile}}{{end}} @@ -38,7 +35,6 @@ {{else}} {{template "repo/single_list" .}} {{end}} - {{end}}
{{template "base/footer" .}} diff --git a/templates/repo/single_bare.tmpl b/templates/repo/single_bare.tmpl index ed182ad2..fe0e3aa3 100644 --- a/templates/repo/single_bare.tmpl +++ b/templates/repo/single_bare.tmpl @@ -1,31 +1,39 @@ -
-
-

Quick Guide

-
-
-

Clone this repository

-
- - - - - - - - +{{template "base/head" .}} +{{template "base/navbar" .}} +{{template "repo/nav" .}} +
+
+
+
+

Quick Guide

+
+
+

Clone this repository

+
+ + + + + + + + +
+

We recommend every repository include a README, LICENSE, and .gitignore.

+
+

Create a new repository on the command line

+ 
touch README.md
+        git init
+        git add README.md
+        git commit -m "first commit"
+        git remote add origin 
+        git push -u origin master
+
+

Push an existing repository from the command line

+ 
git remote add origin 
+        git push -u origin master
+
-

We recommend every repository include a README, LICENSE, and .gitignore.

-
-

Create a new repository on the command line

- 
touch README.md
-git init
-git add README.md
-git commit -m "first commit"
-git remote add origin 
-git push -u origin master
-
-

Push an existing repository from the command line

- 
git remote add origin 
-git push -u origin master
-
\ No newline at end of file +
+{{template "base/footer" .}} -- cgit v1.2.3 From d6c9e3413a982fd64a74e774d4a2b8157f39f299 Mon Sep 17 00:00:00 2001 From: slene Date: Sun, 30 Mar 2014 13:30:17 +0800 Subject: fix display bare repo --- modules/middleware/repo.go | 88 ++++++++++++++++++++++++----------------- routers/repo/repo.go | 1 + templates/repo/single_bare.tmpl | 13 +++--- templates/repo/toolbar.tmpl | 2 +- web.go | 13 +++--- 5 files changed, 68 insertions(+), 49 deletions(-) (limited to 'modules/middleware') diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go index deb28286..559e90c0 100644 --- a/modules/middleware/repo.go +++ b/modules/middleware/repo.go @@ -17,10 +17,20 @@ import ( "github.com/gogits/gogs/modules/base" ) -func RepoAssignment(redirect bool) martini.Handler { +func RepoAssignment(redirect bool, args ...bool) martini.Handler { return func(ctx *Context, params martini.Params) { - // assign false first - ctx.Data["IsRepositoryValid"] = false + // valid brachname + var validBranch bool + // display bare quick start if it is a bare repo + var displayBare bool + + if len(args) >= 1 { + validBranch = args[0] + } + + if len(args) >= 2 { + displayBare = args[1] + } var ( user *models.User @@ -71,6 +81,8 @@ func RepoAssignment(redirect bool) martini.Handler { } ctx.Repo.Repository = repo + ctx.Data["IsBareRepo"] = ctx.Repo.Repository.IsBare + gitRepo, err := git.OpenRepository(models.RepoPath(userName, repoName)) if err != nil { ctx.Handle(404, "RepoAssignment Invalid repo "+models.RepoPath(userName, repoName), err) @@ -86,50 +98,54 @@ func RepoAssignment(redirect bool) martini.Handler { ctx.Data["Owner"] = user ctx.Data["RepoLink"] = ctx.Repo.RepoLink ctx.Data["IsRepositoryOwner"] = ctx.Repo.IsOwner + ctx.Data["BranchName"] = "" ctx.Repo.CloneLink.SSH = fmt.Sprintf("%s@%s:%s/%s.git", base.RunUser, base.Domain, user.LowerName, repo.LowerName) ctx.Repo.CloneLink.HTTPS = fmt.Sprintf("%s%s/%s.git", base.AppUrl, user.LowerName, repo.LowerName) ctx.Data["CloneLink"] = ctx.Repo.CloneLink - if repo.IsBare { - ctx.Data["IsBareRepo"] = true - ctx.HTML(200, "repo/single_bare") - return - } - - detect: - if len(branchName) > 0 { - // TODO check tag - if models.IsBranchExist(user.Name, repoName, branchName) { - ctx.Repo.IsBranch = true - ctx.Repo.BranchName = branchName - - ctx.Repo.Commit, err = gitRepo.GetCommitOfBranch(branchName) - if err != nil { - ctx.Handle(404, "RepoAssignment invalid branch", nil) + // when repo is bare, not valid branch + if !ctx.Repo.Repository.IsBare && validBranch { + detect: + if len(branchName) > 0 { + // TODO check tag + if models.IsBranchExist(user.Name, repoName, branchName) { + ctx.Repo.IsBranch = true + ctx.Repo.BranchName = branchName + + ctx.Repo.Commit, err = gitRepo.GetCommitOfBranch(branchName) + if err != nil { + ctx.Handle(404, "RepoAssignment invalid branch", nil) + return + } + + ctx.Repo.CommitId = ctx.Repo.Commit.Oid.String() + + } else if len(branchName) == 40 { + ctx.Repo.IsCommit = true + ctx.Repo.CommitId = branchName + ctx.Repo.BranchName = branchName + + ctx.Repo.Commit, err = gitRepo.GetCommit(branchName) + if err != nil { + ctx.Handle(404, "RepoAssignment invalid commit", nil) + return + } + } else { + ctx.Handle(404, "RepoAssignment invalid repo", nil) return } - ctx.Repo.CommitId = ctx.Repo.Commit.Oid.String() - - } else if len(branchName) == 40 { - ctx.Repo.IsCommit = true - ctx.Repo.CommitId = branchName - ctx.Repo.BranchName = branchName - - ctx.Repo.Commit, err = gitRepo.GetCommit(branchName) - if err != nil { - ctx.Handle(404, "RepoAssignment invalid commit", nil) - return - } } else { - ctx.Handle(404, "RepoAssignment invalid repo", nil) - return + branchName = "master" + goto detect } + } - } else { - branchName = "master" - goto detect + // repo is bare and display enable + if displayBare && ctx.Repo.Repository.IsBare { + ctx.HTML(200, "repo/single_bare") + return } if ctx.IsSigned { diff --git a/routers/repo/repo.go b/routers/repo/repo.go index 27c806a3..5b0a165d 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -78,6 +78,7 @@ func Single(ctx *middleware.Context, params martini.Params) { ctx.Handle(404, "repo.Single(GetBranches)", err) return } + ctx.Data["Branches"] = brs isViewBranch := ctx.Repo.IsBranch diff --git a/templates/repo/single_bare.tmpl b/templates/repo/single_bare.tmpl index fe0e3aa3..035e78e8 100644 --- a/templates/repo/single_bare.tmpl +++ b/templates/repo/single_bare.tmpl @@ -1,6 +1,7 @@ {{template "base/head" .}} {{template "base/navbar" .}} {{template "repo/nav" .}} +{{template "repo/toolbar" .}}
@@ -23,15 +24,15 @@

Create a new repository on the command line

touch README.md
-        git init
-        git add README.md
-        git commit -m "first commit"
-        git remote add origin 
-        git push -u origin master
+git init +git add README.md +git commit -m "first commit" +git remote add origin +git push -u origin master

Push an existing repository from the command line

git remote add origin 
-        git push -u origin master
+git push -u origin master
diff --git a/templates/repo/toolbar.tmpl b/templates/repo/toolbar.tmpl index 3c7c8a50..542f8fd8 100644 --- a/templates/repo/toolbar.tmpl +++ b/templates/repo/toolbar.tmpl @@ -3,7 +3,7 @@
-{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} -- cgit v1.2.3 From b1627672f9b45047976f498fe618995361e9ff35 Mon Sep 17 00:00:00 2001 From: slene Date: Sun, 30 Mar 2014 17:09:19 +0800 Subject: fix link --- modules/middleware/repo.go | 3 +++ templates/repo/single.tmpl | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'modules/middleware') diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go index 559e90c0..6912cd83 100644 --- a/modules/middleware/repo.go +++ b/modules/middleware/repo.go @@ -140,6 +140,9 @@ func RepoAssignment(redirect bool, args ...bool) martini.Handler { branchName = "master" goto detect } + + ctx.Data["IsBranch"] = ctx.Repo.IsBranch + ctx.Data["IsCommit"] = ctx.Repo.IsCommit } // repo is bare and display enable diff --git a/templates/repo/single.tmpl b/templates/repo/single.tmpl index 0bf7b0aa..7ee6b0ca 100644 --- a/templates/repo/single.tmpl +++ b/templates/repo/single.tmpl @@ -8,7 +8,7 @@ {{ $n := len .Treenames}} {{if not .IsFile}}{{end}}
- {{if .CommitId}}{{ShortSha .CommitId}}{{else}}{{.BranchName}}{{end}}   + {{if .IsBranch}}{{.BranchName}}{{else}}{{ShortSha .CommitId}}{{end}}  
    {{range .Branches}} -- cgit v1.2.3 From 3698431fc11f740ecc043822fba8af895fc12423 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 30 Mar 2014 11:58:21 -0400 Subject: Fix install bugs --- modules/middleware/auth.go | 5 +++++ routers/install.go | 14 ++++++++++++++ 2 files changed, 19 insertions(+) (limited to 'modules/middleware') diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go index 64f75d75..f50fde99 100644 --- a/modules/middleware/auth.go +++ b/modules/middleware/auth.go @@ -21,6 +21,11 @@ type ToggleOptions struct { func Toggle(options *ToggleOptions) martini.Handler { return func(ctx *Context) { + if !base.InstallLock { + ctx.Redirect("/install") + return + } + if options.SignOutRequire && ctx.IsSigned && ctx.Req.RequestURI != "/" { ctx.Redirect("/") return diff --git a/routers/install.go b/routers/install.go index 6f29badc..cca652f9 100644 --- a/routers/install.go +++ b/routers/install.go @@ -131,6 +131,17 @@ func Install(ctx *middleware.Context, form auth.InstallForm) { return } + // Check run user. + curUser := os.Getenv("USERNAME") + if len(curUser) == 0 { + curUser = os.Getenv("USER") + } + // Does not check run user when the install lock is off. + if form.RunUser != curUser { + ctx.RenderWithErr("Run user isn't the current user: "+form.RunUser+" -> "+curUser, "install", &form) + return + } + // Save settings. base.Cfg.SetValue("database", "DB_TYPE", models.DbCfg.Type) base.Cfg.SetValue("database", "HOST", models.DbCfg.Host) @@ -155,8 +166,11 @@ func Install(ctx *middleware.Context, form auth.InstallForm) { base.Cfg.SetValue("service", "ENABLE_NOTIFY_MAIL", base.ToStr(form.MailNotify == "on")) } + base.Cfg.SetValue("", "RUN_MODE", "prod") + base.Cfg.SetValue("security", "INSTALL_LOCK", "true") + os.MkdirAll("custom/conf", os.ModePerm) if err := goconfig.SaveConfigFile(base.Cfg, "custom/conf/app.ini"); err != nil { ctx.RenderWithErr("Fail to save configuration: "+err.Error(), "install", &form) return -- cgit v1.2.3 From d0e6a4c25acc3414f6d0f93cc50e6dcb41111c19 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 30 Mar 2014 12:11:28 -0400 Subject: Change new martini impot path --- modules/auth/admin.go | 2 +- modules/auth/auth.go | 2 +- modules/auth/issue.go | 2 +- modules/auth/repo.go | 2 +- modules/auth/setting.go | 2 +- modules/auth/user.go | 5 ++--- modules/middleware/auth.go | 2 +- modules/middleware/context.go | 2 +- modules/middleware/logger.go | 2 +- modules/middleware/render.go | 2 +- modules/middleware/repo.go | 2 +- routers/admin/admin.go | 2 +- routers/admin/user.go | 2 +- routers/dev/template.go | 2 +- routers/install.go | 2 +- routers/repo/branch.go | 3 ++- routers/repo/commit.go | 2 +- routers/repo/issue.go | 2 +- routers/repo/pull.go | 2 +- routers/repo/repo.go | 2 +- routers/user/user.go | 2 +- web.go | 2 +- 22 files changed, 24 insertions(+), 24 deletions(-) (limited to 'modules/middleware') diff --git a/modules/auth/admin.go b/modules/auth/admin.go index eccab007..fe889c23 100644 --- a/modules/auth/admin.go +++ b/modules/auth/admin.go @@ -8,7 +8,7 @@ import ( "net/http" "reflect" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/binding" diff --git a/modules/auth/auth.go b/modules/auth/auth.go index 361f55b2..4561dd83 100644 --- a/modules/auth/auth.go +++ b/modules/auth/auth.go @@ -9,7 +9,7 @@ import ( "reflect" "strings" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/binding" diff --git a/modules/auth/issue.go b/modules/auth/issue.go index 8bf49684..36c87627 100644 --- a/modules/auth/issue.go +++ b/modules/auth/issue.go @@ -8,7 +8,7 @@ import ( "net/http" "reflect" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/binding" diff --git a/modules/auth/repo.go b/modules/auth/repo.go index 2cc93744..eddd6475 100644 --- a/modules/auth/repo.go +++ b/modules/auth/repo.go @@ -8,7 +8,7 @@ import ( "net/http" "reflect" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/binding" diff --git a/modules/auth/setting.go b/modules/auth/setting.go index 0bc6afd4..cada7eea 100644 --- a/modules/auth/setting.go +++ b/modules/auth/setting.go @@ -9,7 +9,7 @@ import ( "reflect" "strings" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/binding" diff --git a/modules/auth/user.go b/modules/auth/user.go index 6242a11c..2d3c29fd 100644 --- a/modules/auth/user.go +++ b/modules/auth/user.go @@ -8,11 +8,10 @@ import ( "net/http" "reflect" - "github.com/codegangsta/martini" - - "github.com/gogits/session" + "github.com/go-martini/martini" "github.com/gogits/binding" + "github.com/gogits/session" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/base" diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go index f50fde99..bde3be72 100644 --- a/modules/middleware/auth.go +++ b/modules/middleware/auth.go @@ -7,7 +7,7 @@ package middleware import ( "net/url" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/gogs/modules/base" ) diff --git a/modules/middleware/context.go b/modules/middleware/context.go index 5f1d42b1..d2b268cd 100644 --- a/modules/middleware/context.go +++ b/modules/middleware/context.go @@ -15,7 +15,7 @@ import ( "strings" "time" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/cache" "github.com/gogits/git" diff --git a/modules/middleware/logger.go b/modules/middleware/logger.go index dcf85246..fc8e1a81 100644 --- a/modules/middleware/logger.go +++ b/modules/middleware/logger.go @@ -11,7 +11,7 @@ import ( "runtime" "time" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" ) var isWindows bool diff --git a/modules/middleware/render.go b/modules/middleware/render.go index 869ef9ab..98d485af 100644 --- a/modules/middleware/render.go +++ b/modules/middleware/render.go @@ -17,7 +17,7 @@ import ( "path/filepath" "time" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/gogs/modules/base" ) diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go index 6912cd83..f446d6a8 100644 --- a/modules/middleware/repo.go +++ b/modules/middleware/repo.go @@ -9,7 +9,7 @@ import ( "fmt" "strings" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/git" diff --git a/routers/admin/admin.go b/routers/admin/admin.go index f303439f..18a43ff8 100644 --- a/routers/admin/admin.go +++ b/routers/admin/admin.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/base" diff --git a/routers/admin/user.go b/routers/admin/user.go index 7f66c552..9f043507 100644 --- a/routers/admin/user.go +++ b/routers/admin/user.go @@ -7,7 +7,7 @@ package admin import ( "strings" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/auth" diff --git a/routers/dev/template.go b/routers/dev/template.go index d2f77ac4..63d5d9a5 100644 --- a/routers/dev/template.go +++ b/routers/dev/template.go @@ -5,7 +5,7 @@ package dev import ( - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/base" diff --git a/routers/install.go b/routers/install.go index cca652f9..2c993c55 100644 --- a/routers/install.go +++ b/routers/install.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/Unknwon/goconfig" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/lunny/xorm" "github.com/gogits/gogs/models" diff --git a/routers/repo/branch.go b/routers/repo/branch.go index c598db43..ffd118ae 100644 --- a/routers/repo/branch.go +++ b/routers/repo/branch.go @@ -5,7 +5,8 @@ package repo import ( - "github.com/codegangsta/martini" + "github.com/go-martini/martini" + "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/middleware" ) diff --git a/routers/repo/commit.go b/routers/repo/commit.go index 449f6443..d29c40e6 100644 --- a/routers/repo/commit.go +++ b/routers/repo/commit.go @@ -8,7 +8,7 @@ import ( "container/list" "path" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/base" diff --git a/routers/repo/issue.go b/routers/repo/issue.go index b2253e9f..f2d8959a 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -9,7 +9,7 @@ import ( "net/url" "strings" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/auth" diff --git a/routers/repo/pull.go b/routers/repo/pull.go index 93b6a9f7..430c6a81 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -5,7 +5,7 @@ package repo import ( - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/gogs/modules/middleware" ) diff --git a/routers/repo/repo.go b/routers/repo/repo.go index 5b0a165d..1cd3dd86 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/webdav" diff --git a/routers/user/user.go b/routers/user/user.go index aeaf91c9..08930e22 100644 --- a/routers/user/user.go +++ b/routers/user/user.go @@ -9,7 +9,7 @@ import ( "net/url" "strings" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/auth" diff --git a/web.go b/web.go index 6f252719..412dcb62 100644 --- a/web.go +++ b/web.go @@ -10,7 +10,7 @@ import ( "net/http" "github.com/codegangsta/cli" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/binding" -- cgit v1.2.3