rename import path

22 files changed, 23 insertions, 21 deletions

diff --git a/cmd/web.go b/cmd/web.go
index 87fe1b6a77..5127919012 100644
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -29,7 +29,7 @@ import (
 	"gopkg.in/ini.v1"
 	"gopkg.in/macaron.v1"
 
-	"github.com/gogits/git-shell"
+	"github.com/gogits/git-module"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/auth"
diff --git a/conf/locale/TRANSLATORS b/conf/locale/TRANSLATORS
index 37cc2198ac..669ff00391 100644
--- a/conf/locale/TRANSLATORS
+++ b/conf/locale/TRANSLATORS
@@ -8,12 +8,14 @@ Andrey Nering <andrey AT nering DOT com DOT br>
 Arthur Aslanyan <arthur DOT e DOT aslanyan AT gmail DOT com>
 Barış Arda Yılmaz <ardayilmazgamer AT gmail DOT com>
 Christoph Kisfeld <christoph DOT kisfeld AT gmail DOT com>
+Cysioland
 Daniel Speichert <daniel AT speichert DOT pl>
 Dmitriy Nogay <me AT catwhocode DOT ga>
 Gregor Santner <gdev AT live DOT de>
 Hamid Feizabadi <hamidfzm AT gmail DOT com>
 Huimin Wang <wanghm2009 AT hotmail DOT co DOT jp>
 ilko
+Ilya Makarov
 Lafriks <lafriks AT gmail DOT com>
 Lauri Ojansivu <x AT xet7 DOT org>
 Luc Stepniewski <luc AT stepniewski DOT fr>
diff --git a/models/action.go b/models/action.go
index 89003214dd..9ecf67b4b6 100644
--- a/models/action.go
+++ b/models/action.go
@@ -17,7 +17,7 @@ import (
 	"github.com/Unknwon/com"
 	"github.com/go-xorm/xorm"
 
-	"github.com/gogits/git-shell"
+	"github.com/gogits/git-module"
 	api "github.com/gogits/go-gogs-client"
 
 	"github.com/gogits/gogs/modules/base"
diff --git a/models/git_diff.go b/models/git_diff.go
index 2113250451..1b2fb5f2b1 100644
--- a/models/git_diff.go
+++ b/models/git_diff.go
@@ -18,7 +18,7 @@ import (
 	"golang.org/x/net/html/charset"
 	"golang.org/x/text/transform"
 
-	"github.com/gogits/git-shell"
+	"github.com/gogits/git-module"
 
 	"github.com/gogits/gogs/modules/base"
 	"github.com/gogits/gogs/modules/log"
diff --git a/models/pull.go b/models/pull.go
index f7785dfc54..8497285e16 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -14,7 +14,7 @@ import (
 	"github.com/Unknwon/com"
 	"github.com/go-xorm/xorm"
 
-	"github.com/gogits/git-shell"
+	"github.com/gogits/git-module"
 	api "github.com/gogits/go-gogs-client"
 
 	"github.com/gogits/gogs/modules/log"
diff --git a/models/release.go b/models/release.go
index 28cbfaab74..9fc5d3967b 100644
--- a/models/release.go
+++ b/models/release.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/go-xorm/xorm"
 
-	"github.com/gogits/git-shell"
+	"github.com/gogits/git-module"
 
 	"github.com/gogits/gogs/modules/process"
 )
diff --git a/models/repo.go b/models/repo.go
index 8b6731a72e..82e3463377 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -27,7 +27,7 @@ import (
 	"github.com/mcuadros/go-version"
 	"gopkg.in/ini.v1"
 
-	git "github.com/gogits/git-shell"
+	"github.com/gogits/git-module"
 	api "github.com/gogits/go-gogs-client"
 
 	"github.com/gogits/gogs/modules/base"
diff --git a/models/update.go b/models/update.go
index 0c4d342d01..5c6ea7f656 100644
--- a/models/update.go
+++ b/models/update.go
@@ -10,7 +10,7 @@ import (
 	"os/exec"
 	"strings"
 
-	git "github.com/gogits/git-shell"
+	"github.com/gogits/git-module"
 
 	"github.com/gogits/gogs/modules/log"
 )
diff --git a/models/user.go b/models/user.go
index d1f06dea80..36927730d5 100644
--- a/models/user.go
+++ b/models/user.go
@@ -25,7 +25,7 @@ import (
 	"github.com/go-xorm/xorm"
 	"github.com/nfnt/resize"
 
-	"github.com/gogits/git-shell"
+	"github.com/gogits/git-module"
 
 	"github.com/gogits/gogs/modules/avatar"
 	"github.com/gogits/gogs/modules/base"
diff --git a/models/webhook_slack.go b/models/webhook_slack.go
index 519ac7a22c..e41bbbc79f 100644
--- a/models/webhook_slack.go
+++ b/models/webhook_slack.go
@@ -10,7 +10,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/gogits/git-shell"
+	"github.com/gogits/git-module"
 	api "github.com/gogits/go-gogs-client"
 )
 
diff --git a/models/wiki.go b/models/wiki.go
index 5003b177f7..86b6c19efc 100644
--- a/models/wiki.go
+++ b/models/wiki.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/Unknwon/com"
 
-	"github.com/gogits/git-shell"
+	"github.com/gogits/git-module"
 
 	"github.com/gogits/gogs/modules/setting"
 )
diff --git a/modules/middleware/context.go b/modules/middleware/context.go
index 46a5c1f65d..571b19bf73 100644
--- a/modules/middleware/context.go
+++ b/modules/middleware/context.go
@@ -18,7 +18,7 @@ import (
 	"github.com/go-macaron/session"
 	"gopkg.in/macaron.v1"
 
-	"github.com/gogits/git-shell"
+	"github.com/gogits/git-module"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/auth"
diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go
index a6dd39664f..9ceb9903dd 100644
--- a/modules/middleware/repo.go
+++ b/modules/middleware/repo.go
@@ -11,7 +11,7 @@ import (
 
 	"gopkg.in/macaron.v1"
 
-	"github.com/gogits/git-shell"
+	"github.com/gogits/git-module"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/log"
diff --git a/routers/api/v1/repo/file.go b/routers/api/v1/repo/file.go
index 13a6c6c275..f64e663466 100644
--- a/routers/api/v1/repo/file.go
+++ b/routers/api/v1/repo/file.go
@@ -5,7 +5,7 @@
 package repo
 
 import (
-	"github.com/gogits/git-shell"
+	"github.com/gogits/git-module"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/middleware"
diff --git a/routers/install.go b/routers/install.go
index 6d2296cfc9..34dd475774 100644
--- a/routers/install.go
+++ b/routers/install.go
@@ -17,7 +17,7 @@ import (
 	"gopkg.in/ini.v1"
 	"gopkg.in/macaron.v1"
 
-	"github.com/gogits/git-shell"
+	"github.com/gogits/git-module"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/models/cron"
diff --git a/routers/repo/commit.go b/routers/repo/commit.go
index 0f0e220382..10c2f8a1c7 100644
--- a/routers/repo/commit.go
+++ b/routers/repo/commit.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/Unknwon/paginater"
 
-	"github.com/gogits/git-shell"
+	"github.com/gogits/git-module"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/base"
diff --git a/routers/repo/download.go b/routers/repo/download.go
index 3c3256b388..cb863c6133 100644
--- a/routers/repo/download.go
+++ b/routers/repo/download.go
@@ -8,7 +8,7 @@ import (
 	"io"
 	"path"
 
-	"github.com/gogits/git-shell"
+	"github.com/gogits/git-module"
 
 	"github.com/gogits/gogs/modules/base"
 	"github.com/gogits/gogs/modules/middleware"
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index 38a4c47029..f543fc31c6 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/Unknwon/com"
 
-	"github.com/gogits/git-shell"
+	"github.com/gogits/git-module"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/auth"
diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index c1f2a0f1e8..c58d256a72 100644
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/Unknwon/com"
 
-	"github.com/gogits/git-shell"
+	"github.com/gogits/git-module"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/auth"
diff --git a/routers/repo/setting.go b/routers/repo/setting.go
index 2c57d936f9..9e6ae8d412 100644
--- a/routers/repo/setting.go
+++ b/routers/repo/setting.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gogits/git-shell"
+	"github.com/gogits/git-module"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/auth"
diff --git a/routers/repo/view.go b/routers/repo/view.go
index e4815bf0c5..4ba26a0c4f 100644
--- a/routers/repo/view.go
+++ b/routers/repo/view.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/Unknwon/paginater"
 
-	git "github.com/gogits/git-shell"
+	"github.com/gogits/git-module"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/base"
diff --git a/routers/repo/wiki.go b/routers/repo/wiki.go
index 77aa1c370a..d2931dc1d5 100644
--- a/routers/repo/wiki.go
+++ b/routers/repo/wiki.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gogits/git-shell"
+	"github.com/gogits/git-module"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/auth"