Skip to content

Commit 142d35e

Browse files
tboergertboerger
authored
Merge pull request #1 from andreynering/import-paths
Rename import paths: "github.com/gogits/gogs" -> "github.com/go-gitea/gitea"
2 parents 6bcff78 + 1b0ec32 commit 142d35e

Some content is hidden

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

110 files changed

+403
-403
lines changed

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
LDFLAGS += -X "github.com/gogits/gogs/modules/setting.BuildTime=$(shell date -u '+%Y-%m-%d %I:%M:%S %Z')"
2-
LDFLAGS += -X "github.com/gogits/gogs/modules/setting.BuildGitHash=$(shell git rev-parse HEAD)"
1+
LDFLAGS += -X "github.com/go-gitea/gitea/modules/setting.BuildTime=$(shell date -u '+%Y-%m-%d %I:%M:%S %Z')"
2+
LDFLAGS += -X "github.com/go-gitea/gitea/modules/setting.BuildGitHash=$(shell git rev-parse HEAD)"
33

44
DATA_FILES := $(shell find conf | sed 's/ /\\ /g')
55
LESS_FILES := $(wildcard public/less/gogs.less public/less/_*.less)

‎cmd/admin.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99

1010
"github.com/urfave/cli"
1111

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

1616
var (

‎cmd/dump.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"github.com/Unknwon/cae/zip"
1717
"github.com/urfave/cli"
1818

19-
"github.com/gogits/gogs/models"
20-
"github.com/gogits/gogs/modules/setting"
19+
"github.com/go-gitea/gitea/models"
20+
"github.com/go-gitea/gitea/modules/setting"
2121
)
2222

2323
var CmdDump = cli.Command{

‎cmd/serve.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ import (
1818
gouuid "github.com/satori/go.uuid"
1919
"github.com/urfave/cli"
2020

21-
"github.com/gogits/gogs/models"
22-
"github.com/gogits/gogs/modules/base"
23-
"github.com/gogits/gogs/modules/httplib"
24-
"github.com/gogits/gogs/modules/log"
25-
"github.com/gogits/gogs/modules/setting"
21+
"github.com/go-gitea/gitea/models"
22+
"github.com/go-gitea/gitea/modules/base"
23+
"github.com/go-gitea/gitea/modules/httplib"
24+
"github.com/go-gitea/gitea/modules/log"
25+
"github.com/go-gitea/gitea/modules/setting"
2626
)
2727

2828
const (

‎cmd/update.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99

1010
"github.com/urfave/cli"
1111

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

1717
var CmdUpdate = cli.Command{

‎cmd/web.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,20 @@ import (
3232
"github.com/gogits/git-module"
3333
"github.com/gogits/go-gogs-client"
3434

35-
"github.com/gogits/gogs/models"
36-
"github.com/gogits/gogs/modules/auth"
37-
"github.com/gogits/gogs/modules/bindata"
38-
"github.com/gogits/gogs/modules/context"
39-
"github.com/gogits/gogs/modules/log"
40-
"github.com/gogits/gogs/modules/setting"
41-
"github.com/gogits/gogs/modules/template"
42-
"github.com/gogits/gogs/routers"
43-
"github.com/gogits/gogs/routers/admin"
44-
apiv1 "github.com/gogits/gogs/routers/api/v1"
45-
"github.com/gogits/gogs/routers/dev"
46-
"github.com/gogits/gogs/routers/org"
47-
"github.com/gogits/gogs/routers/repo"
48-
"github.com/gogits/gogs/routers/user"
35+
"github.com/go-gitea/gitea/models"
36+
"github.com/go-gitea/gitea/modules/auth"
37+
"github.com/go-gitea/gitea/modules/bindata"
38+
"github.com/go-gitea/gitea/modules/context"
39+
"github.com/go-gitea/gitea/modules/log"
40+
"github.com/go-gitea/gitea/modules/setting"
41+
"github.com/go-gitea/gitea/modules/template"
42+
"github.com/go-gitea/gitea/routers"
43+
"github.com/go-gitea/gitea/routers/admin"
44+
apiv1 "github.com/go-gitea/gitea/routers/api/v1"
45+
"github.com/go-gitea/gitea/routers/dev"
46+
"github.com/go-gitea/gitea/routers/org"
47+
"github.com/go-gitea/gitea/routers/repo"
48+
"github.com/go-gitea/gitea/routers/user"
4949
)
5050

5151
var CmdWeb = cli.Command{

‎gogs.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313

1414
"github.com/urfave/cli"
1515

16-
"github.com/gogits/gogs/cmd"
17-
"github.com/gogits/gogs/modules/setting"
16+
"github.com/go-gitea/gitea/cmd"
17+
"github.com/go-gitea/gitea/modules/setting"
1818
)
1919

2020
const APP_VER = "0.9.99.0915"

‎models/access.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package models
77
import (
88
"fmt"
99

10-
"github.com/gogits/gogs/modules/log"
10+
"github.com/go-gitea/gitea/modules/log"
1111
)
1212

1313
type AccessMode int

‎models/action.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import (
1919
"github.com/gogits/git-module"
2020
api "github.com/gogits/go-gogs-client"
2121

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

2727
type ActionType int

‎models/admin.go

+3-3
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/gogits/gogs/modules/base"
18-
"github.com/gogits/gogs/modules/log"
19-
"github.com/gogits/gogs/modules/setting"
17+
"github.com/go-gitea/gitea/modules/base"
18+
"github.com/go-gitea/gitea/modules/log"
19+
"github.com/go-gitea/gitea/modules/setting"
2020
)
2121

2222
type NoticeType int

‎models/git_diff.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ import (
2323

2424
"github.com/gogits/git-module"
2525

26-
"github.com/gogits/gogs/modules/base"
27-
"github.com/gogits/gogs/modules/log"
28-
"github.com/gogits/gogs/modules/process"
29-
"github.com/gogits/gogs/modules/setting"
30-
"github.com/gogits/gogs/modules/template/highlight"
26+
"github.com/go-gitea/gitea/modules/base"
27+
"github.com/go-gitea/gitea/modules/log"
28+
"github.com/go-gitea/gitea/modules/process"
29+
"github.com/go-gitea/gitea/modules/setting"
30+
"github.com/go-gitea/gitea/modules/template/highlight"
3131
)
3232

3333
type DiffLineType uint8

‎models/issue.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import (
1919
api "github.com/gogits/go-gogs-client"
2020
gouuid "github.com/satori/go.uuid"
2121

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

2727
var (

‎models/issue_comment.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414

1515
api "github.com/gogits/go-gogs-client"
1616

17-
"github.com/gogits/gogs/modules/log"
18-
"github.com/gogits/gogs/modules/markdown"
17+
"github.com/go-gitea/gitea/modules/log"
18+
"github.com/go-gitea/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

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515

1616
api "github.com/gogits/go-gogs-client"
1717

18-
"github.com/gogits/gogs/modules/base"
18+
"github.com/go-gitea/gitea/modules/base"
1919
)
2020

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

‎models/issue_mail.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99

1010
"github.com/Unknwon/com"
1111

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

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

‎models/login_source.go

+3-3
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/gogits/gogs/modules/auth/ldap"
23-
"github.com/gogits/gogs/modules/auth/pam"
24-
"github.com/gogits/gogs/modules/log"
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"
2525
)
2626

2727
type LoginType int

‎models/mail.go

+5-5
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/gogits/gogs/modules/base"
16-
"github.com/gogits/gogs/modules/log"
17-
"github.com/gogits/gogs/modules/mailer"
18-
"github.com/gogits/gogs/modules/markdown"
19-
"github.com/gogits/gogs/modules/setting"
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"
2020
)
2121

2222
const (

‎models/migrations/migrations.go

+3-3
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/gogits/gogs/modules/base"
24-
"github.com/gogits/gogs/modules/log"
25-
"github.com/gogits/gogs/modules/setting"
23+
"github.com/go-gitea/gitea/modules/base"
24+
"github.com/go-gitea/gitea/modules/log"
25+
"github.com/go-gitea/gitea/modules/setting"
2626
)
2727

2828
const _MIN_DB_VER = 4

‎models/models.go

+2-2
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/gogits/gogs/models/migrations"
22-
"github.com/gogits/gogs/modules/setting"
21+
"github.com/go-gitea/gitea/models/migrations"
22+
"github.com/go-gitea/gitea/modules/setting"
2323
)
2424

2525
// Engine represents a xorm engine or session.

‎models/org.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212

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

15-
"github.com/gogits/gogs/modules/base"
16-
"github.com/gogits/gogs/modules/log"
15+
"github.com/go-gitea/gitea/modules/base"
16+
"github.com/go-gitea/gitea/modules/log"
1717
)
1818

1919
var (

‎models/pull.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ import (
1717
"github.com/gogits/git-module"
1818
api "github.com/gogits/go-gogs-client"
1919

20-
"github.com/gogits/gogs/modules/log"
21-
"github.com/gogits/gogs/modules/process"
22-
"github.com/gogits/gogs/modules/setting"
23-
"github.com/gogits/gogs/modules/sync"
20+
"github.com/go-gitea/gitea/modules/log"
21+
"github.com/go-gitea/gitea/modules/process"
22+
"github.com/go-gitea/gitea/modules/setting"
23+
"github.com/go-gitea/gitea/modules/sync"
2424
)
2525

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

‎models/release.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414

1515
"github.com/gogits/git-module"
1616

17-
"github.com/gogits/gogs/modules/process"
17+
"github.com/go-gitea/gitea/modules/process"
1818
)
1919

2020
// Release represents a release of repository.

‎models/repo.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ import (
2828
git "github.com/gogits/git-module"
2929
api "github.com/gogits/go-gogs-client"
3030

31-
"github.com/gogits/gogs/modules/bindata"
32-
"github.com/gogits/gogs/modules/log"
33-
"github.com/gogits/gogs/modules/markdown"
34-
"github.com/gogits/gogs/modules/process"
35-
"github.com/gogits/gogs/modules/setting"
36-
"github.com/gogits/gogs/modules/sync"
31+
"github.com/go-gitea/gitea/modules/bindata"
32+
"github.com/go-gitea/gitea/modules/log"
33+
"github.com/go-gitea/gitea/modules/markdown"
34+
"github.com/go-gitea/gitea/modules/process"
35+
"github.com/go-gitea/gitea/modules/setting"
36+
"github.com/go-gitea/gitea/modules/sync"
3737
)
3838

3939
const (

‎models/repo_editor.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import (
2020

2121
git "github.com/gogits/git-module"
2222

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

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

‎models/repo_mirror.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import (
1313
"github.com/go-xorm/xorm"
1414
"gopkg.in/ini.v1"
1515

16-
"github.com/gogits/gogs/modules/log"
17-
"github.com/gogits/gogs/modules/process"
18-
"github.com/gogits/gogs/modules/setting"
19-
"github.com/gogits/gogs/modules/sync"
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"
2020
)
2121

2222
var MirrorQueue = sync.NewUniqueQueue(setting.Repository.MirrorQueueLength)

‎models/repo_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package models_test
22

33
import (
4-
. "github.com/gogits/gogs/models"
4+
. "github.com/go-gitea/gitea/models"
55
. "github.com/smartystreets/goconvey/convey"
66
"testing"
77

8-
"github.com/gogits/gogs/modules/markdown"
8+
"github.com/go-gitea/gitea/modules/markdown"
99
)
1010

1111
func TestRepo(t *testing.T) {

‎models/ssh_key.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import (
2222
"github.com/go-xorm/xorm"
2323
"golang.org/x/crypto/ssh"
2424

25-
"github.com/gogits/gogs/modules/base"
26-
"github.com/gogits/gogs/modules/log"
27-
"github.com/gogits/gogs/modules/process"
28-
"github.com/gogits/gogs/modules/setting"
25+
"github.com/go-gitea/gitea/modules/base"
26+
"github.com/go-gitea/gitea/modules/log"
27+
"github.com/go-gitea/gitea/modules/process"
28+
"github.com/go-gitea/gitea/modules/setting"
2929
)
3030

3131
const (

‎models/ssh_key_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
. "github.com/smartystreets/goconvey/convey"
1313

14-
"github.com/gogits/gogs/modules/setting"
14+
"github.com/go-gitea/gitea/modules/setting"
1515
)
1616

1717
func init() {

‎models/token.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/go-xorm/xorm"
1111
gouuid "github.com/satori/go.uuid"
1212

13-
"github.com/gogits/gogs/modules/base"
13+
"github.com/go-gitea/gitea/modules/base"
1414
)
1515

1616
// AccessToken represents a personal access token.

‎models/update.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
git "github.com/gogits/git-module"
1414

15-
"github.com/gogits/gogs/modules/log"
15+
"github.com/go-gitea/gitea/modules/log"
1616
)
1717

1818
type UpdateTask struct {

0 commit comments

Comments
 (0)