summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/auth/admin.go2
-rw-r--r--modules/auth/auth.go2
-rw-r--r--modules/auth/issue.go2
-rw-r--r--modules/auth/repo.go2
-rw-r--r--modules/auth/setting.go2
-rw-r--r--modules/auth/user.go5
-rw-r--r--modules/middleware/auth.go2
-rw-r--r--modules/middleware/context.go2
-rw-r--r--modules/middleware/logger.go2
-rw-r--r--modules/middleware/render.go2
-rw-r--r--modules/middleware/repo.go2
11 files changed, 12 insertions, 13 deletions
diff --git a/modules/auth/admin.go b/modules/auth/admin.go
index eccab00718..fe889c2385 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 361f55b2d3..4561dd831d 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 8bf49684c6..36c8762791 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 2cc93744ce..eddd647528 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 0bc6afd4a6..cada7eea66 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 6242a11c18..2d3c29fde1 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 f50fde99e5..bde3be7269 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 5f1d42b1e4..d2b268cd87 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 dcf8524608..fc8e1a8115 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 869ef9abaa..98d485afec 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 6912cd8380..f446d6a85b 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"