Skip to content

Commit

Permalink
Merge pull request #1 from andreynering/import-paths
Browse files Browse the repository at this point in the history
Rename import paths: "github.com/gogits/gogs" -> "github.com/go-gitea/gitea"
  • Loading branch information
tboerger authored Nov 2, 2016
2 parents 6bcff78 + 1b0ec32 commit 142d35e
Show file tree
Hide file tree
Showing 110 changed files with 403 additions and 403 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
LDFLAGS += -X "github.com/gogits/gogs/modules/setting.BuildTime=$(shell date -u '+%Y-%m-%d %I:%M:%S %Z')"
LDFLAGS += -X "github.com/gogits/gogs/modules/setting.BuildGitHash=$(shell git rev-parse HEAD)"
LDFLAGS += -X "github.com/go-gitea/gitea/modules/setting.BuildTime=$(shell date -u '+%Y-%m-%d %I:%M:%S %Z')"
LDFLAGS += -X "github.com/go-gitea/gitea/modules/setting.BuildGitHash=$(shell git rev-parse HEAD)"

DATA_FILES := $(shell find conf | sed 's/ /\\ /g')
LESS_FILES := $(wildcard public/less/gogs.less public/less/_*.less)
Expand Down
4 changes: 2 additions & 2 deletions cmd/admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (

"github.com/urfave/cli"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/setting"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions cmd/dump.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"github.com/Unknwon/cae/zip"
"github.com/urfave/cli"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/setting"
)

var CmdDump = cli.Command{
Expand Down
10 changes: 5 additions & 5 deletions cmd/serve.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ import (
gouuid "github.com/satori/go.uuid"
"github.com/urfave/cli"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/httplib"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/httplib"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions cmd/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (

"github.com/urfave/cli"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
)

var CmdUpdate = cli.Command{
Expand Down
28 changes: 14 additions & 14 deletions cmd/web.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,20 @@ import (
"github.com/gogits/git-module"
"github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth"
"github.com/gogits/gogs/modules/bindata"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/modules/template"
"github.com/gogits/gogs/routers"
"github.com/gogits/gogs/routers/admin"
apiv1 "github.com/gogits/gogs/routers/api/v1"
"github.com/gogits/gogs/routers/dev"
"github.com/gogits/gogs/routers/org"
"github.com/gogits/gogs/routers/repo"
"github.com/gogits/gogs/routers/user"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/auth"
"github.com/go-gitea/gitea/modules/bindata"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/modules/template"
"github.com/go-gitea/gitea/routers"
"github.com/go-gitea/gitea/routers/admin"
apiv1 "github.com/go-gitea/gitea/routers/api/v1"
"github.com/go-gitea/gitea/routers/dev"
"github.com/go-gitea/gitea/routers/org"
"github.com/go-gitea/gitea/routers/repo"
"github.com/go-gitea/gitea/routers/user"
)

var CmdWeb = cli.Command{
Expand Down
4 changes: 2 additions & 2 deletions gogs.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (

"github.com/urfave/cli"

"github.com/gogits/gogs/cmd"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/cmd"
"github.com/go-gitea/gitea/modules/setting"
)

const APP_VER = "0.9.99.0915"
Expand Down
2 changes: 1 addition & 1 deletion models/access.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package models
import (
"fmt"

"github.com/gogits/gogs/modules/log"
"github.com/go-gitea/gitea/modules/log"
)

type AccessMode int
Expand Down
6 changes: 3 additions & 3 deletions models/action.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"github.com/gogits/git-module"
api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
)

type ActionType int
Expand Down
6 changes: 3 additions & 3 deletions models/admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"

"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
)

type NoticeType int
Expand Down
10 changes: 5 additions & 5 deletions models/git_diff.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ import (

"github.com/gogits/git-module"

"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/process"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/modules/template/highlight"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/process"
"github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/modules/template/highlight"
)

type DiffLineType uint8
Expand Down
6 changes: 3 additions & 3 deletions models/issue.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
api "github.com/gogits/go-gogs-client"
gouuid "github.com/satori/go.uuid"

"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions models/issue_comment.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (

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

"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/markdown"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/markdown"
)

// CommentType defines whether a comment is just a simple comment, an action (like close) or a reference.
Expand Down
2 changes: 1 addition & 1 deletion models/issue_label.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (

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

"github.com/gogits/gogs/modules/base"
"github.com/go-gitea/gitea/modules/base"
)

var labelColorPattern = regexp.MustCompile("#([a-fA-F0-9]{6})")
Expand Down
6 changes: 3 additions & 3 deletions models/issue_mail.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (

"github.com/Unknwon/com"

"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/markdown"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/markdown"
"github.com/go-gitea/gitea/modules/setting"
)

func (issue *Issue) MailSubject() string {
Expand Down
6 changes: 3 additions & 3 deletions models/login_source.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"github.com/go-xorm/core"
"github.com/go-xorm/xorm"

"github.com/gogits/gogs/modules/auth/ldap"
"github.com/gogits/gogs/modules/auth/pam"
"github.com/gogits/gogs/modules/log"
"github.com/go-gitea/gitea/modules/auth/ldap"
"github.com/go-gitea/gitea/modules/auth/pam"
"github.com/go-gitea/gitea/modules/log"
)

type LoginType int
Expand Down
10 changes: 5 additions & 5 deletions models/mail.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import (
"gopkg.in/gomail.v2"
"gopkg.in/macaron.v1"

"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/mailer"
"github.com/gogits/gogs/modules/markdown"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/mailer"
"github.com/go-gitea/gitea/modules/markdown"
"github.com/go-gitea/gitea/modules/setting"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions models/migrations/migrations.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
gouuid "github.com/satori/go.uuid"
"gopkg.in/ini.v1"

"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
)

const _MIN_DB_VER = 4
Expand Down
4 changes: 2 additions & 2 deletions models/models.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"github.com/go-xorm/xorm"
_ "github.com/lib/pq"

"github.com/gogits/gogs/models/migrations"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/models/migrations"
"github.com/go-gitea/gitea/modules/setting"
)

// Engine represents a xorm engine or session.
Expand Down
4 changes: 2 additions & 2 deletions models/org.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (

"github.com/go-xorm/xorm"

"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/log"
)

var (
Expand Down
8 changes: 4 additions & 4 deletions models/pull.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ import (
"github.com/gogits/git-module"
api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/process"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/modules/sync"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/process"
"github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/modules/sync"
)

var PullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength)
Expand Down
2 changes: 1 addition & 1 deletion models/release.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (

"github.com/gogits/git-module"

"github.com/gogits/gogs/modules/process"
"github.com/go-gitea/gitea/modules/process"
)

// Release represents a release of repository.
Expand Down
12 changes: 6 additions & 6 deletions models/repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ import (
git "github.com/gogits/git-module"
api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/modules/bindata"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/markdown"
"github.com/gogits/gogs/modules/process"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/modules/sync"
"github.com/go-gitea/gitea/modules/bindata"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/markdown"
"github.com/go-gitea/gitea/modules/process"
"github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/modules/sync"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions models/repo_editor.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (

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

"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/process"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/process"
"github.com/go-gitea/gitea/modules/setting"
)

// ___________ .___.__ __ ___________.__.__
Expand Down
8 changes: 4 additions & 4 deletions models/repo_mirror.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
"github.com/go-xorm/xorm"
"gopkg.in/ini.v1"

"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/process"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/modules/sync"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/process"
"github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/modules/sync"
)

var MirrorQueue = sync.NewUniqueQueue(setting.Repository.MirrorQueueLength)
Expand Down
4 changes: 2 additions & 2 deletions models/repo_test.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package models_test

import (
. "github.com/gogits/gogs/models"
. "github.com/go-gitea/gitea/models"
. "github.com/smartystreets/goconvey/convey"
"testing"

"github.com/gogits/gogs/modules/markdown"
"github.com/go-gitea/gitea/modules/markdown"
)

func TestRepo(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions models/ssh_key.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"github.com/go-xorm/xorm"
"golang.org/x/crypto/ssh"

"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/process"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/process"
"github.com/go-gitea/gitea/modules/setting"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion models/ssh_key_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

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

"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/setting"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion models/token.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/go-xorm/xorm"
gouuid "github.com/satori/go.uuid"

"github.com/gogits/gogs/modules/base"
"github.com/go-gitea/gitea/modules/base"
)

// AccessToken represents a personal access token.
Expand Down
2 changes: 1 addition & 1 deletion models/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

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

"github.com/gogits/gogs/modules/log"
"github.com/go-gitea/gitea/modules/log"
)

type UpdateTask struct {
Expand Down
Loading

0 comments on commit 142d35e

Please sign in to comment.