Skip to content

Commit 92f39da

Browse files
metalmatzemetalmatze
authored
Merge pull request #85 from metalmatze/feature/goimports
Fix imports found by goimports.
2 parents a0e54c0 + f36544f commit 92f39da

File tree

15 files changed

+46
-67
lines changed

15 files changed

+46
-67
lines changed

‎cmd/web.go

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,6 @@ import (
1515
"path"
1616
"strings"
1717

18-
"github.com/go-macaron/binding"
19-
"github.com/go-macaron/cache"
20-
"github.com/go-macaron/captcha"
21-
"github.com/go-macaron/csrf"
22-
"github.com/go-macaron/gzip"
23-
"github.com/go-macaron/i18n"
24-
"github.com/go-macaron/session"
25-
"github.com/go-macaron/toolbox"
26-
"github.com/go-xorm/xorm"
27-
"github.com/mcuadros/go-version"
28-
"github.com/urfave/cli"
29-
"gopkg.in/ini.v1"
30-
"gopkg.in/macaron.v1"
31-
32-
"github.com/gogits/git-module"
33-
"github.com/gogits/go-gogs-client"
34-
3518
"github.com/go-gitea/gitea/models"
3619
"github.com/go-gitea/gitea/modules/auth"
3720
"github.com/go-gitea/gitea/modules/bindata"
@@ -46,6 +29,21 @@ import (
4629
"github.com/go-gitea/gitea/routers/org"
4730
"github.com/go-gitea/gitea/routers/repo"
4831
"github.com/go-gitea/gitea/routers/user"
32+
"github.com/go-macaron/binding"
33+
"github.com/go-macaron/cache"
34+
"github.com/go-macaron/captcha"
35+
"github.com/go-macaron/csrf"
36+
"github.com/go-macaron/gzip"
37+
"github.com/go-macaron/i18n"
38+
"github.com/go-macaron/session"
39+
"github.com/go-macaron/toolbox"
40+
"github.com/go-xorm/xorm"
41+
git "github.com/gogits/git-module"
42+
gogs "github.com/gogits/go-gogs-client"
43+
version "github.com/mcuadros/go-version"
44+
"github.com/urfave/cli"
45+
ini "gopkg.in/ini.v1"
46+
macaron "gopkg.in/macaron.v1"
4947
)
5048

5149
// CmdWeb represents the available web sub-command.

‎models/git_diff.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,15 @@ import (
1717
"strings"
1818

1919
"github.com/Unknwon/com"
20-
"github.com/sergi/go-diff/diffmatchpatch"
21-
"golang.org/x/net/html/charset"
22-
"golang.org/x/text/transform"
23-
24-
"github.com/gogits/git-module"
25-
2620
"github.com/go-gitea/gitea/modules/base"
2721
"github.com/go-gitea/gitea/modules/log"
2822
"github.com/go-gitea/gitea/modules/process"
2923
"github.com/go-gitea/gitea/modules/setting"
3024
"github.com/go-gitea/gitea/modules/template/highlight"
25+
git "github.com/gogits/git-module"
26+
"github.com/sergi/go-diff/diffmatchpatch"
27+
"golang.org/x/net/html/charset"
28+
"golang.org/x/text/transform"
3129
)
3230

3331
type DiffLineType uint8

‎models/pull.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,13 @@ import (
1212
"time"
1313

1414
"github.com/Unknwon/com"
15-
"github.com/go-xorm/xorm"
16-
17-
"github.com/gogits/git-module"
18-
api "github.com/gogits/go-gogs-client"
19-
2015
"github.com/go-gitea/gitea/modules/log"
2116
"github.com/go-gitea/gitea/modules/process"
2217
"github.com/go-gitea/gitea/modules/setting"
2318
"github.com/go-gitea/gitea/modules/sync"
19+
"github.com/go-xorm/xorm"
20+
git "github.com/gogits/git-module"
21+
api "github.com/gogits/go-gogs-client"
2422
)
2523

2624
var PullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength)

‎models/repo.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,17 @@ import (
2121

2222
"github.com/Unknwon/cae/zip"
2323
"github.com/Unknwon/com"
24-
"github.com/go-xorm/xorm"
25-
"github.com/mcuadros/go-version"
26-
"gopkg.in/ini.v1"
27-
28-
git "github.com/gogits/git-module"
29-
api "github.com/gogits/go-gogs-client"
30-
3124
"github.com/go-gitea/gitea/modules/bindata"
3225
"github.com/go-gitea/gitea/modules/log"
3326
"github.com/go-gitea/gitea/modules/markdown"
3427
"github.com/go-gitea/gitea/modules/process"
3528
"github.com/go-gitea/gitea/modules/setting"
3629
"github.com/go-gitea/gitea/modules/sync"
30+
"github.com/go-xorm/xorm"
31+
git "github.com/gogits/git-module"
32+
api "github.com/gogits/go-gogs-client"
33+
version "github.com/mcuadros/go-version"
34+
ini "gopkg.in/ini.v1"
3735
)
3836

3937
const (

‎modules/auth/repo_form.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ import (
99
"strings"
1010

1111
"github.com/Unknwon/com"
12-
"github.com/go-macaron/binding"
13-
"gopkg.in/macaron.v1"
14-
1512
"github.com/go-gitea/gitea/models"
13+
"github.com/go-macaron/binding"
14+
macaron "gopkg.in/macaron.v1"
1615
)
1716

1817
// _______________________________________ _________.______________________ _______________.___.

‎modules/context/api.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@ import (
99
"strings"
1010

1111
"github.com/Unknwon/paginater"
12-
"gopkg.in/macaron.v1"
13-
1412
"github.com/go-gitea/gitea/modules/base"
1513
"github.com/go-gitea/gitea/modules/log"
1614
"github.com/go-gitea/gitea/modules/setting"
15+
macaron "gopkg.in/macaron.v1"
1716
)
1817

1918
type APIContext struct {

‎modules/context/auth.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ package context
77
import (
88
"net/url"
99

10-
"github.com/go-macaron/csrf"
11-
"gopkg.in/macaron.v1"
12-
1310
"github.com/go-gitea/gitea/modules/auth"
1411
"github.com/go-gitea/gitea/modules/setting"
12+
"github.com/go-macaron/csrf"
13+
macaron "gopkg.in/macaron.v1"
1514
)
1615

1716
type ToggleOptions struct {

‎modules/context/context.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,16 @@ import (
1212
"strings"
1313
"time"
1414

15-
"github.com/go-macaron/cache"
16-
"github.com/go-macaron/csrf"
17-
"github.com/go-macaron/i18n"
18-
"github.com/go-macaron/session"
19-
"gopkg.in/macaron.v1"
20-
2115
"github.com/go-gitea/gitea/models"
2216
"github.com/go-gitea/gitea/modules/auth"
2317
"github.com/go-gitea/gitea/modules/base"
2418
"github.com/go-gitea/gitea/modules/log"
2519
"github.com/go-gitea/gitea/modules/setting"
20+
"github.com/go-macaron/cache"
21+
"github.com/go-macaron/csrf"
22+
"github.com/go-macaron/i18n"
23+
"github.com/go-macaron/session"
24+
macaron "gopkg.in/macaron.v1"
2625
)
2726

2827
// Context represents context of a request.

‎modules/context/org.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ package context
77
import (
88
"strings"
99

10-
"gopkg.in/macaron.v1"
11-
1210
"github.com/go-gitea/gitea/models"
1311
"github.com/go-gitea/gitea/modules/setting"
12+
macaron "gopkg.in/macaron.v1"
1413
)
1514

1615
type Organization struct {

‎modules/context/repo.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,12 @@ import (
1111
"strings"
1212

1313
"github.com/Unknwon/com"
14-
"gopkg.in/editorconfig/editorconfig-core-go.v1"
15-
"gopkg.in/macaron.v1"
16-
17-
"github.com/gogits/git-module"
18-
1914
"github.com/go-gitea/gitea/models"
2015
"github.com/go-gitea/gitea/modules/log"
2116
"github.com/go-gitea/gitea/modules/setting"
17+
git "github.com/gogits/git-module"
18+
editorconfig "gopkg.in/editorconfig/editorconfig-core-go.v1"
19+
macaron "gopkg.in/macaron.v1"
2220
)
2321

2422
type PullRequest struct {

‎routers/repo/commit.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,11 @@ import (
99
"path"
1010

1111
"github.com/Unknwon/paginater"
12-
13-
"github.com/gogits/git-module"
14-
1512
"github.com/go-gitea/gitea/models"
1613
"github.com/go-gitea/gitea/modules/base"
1714
"github.com/go-gitea/gitea/modules/context"
1815
"github.com/go-gitea/gitea/modules/setting"
16+
git "github.com/gogits/git-module"
1917
)
2018

2119
const (

‎routers/repo/editor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/go-gitea/gitea/modules/log"
1919
"github.com/go-gitea/gitea/modules/setting"
2020
"github.com/go-gitea/gitea/modules/template"
21-
"github.com/gogits/git-module"
21+
git "github.com/gogits/git-module"
2222
)
2323

2424
const (

‎routers/repo/middlewares.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"github.com/go-gitea/gitea/models"
77
"github.com/go-gitea/gitea/modules/context"
8-
"github.com/gogits/git-module"
8+
git "github.com/gogits/git-module"
99
)
1010

1111
func SetEditorconfigIfExists(ctx *context.Context) {

‎routers/repo/pull.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@ import (
1111
"strings"
1212

1313
"github.com/Unknwon/com"
14-
15-
"github.com/gogits/git-module"
16-
1714
"github.com/go-gitea/gitea/models"
1815
"github.com/go-gitea/gitea/modules/auth"
1916
"github.com/go-gitea/gitea/modules/base"
2017
"github.com/go-gitea/gitea/modules/context"
2118
"github.com/go-gitea/gitea/modules/log"
2219
"github.com/go-gitea/gitea/modules/setting"
20+
git "github.com/gogits/git-module"
2321
)
2422

2523
const (

‎routers/repo/view.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ import (
1313
"strings"
1414

1515
"github.com/Unknwon/paginater"
16-
17-
"github.com/gogits/git-module"
18-
1916
"github.com/go-gitea/gitea/models"
2017
"github.com/go-gitea/gitea/modules/base"
2118
"github.com/go-gitea/gitea/modules/context"
@@ -24,6 +21,7 @@ import (
2421
"github.com/go-gitea/gitea/modules/setting"
2522
"github.com/go-gitea/gitea/modules/template"
2623
"github.com/go-gitea/gitea/modules/template/highlight"
24+
git "github.com/gogits/git-module"
2725
)
2826

2927
const (

0 commit comments

Comments
 (0)