Skip to content

Commit b0ddced

Browse files
thibaultmeyerthibaultmeyer
committed
Merge remote-tracking branch 'upstream/master' into feature/rewrite-xorm-queries
# Conflicts: # models/git_diff.go # models/issue.go # models/org.go # models/pull.go # models/repo.go
2 parents a4454f5 + 4247304 commit b0ddced

File tree

168 files changed

+485
-482
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+485
-482
lines changed

‎.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
language: go
22

3+
go_import_path: code.gitea.io/gitea
4+
35
go:
46
- 1.6
57
- 1.7

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ DIST := dist
22
BIN := bin
33

44
EXECUTABLE := gitea
5-
IMPORT := github.com/go-gitea/gitea
5+
IMPORT := code.gitea.io/gitea
66

77
SHA := $(shell git rev-parse --short HEAD)
88
DATE := $(shell date -u '+%Y-%m-%d %I:%M:%S %Z')
@@ -11,8 +11,8 @@ BINDATA := $(shell find conf | sed 's/ /\\ /g')
1111
STYLESHEETS := $(wildcard public/less/index.less public/less/_*.less)
1212
JAVASCRIPTS :=
1313

14-
LDFLAGS += -X "github.com/go-gitea/gitea/modules/setting.BuildTime=$(DATE)"
15-
LDFLAGS += -X "github.com/go-gitea/gitea/modules/setting.BuildGitHash=$(SHA)"
14+
LDFLAGS += -X "code.gitea.io/gitea/modules/setting.BuildTime=$(DATE)"
15+
LDFLAGS += -X "code.gitea.io/gitea/modules/setting.BuildGitHash=$(SHA)"
1616

1717
TARGETS ?= linux/*,darwin/*,windows/*
1818
PACKAGES ?= $(shell go list ./... | grep -v /vendor/)

‎cmd/admin.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99

1010
"github.com/urfave/cli"
1111

12-
"github.com/go-gitea/gitea/models"
13-
"github.com/go-gitea/gitea/modules/setting"
12+
"code.gitea.io/gitea/models"
13+
"code.gitea.io/gitea/modules/setting"
1414
)
1515

1616
var (

‎cmd/dump.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
"time"
1414

1515
"github.com/Unknwon/cae/zip"
16-
"github.com/go-gitea/gitea/models"
17-
"github.com/go-gitea/gitea/modules/setting"
16+
"code.gitea.io/gitea/models"
17+
"code.gitea.io/gitea/modules/setting"
1818
"github.com/urfave/cli"
1919
)
2020

‎cmd/serve.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ import (
1414
"time"
1515

1616
"github.com/Unknwon/com"
17-
"github.com/go-gitea/git"
18-
"github.com/go-gitea/gitea/models"
19-
"github.com/go-gitea/gitea/modules/base"
20-
"github.com/go-gitea/gitea/modules/httplib"
21-
"github.com/go-gitea/gitea/modules/log"
22-
"github.com/go-gitea/gitea/modules/setting"
17+
"code.gitea.io/git"
18+
"code.gitea.io/gitea/models"
19+
"code.gitea.io/gitea/modules/base"
20+
"code.gitea.io/gitea/modules/httplib"
21+
"code.gitea.io/gitea/modules/log"
22+
"code.gitea.io/gitea/modules/setting"
2323
gouuid "github.com/satori/go.uuid"
2424
"github.com/urfave/cli"
2525
)

‎cmd/update.go

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

1010
"github.com/urfave/cli"
1111

12-
"github.com/go-gitea/gitea/models"
13-
"github.com/go-gitea/gitea/modules/log"
14-
"github.com/go-gitea/gitea/modules/setting"
12+
"code.gitea.io/gitea/models"
13+
"code.gitea.io/gitea/modules/log"
14+
"code.gitea.io/gitea/modules/setting"
1515
)
1616

1717
// CmdUpdate represents the available update sub-command.

‎cmd/web.go

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

18-
"github.com/go-gitea/git"
19-
"github.com/go-gitea/gitea/models"
20-
"github.com/go-gitea/gitea/modules/auth"
21-
"github.com/go-gitea/gitea/modules/bindata"
22-
"github.com/go-gitea/gitea/modules/context"
23-
"github.com/go-gitea/gitea/modules/log"
24-
"github.com/go-gitea/gitea/modules/setting"
25-
"github.com/go-gitea/gitea/modules/template"
26-
"github.com/go-gitea/gitea/routers"
27-
"github.com/go-gitea/gitea/routers/admin"
28-
apiv1 "github.com/go-gitea/gitea/routers/api/v1"
29-
"github.com/go-gitea/gitea/routers/dev"
30-
"github.com/go-gitea/gitea/routers/org"
31-
"github.com/go-gitea/gitea/routers/repo"
32-
"github.com/go-gitea/gitea/routers/user"
18+
"code.gitea.io/git"
19+
"code.gitea.io/gitea/models"
20+
"code.gitea.io/gitea/modules/auth"
21+
"code.gitea.io/gitea/modules/bindata"
22+
"code.gitea.io/gitea/modules/context"
23+
"code.gitea.io/gitea/modules/log"
24+
"code.gitea.io/gitea/modules/setting"
25+
"code.gitea.io/gitea/modules/template"
26+
"code.gitea.io/gitea/routers"
27+
"code.gitea.io/gitea/routers/admin"
28+
apiv1 "code.gitea.io/gitea/routers/api/v1"
29+
"code.gitea.io/gitea/routers/dev"
30+
"code.gitea.io/gitea/routers/org"
31+
"code.gitea.io/gitea/routers/repo"
32+
"code.gitea.io/gitea/routers/user"
3333
"github.com/go-macaron/binding"
3434
"github.com/go-macaron/cache"
3535
"github.com/go-macaron/captcha"
@@ -100,7 +100,7 @@ func checkVersion() {
100100
{"github.com/go-macaron/toolbox", toolbox.Version, "0.1.0"},
101101
{"gopkg.in/ini.v1", ini.Version, "1.8.4"},
102102
{"gopkg.in/macaron.v1", macaron.Version, "1.1.7"},
103-
{"github.com/go-gitea/git", git.Version, "0.4.1"},
103+
{"code.gitea.io/git", git.Version, "0.4.1"},
104104
}
105105
for _, c := range checkers {
106106
if !version.Compare(c.Version(), c.Expected, ">=") {

‎main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"os"
1111
"runtime"
1212

13-
"github.com/go-gitea/gitea/cmd"
14-
"github.com/go-gitea/gitea/modules/setting"
13+
"code.gitea.io/gitea/cmd"
14+
"code.gitea.io/gitea/modules/setting"
1515
"github.com/urfave/cli"
1616
)
1717

‎models/access.go

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

10-
"github.com/go-gitea/gitea/modules/log"
10+
"code.gitea.io/gitea/modules/log"
1111
)
1212

1313
type AccessMode int

‎models/action.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ import (
1616
"github.com/Unknwon/com"
1717
"github.com/go-xorm/xorm"
1818

19-
"github.com/go-gitea/git"
20-
api "github.com/go-gitea/go-sdk/gitea"
19+
"code.gitea.io/git"
20+
api "code.gitea.io/go-sdk/gitea"
2121

22-
"github.com/go-gitea/gitea/modules/base"
23-
"github.com/go-gitea/gitea/modules/log"
24-
"github.com/go-gitea/gitea/modules/setting"
22+
"code.gitea.io/gitea/modules/base"
23+
"code.gitea.io/gitea/modules/log"
24+
"code.gitea.io/gitea/modules/setting"
2525
)
2626

2727
type ActionType int

‎models/admin.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import (
1414
"github.com/Unknwon/com"
1515
"github.com/go-xorm/xorm"
1616

17-
"github.com/go-gitea/gitea/modules/base"
18-
"github.com/go-gitea/gitea/modules/log"
19-
"github.com/go-gitea/gitea/modules/setting"
17+
"code.gitea.io/gitea/modules/base"
18+
"code.gitea.io/gitea/modules/log"
19+
"code.gitea.io/gitea/modules/setting"
2020
)
2121

2222
type NoticeType int

‎models/git_diff.go

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

1919
"github.com/Unknwon/com"
20-
"github.com/go-gitea/git"
21-
"github.com/go-gitea/gitea/modules/base"
22-
"github.com/go-gitea/gitea/modules/log"
23-
"github.com/go-gitea/gitea/modules/process"
24-
"github.com/go-gitea/gitea/modules/setting"
25-
"github.com/go-gitea/gitea/modules/template/highlight"
20+
"code.gitea.io/gitea/modules/base"
21+
"code.gitea.io/gitea/modules/log"
22+
"code.gitea.io/gitea/modules/process"
23+
"code.gitea.io/gitea/modules/setting"
24+
"code.gitea.io/gitea/modules/template/highlight"
25+
"code.gitea.io/git"
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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ import (
1515
"time"
1616

1717
"github.com/Unknwon/com"
18-
api "github.com/go-gitea/go-sdk/gitea"
1918
"github.com/go-xorm/xorm"
19+
api "code.gitea.io/go-sdk/gitea"
2020
gouuid "github.com/satori/go.uuid"
2121

22-
"github.com/go-gitea/gitea/modules/base"
23-
"github.com/go-gitea/gitea/modules/log"
24-
"github.com/go-gitea/gitea/modules/setting"
22+
"code.gitea.io/gitea/modules/base"
23+
"code.gitea.io/gitea/modules/log"
24+
"code.gitea.io/gitea/modules/setting"
2525
)
2626

2727
var (

‎models/issue_comment.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import (
1212
"github.com/Unknwon/com"
1313
"github.com/go-xorm/xorm"
1414

15-
api "github.com/go-gitea/go-sdk/gitea"
15+
api "code.gitea.io/go-sdk/gitea"
1616

17-
"github.com/go-gitea/gitea/modules/log"
18-
"github.com/go-gitea/gitea/modules/markdown"
17+
"code.gitea.io/gitea/modules/log"
18+
"code.gitea.io/gitea/modules/markdown"
1919
)
2020

2121
// CommentType defines whether a comment is just a simple comment, an action (like close) or a reference.

‎models/issue_label.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313

1414
"github.com/go-xorm/xorm"
1515

16-
api "github.com/go-gitea/go-sdk/gitea"
16+
api "code.gitea.io/go-sdk/gitea"
1717

18-
"github.com/go-gitea/gitea/modules/base"
18+
"code.gitea.io/gitea/modules/base"
1919
)
2020

2121
var labelColorPattern = regexp.MustCompile("#([a-fA-F0-9]{6})")

‎models/issue_mail.go

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

1010
"github.com/Unknwon/com"
1111

12-
"github.com/go-gitea/gitea/modules/log"
13-
"github.com/go-gitea/gitea/modules/markdown"
14-
"github.com/go-gitea/gitea/modules/setting"
12+
"code.gitea.io/gitea/modules/log"
13+
"code.gitea.io/gitea/modules/markdown"
14+
"code.gitea.io/gitea/modules/setting"
1515
)
1616

1717
func (issue *Issue) MailSubject() string {

‎models/login_source.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import (
1919
"github.com/go-xorm/core"
2020
"github.com/go-xorm/xorm"
2121

22-
"github.com/go-gitea/gitea/modules/auth/ldap"
23-
"github.com/go-gitea/gitea/modules/auth/pam"
24-
"github.com/go-gitea/gitea/modules/log"
22+
"code.gitea.io/gitea/modules/auth/ldap"
23+
"code.gitea.io/gitea/modules/auth/pam"
24+
"code.gitea.io/gitea/modules/log"
2525
)
2626

2727
type LoginType int

‎models/mail.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212
"gopkg.in/gomail.v2"
1313
"gopkg.in/macaron.v1"
1414

15-
"github.com/go-gitea/gitea/modules/base"
16-
"github.com/go-gitea/gitea/modules/log"
17-
"github.com/go-gitea/gitea/modules/mailer"
18-
"github.com/go-gitea/gitea/modules/markdown"
19-
"github.com/go-gitea/gitea/modules/setting"
15+
"code.gitea.io/gitea/modules/base"
16+
"code.gitea.io/gitea/modules/log"
17+
"code.gitea.io/gitea/modules/mailer"
18+
"code.gitea.io/gitea/modules/markdown"
19+
"code.gitea.io/gitea/modules/setting"
2020
)
2121

2222
const (

‎models/migrations/migrations.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import (
2020
gouuid "github.com/satori/go.uuid"
2121
"gopkg.in/ini.v1"
2222

23-
"github.com/go-gitea/gitea/modules/base"
24-
"github.com/go-gitea/gitea/modules/log"
25-
"github.com/go-gitea/gitea/modules/setting"
23+
"code.gitea.io/gitea/modules/base"
24+
"code.gitea.io/gitea/modules/log"
25+
"code.gitea.io/gitea/modules/setting"
2626
)
2727

2828
const _MIN_DB_VER = 4

‎models/models.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"github.com/go-xorm/xorm"
1919
_ "github.com/lib/pq"
2020

21-
"github.com/go-gitea/gitea/models/migrations"
22-
"github.com/go-gitea/gitea/modules/setting"
21+
"code.gitea.io/gitea/models/migrations"
22+
"code.gitea.io/gitea/modules/setting"
2323
)
2424

2525
// Engine represents a xorm engine or session.

‎models/org.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ import (
1212

1313
"github.com/go-xorm/xorm"
1414

15-
"github.com/go-gitea/gitea/modules/base"
15+
"code.gitea.io/gitea/modules/base"
16+
"code.gitea.io/gitea/modules/log"
1617
)
1718

1819
var (

‎models/pull.go

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

1414
"github.com/Unknwon/com"
15-
"github.com/go-gitea/git"
16-
"github.com/go-gitea/gitea/modules/log"
17-
"github.com/go-gitea/gitea/modules/process"
18-
"github.com/go-gitea/gitea/modules/setting"
19-
"github.com/go-gitea/gitea/modules/sync"
20-
api "github.com/go-gitea/go-sdk/gitea"
15+
"code.gitea.io/gitea/modules/log"
16+
"code.gitea.io/gitea/modules/process"
17+
"code.gitea.io/gitea/modules/setting"
18+
"code.gitea.io/gitea/modules/sync"
2119
"github.com/go-xorm/xorm"
20+
"code.gitea.io/git"
21+
api "code.gitea.io/go-sdk/gitea"
2222
)
2323

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

‎models/release.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212

1313
"github.com/go-xorm/xorm"
1414

15-
"github.com/go-gitea/git"
15+
"code.gitea.io/git"
1616

17-
"github.com/go-gitea/gitea/modules/process"
17+
"code.gitea.io/gitea/modules/process"
1818
)
1919

2020
// Release represents a release of repository.

‎models/repo.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ import (
2121

2222
"github.com/Unknwon/cae/zip"
2323
"github.com/Unknwon/com"
24-
"github.com/go-gitea/git"
25-
"github.com/go-gitea/gitea/modules/bindata"
26-
"github.com/go-gitea/gitea/modules/log"
27-
"github.com/go-gitea/gitea/modules/markdown"
28-
"github.com/go-gitea/gitea/modules/process"
29-
"github.com/go-gitea/gitea/modules/setting"
30-
"github.com/go-gitea/gitea/modules/sync"
31-
api "github.com/go-gitea/go-sdk/gitea"
24+
"code.gitea.io/gitea/modules/bindata"
25+
"code.gitea.io/gitea/modules/log"
26+
"code.gitea.io/gitea/modules/markdown"
27+
"code.gitea.io/gitea/modules/process"
28+
"code.gitea.io/gitea/modules/setting"
29+
"code.gitea.io/gitea/modules/sync"
3230
"github.com/go-xorm/xorm"
31+
"code.gitea.io/git"
32+
api "code.gitea.io/go-sdk/gitea"
3333
version "github.com/mcuadros/go-version"
3434
ini "gopkg.in/ini.v1"
3535
)

‎models/repo_branch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package models
66

77
import (
8-
"github.com/go-gitea/git"
8+
"code.gitea.io/git"
99
)
1010

1111
type Branch struct {

‎models/repo_editor.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ import (
1818
"github.com/Unknwon/com"
1919
gouuid "github.com/satori/go.uuid"
2020

21-
"github.com/go-gitea/git"
21+
"code.gitea.io/git"
2222

23-
"github.com/go-gitea/gitea/modules/log"
24-
"github.com/go-gitea/gitea/modules/process"
25-
"github.com/go-gitea/gitea/modules/setting"
23+
"code.gitea.io/gitea/modules/log"
24+
"code.gitea.io/gitea/modules/process"
25+
"code.gitea.io/gitea/modules/setting"
2626
)
2727

2828
// ___________ .___.__ __ ___________.__.__

0 commit comments

Comments
 (0)