Skip to content

Commit 5fc370e

Browse files
tboergertboerger
authored
Merge pull request #142 from 0xbaadf00d/feature/gofmt
Normalize files with gofmt
2 parents f07362b + ddee4c8 commit 5fc370e

File tree

15 files changed

+26
-26
lines changed

15 files changed

+26
-26
lines changed

‎models/git_diff.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ import (
1616
"os/exec"
1717
"strings"
1818

19-
"github.com/Unknwon/com"
19+
"code.gitea.io/git"
2020
"code.gitea.io/gitea/modules/base"
2121
"code.gitea.io/gitea/modules/log"
2222
"code.gitea.io/gitea/modules/process"
2323
"code.gitea.io/gitea/modules/setting"
2424
"code.gitea.io/gitea/modules/template/highlight"
25-
"code.gitea.io/git"
25+
"github.com/Unknwon/com"
2626
"github.com/sergi/go-diff/diffmatchpatch"
2727
"golang.org/x/net/html/charset"
2828
"golang.org/x/text/transform"

‎models/issue.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import (
1414
"strings"
1515
"time"
1616

17+
api "code.gitea.io/sdk/gitea"
1718
"github.com/Unknwon/com"
1819
"github.com/go-xorm/xorm"
19-
api "code.gitea.io/sdk/gitea"
2020
gouuid "github.com/satori/go.uuid"
2121

2222
"code.gitea.io/gitea/modules/base"

‎models/pull.go

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

14-
"github.com/Unknwon/com"
14+
"code.gitea.io/git"
1515
"code.gitea.io/gitea/modules/log"
1616
"code.gitea.io/gitea/modules/process"
1717
"code.gitea.io/gitea/modules/setting"
1818
"code.gitea.io/gitea/modules/sync"
19-
"github.com/go-xorm/xorm"
20-
"code.gitea.io/git"
2119
api "code.gitea.io/sdk/gitea"
20+
"github.com/Unknwon/com"
21+
"github.com/go-xorm/xorm"
2222
)
2323

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

‎models/repo.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ import (
1919
"strings"
2020
"time"
2121

22-
"github.com/Unknwon/cae/zip"
23-
"github.com/Unknwon/com"
22+
"code.gitea.io/git"
2423
"code.gitea.io/gitea/modules/bindata"
2524
"code.gitea.io/gitea/modules/log"
2625
"code.gitea.io/gitea/modules/markdown"
2726
"code.gitea.io/gitea/modules/process"
2827
"code.gitea.io/gitea/modules/setting"
2928
"code.gitea.io/gitea/modules/sync"
30-
"github.com/go-xorm/xorm"
31-
"code.gitea.io/git"
3229
api "code.gitea.io/sdk/gitea"
30+
"github.com/Unknwon/cae/zip"
31+
"github.com/Unknwon/com"
32+
"github.com/go-xorm/xorm"
3333
version "github.com/mcuadros/go-version"
3434
ini "gopkg.in/ini.v1"
3535
)

‎modules/auth/repo_form.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"net/url"
99
"strings"
1010

11-
"github.com/Unknwon/com"
1211
"code.gitea.io/gitea/models"
12+
"github.com/Unknwon/com"
1313
"github.com/go-macaron/binding"
1414
macaron "gopkg.in/macaron.v1"
1515
)

‎modules/base/tool.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import (
2222
"unicode"
2323
"unicode/utf8"
2424

25-
"github.com/Unknwon/com"
26-
"github.com/Unknwon/i18n"
2725
"code.gitea.io/gitea/modules/log"
2826
"code.gitea.io/gitea/modules/setting"
27+
"github.com/Unknwon/com"
28+
"github.com/Unknwon/i18n"
2929
"github.com/gogits/chardet"
3030
)
3131

‎modules/context/api.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
"fmt"
99
"strings"
1010

11-
"github.com/Unknwon/paginater"
1211
"code.gitea.io/gitea/modules/base"
1312
"code.gitea.io/gitea/modules/log"
1413
"code.gitea.io/gitea/modules/setting"
14+
"github.com/Unknwon/paginater"
1515
macaron "gopkg.in/macaron.v1"
1616
)
1717

‎modules/context/repo.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import (
1010
"path"
1111
"strings"
1212

13-
"github.com/Unknwon/com"
13+
"code.gitea.io/git"
1414
"code.gitea.io/gitea/models"
1515
"code.gitea.io/gitea/modules/log"
1616
"code.gitea.io/gitea/modules/setting"
17-
"code.gitea.io/git"
17+
"github.com/Unknwon/com"
1818
editorconfig "gopkg.in/editorconfig/editorconfig-core-go.v1"
1919
macaron "gopkg.in/macaron.v1"
2020
)

‎routers/repo/commit.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import (
88
"container/list"
99
"path"
1010

11-
"github.com/Unknwon/paginater"
1211
"code.gitea.io/git"
1312
"code.gitea.io/gitea/models"
1413
"code.gitea.io/gitea/modules/base"
1514
"code.gitea.io/gitea/modules/context"
1615
"code.gitea.io/gitea/modules/setting"
16+
"github.com/Unknwon/paginater"
1717
)
1818

1919
const (

‎routers/repo/editor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ import (
1111
"path"
1212
"strings"
1313

14+
"code.gitea.io/git"
1415
"code.gitea.io/gitea/models"
1516
"code.gitea.io/gitea/modules/auth"
1617
"code.gitea.io/gitea/modules/base"
1718
"code.gitea.io/gitea/modules/context"
1819
"code.gitea.io/gitea/modules/log"
1920
"code.gitea.io/gitea/modules/setting"
2021
"code.gitea.io/gitea/modules/template"
21-
"code.gitea.io/git"
2222
)
2323

2424
const (

‎routers/repo/middlewares.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package repo
33
import (
44
"fmt"
55

6+
"code.gitea.io/git"
67
"code.gitea.io/gitea/models"
78
"code.gitea.io/gitea/modules/context"
8-
"code.gitea.io/git"
99
)
1010

1111
func SetEditorconfigIfExists(ctx *context.Context) {

‎routers/repo/pull.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ import (
1010
"path"
1111
"strings"
1212

13-
"github.com/Unknwon/com"
13+
"code.gitea.io/git"
1414
"code.gitea.io/gitea/models"
1515
"code.gitea.io/gitea/modules/auth"
1616
"code.gitea.io/gitea/modules/base"
1717
"code.gitea.io/gitea/modules/context"
1818
"code.gitea.io/gitea/modules/log"
1919
"code.gitea.io/gitea/modules/setting"
20-
"code.gitea.io/git"
20+
"github.com/Unknwon/com"
2121
)
2222

2323
const (

‎routers/repo/release.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ package repo
77
import (
88
"fmt"
99

10-
"github.com/Unknwon/paginater"
1110
"code.gitea.io/gitea/models"
1211
"code.gitea.io/gitea/modules/auth"
1312
"code.gitea.io/gitea/modules/base"
1413
"code.gitea.io/gitea/modules/context"
1514
"code.gitea.io/gitea/modules/log"
1615
"code.gitea.io/gitea/modules/markdown"
16+
"github.com/Unknwon/paginater"
1717
)
1818

1919
const (

‎routers/repo/view.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"path"
1313
"strings"
1414

15-
"github.com/Unknwon/paginater"
15+
"code.gitea.io/git"
1616
"code.gitea.io/gitea/models"
1717
"code.gitea.io/gitea/modules/base"
1818
"code.gitea.io/gitea/modules/context"
@@ -21,7 +21,7 @@ import (
2121
"code.gitea.io/gitea/modules/setting"
2222
"code.gitea.io/gitea/modules/template"
2323
"code.gitea.io/gitea/modules/template/highlight"
24-
"code.gitea.io/git"
24+
"github.com/Unknwon/paginater"
2525
)
2626

2727
const (

‎routers/user/auth.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ func SignInPost(ctx *context.Context, form auth.SignInForm) {
130130
// Register last login
131131
u.SetLastLogin()
132132
if err := models.UpdateUser(u); err != nil {
133-
ctx.Handle(500, "UpdateUser", err)
134-
return
133+
ctx.Handle(500, "UpdateUser", err)
134+
return
135135
}
136136

137137
if redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to")); len(redirectTo) > 0 {

0 commit comments

Comments
 (0)