lianguan/gitea
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into feature/rewrite-xorm-queries

Browse Source 
# Conflicts:
#	models/git_diff.go
#	models/issue.go
#	models/org.go
#	models/pull.go
#	models/repo.go
This commit is contained in:
Thibault Meyer
2016-11-10 21:05:52 +01:00
parent a4454f5d0f 4247304f5a
commit b0ddced2b5
168 changed files with 478 additions and 475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -1,5 +1,7 @@
language: go
go_import_path: code.gitea.io/gitea
go:
- 1.6
- 1.7

6
Makefile
View File

@ -2,7 +2,7 @@ DIST := dist
BIN := bin
EXECUTABLE := gitea
IMPORT := github.com/go-gitea/gitea
IMPORT := code.gitea.io/gitea
SHA := $(shell git rev-parse --short HEAD)
DATE := $(shell date -u '+%Y-%m-%d %I:%M:%S %Z')
@ -11,8 +11,8 @@ BINDATA := $(shell find conf | sed 's/ /\\ /g')
STYLESHEETS := $(wildcard public/less/index.less public/less/_*.less)
JAVASCRIPTS :=
LDFLAGS += -X "github.com/go-gitea/gitea/modules/setting.BuildTime=$(DATE)"
LDFLAGS += -X "github.com/go-gitea/gitea/modules/setting.BuildGitHash=$(SHA)"
LDFLAGS += -X "code.gitea.io/gitea/modules/setting.BuildTime=$(DATE)"
LDFLAGS += -X "code.gitea.io/gitea/modules/setting.BuildGitHash=$(SHA)"
TARGETS ?= linux/*,darwin/*,windows/*
PACKAGES ?= $(shell go list ./... | grep -v /vendor/)

4
cmd/admin.go
View File

@ -9,8 +9,8 @@ import (
"github.com/urfave/cli"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/setting"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/setting"
)
var (

4
cmd/dump.go
View File

@ -13,8 +13,8 @@ import (
"time"
"github.com/Unknwon/cae/zip"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/setting"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/setting"
"github.com/urfave/cli"
)

12
cmd/serve.go
View File

@ -14,12 +14,12 @@ import (
"time"
"github.com/Unknwon/com"
"github.com/go-gitea/git"
"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"
"code.gitea.io/git"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/httplib"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
gouuid "github.com/satori/go.uuid"
"github.com/urfave/cli"
)

6
cmd/update.go
View File

@ -9,9 +9,9 @@ import (
"github.com/urfave/cli"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
)
// CmdUpdate represents the available update sub-command.

32
cmd/web.go
View File

@ -15,21 +15,21 @@ import (
"path"
"strings"
"github.com/go-gitea/git"
"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"
"code.gitea.io/git"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/auth"
"code.gitea.io/gitea/modules/bindata"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/template"
"code.gitea.io/gitea/routers"
"code.gitea.io/gitea/routers/admin"
apiv1 "code.gitea.io/gitea/routers/api/v1"
"code.gitea.io/gitea/routers/dev"
"code.gitea.io/gitea/routers/org"
"code.gitea.io/gitea/routers/repo"
"code.gitea.io/gitea/routers/user"
"github.com/go-macaron/binding"
"github.com/go-macaron/cache"
"github.com/go-macaron/captcha"
@ -100,7 +100,7 @@ func checkVersion() {
{"github.com/go-macaron/toolbox", toolbox.Version, "0.1.0"},
{"gopkg.in/ini.v1", ini.Version, "1.8.4"},
{"gopkg.in/macaron.v1", macaron.Version, "1.1.7"},
{"github.com/go-gitea/git", git.Version, "0.4.1"},
{"code.gitea.io/git", git.Version, "0.4.1"},
}
for _, c := range checkers {
if !version.Compare(c.Version(), c.Expected, ">=") {

4
main.go
View File

@ -10,8 +10,8 @@ import (
"os"
"runtime"
"github.com/go-gitea/gitea/cmd"
"github.com/go-gitea/gitea/modules/setting"
"code.gitea.io/gitea/cmd"
"code.gitea.io/gitea/modules/setting"
"github.com/urfave/cli"
)

2
models/access.go
View File

@ -7,7 +7,7 @@ package models
import (
"fmt"
"github.com/go-gitea/gitea/modules/log"
"code.gitea.io/gitea/modules/log"
)
type AccessMode int

10
models/action.go
View File

@ -16,12 +16,12 @@ import (
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
"github.com/go-gitea/git"
api "github.com/go-gitea/go-sdk/gitea"
"code.gitea.io/git"
api "code.gitea.io/go-sdk/gitea"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
)
type ActionType int

6
models/admin.go
View File

@ -14,9 +14,9 @@ import (
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
)
type NoticeType int

12
models/git_diff.go
View File

@ -17,12 +17,12 @@ import (
"strings"
"github.com/Unknwon/com"
"github.com/go-gitea/git"
"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"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/template/highlight"
"code.gitea.io/git"
"github.com/sergi/go-diff/diffmatchpatch"
"golang.org/x/net/html/charset"
"golang.org/x/text/transform"

8
models/issue.go
View File

@ -15,13 +15,13 @@ import (
"time"
"github.com/Unknwon/com"
api "github.com/go-gitea/go-sdk/gitea"
"github.com/go-xorm/xorm"
api "code.gitea.io/go-sdk/gitea"
gouuid "github.com/satori/go.uuid"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
)
var (

6
models/issue_comment.go
View File

@ -12,10 +12,10 @@ import (
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
api "github.com/go-gitea/go-sdk/gitea"
api "code.gitea.io/go-sdk/gitea"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/markdown"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/markdown"
)
// CommentType defines whether a comment is just a simple comment, an action (like close) or a reference.

4
models/issue_label.go
View File

@ -13,9 +13,9 @@ import (
"github.com/go-xorm/xorm"
api "github.com/go-gitea/go-sdk/gitea"
api "code.gitea.io/go-sdk/gitea"
"github.com/go-gitea/gitea/modules/base"
"code.gitea.io/gitea/modules/base"
)
var labelColorPattern = regexp.MustCompile("#([a-fA-F0-9]{6})")

6
models/issue_mail.go
View File

@ -9,9 +9,9 @@ import (
"github.com/Unknwon/com"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/markdown"
"github.com/go-gitea/gitea/modules/setting"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/markdown"
"code.gitea.io/gitea/modules/setting"
)
func (issue *Issue) MailSubject() string {

6
models/login_source.go
View File

@ -19,9 +19,9 @@ import (
"github.com/go-xorm/core"
"github.com/go-xorm/xorm"
"github.com/go-gitea/gitea/modules/auth/ldap"
"github.com/go-gitea/gitea/modules/auth/pam"
"github.com/go-gitea/gitea/modules/log"
"code.gitea.io/gitea/modules/auth/ldap"
"code.gitea.io/gitea/modules/auth/pam"
"code.gitea.io/gitea/modules/log"
)
type LoginType int

10
models/mail.go
View File

@ -12,11 +12,11 @@ import (
"gopkg.in/gomail.v2"
"gopkg.in/macaron.v1"
"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"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/mailer"
"code.gitea.io/gitea/modules/markdown"
"code.gitea.io/gitea/modules/setting"
)
const (

6
models/migrations/migrations.go
View File

@ -20,9 +20,9 @@ import (
gouuid "github.com/satori/go.uuid"
"gopkg.in/ini.v1"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
)
const _MIN_DB_VER = 4

4
models/models.go
View File

@ -18,8 +18,8 @@ import (
"github.com/go-xorm/xorm"
_ "github.com/lib/pq"
"github.com/go-gitea/gitea/models/migrations"
"github.com/go-gitea/gitea/modules/setting"
"code.gitea.io/gitea/models/migrations"
"code.gitea.io/gitea/modules/setting"
)
// Engine represents a xorm engine or session.

3
models/org.go
View File

@ -12,7 +12,8 @@ import (
"github.com/go-xorm/xorm"
"github.com/go-gitea/gitea/modules/base"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/log"
)
var (

12
models/pull.go
View File

@ -12,13 +12,13 @@ import (
"time"
"github.com/Unknwon/com"
"github.com/go-gitea/git"
"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"
api "github.com/go-gitea/go-sdk/gitea"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/sync"
"github.com/go-xorm/xorm"
"code.gitea.io/git"
api "code.gitea.io/go-sdk/gitea"
)
var PullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength)

4
models/release.go
View File

@ -12,9 +12,9 @@ import (
"github.com/go-xorm/xorm"
"github.com/go-gitea/git"
"code.gitea.io/git"
"github.com/go-gitea/gitea/modules/process"
"code.gitea.io/gitea/modules/process"
)
// Release represents a release of repository.

16
models/repo.go
View File

@ -21,15 +21,15 @@ import (
"github.com/Unknwon/cae/zip"
"github.com/Unknwon/com"
"github.com/go-gitea/git"
"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"
api "github.com/go-gitea/go-sdk/gitea"
"code.gitea.io/gitea/modules/bindata"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/markdown"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/sync"
"github.com/go-xorm/xorm"
"code.gitea.io/git"
api "code.gitea.io/go-sdk/gitea"
version "github.com/mcuadros/go-version"
ini "gopkg.in/ini.v1"
)

2
models/repo_branch.go
View File

@ -5,7 +5,7 @@
package models
import (
"github.com/go-gitea/git"
"code.gitea.io/git"
)
type Branch struct {

8
models/repo_editor.go
View File

@ -18,11 +18,11 @@ import (
"github.com/Unknwon/com"
gouuid "github.com/satori/go.uuid"
"github.com/go-gitea/git"
"code.gitea.io/git"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/process"
"github.com/go-gitea/gitea/modules/setting"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting"
)
// ___________ .___.__ __ ___________.__.__

8
models/repo_mirror.go
View File

@ -13,10 +13,10 @@ import (
"github.com/go-xorm/xorm"
"gopkg.in/ini.v1"
"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"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/sync"
)
var MirrorQueue = sync.NewUniqueQueue(setting.Repository.MirrorQueueLength)

4
models/repo_test.go
View File

@ -3,8 +3,8 @@ package models_test
import (
"testing"
. "github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/markdown"
. "code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/markdown"
. "github.com/smartystreets/goconvey/convey"
)

8
models/ssh_key.go
View File

@ -22,10 +22,10 @@ import (
"github.com/go-xorm/xorm"
"golang.org/x/crypto/ssh"
"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"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting"
)
const (

2
models/ssh_key_test.go
View File

@ -11,7 +11,7 @@ import (
. "github.com/smartystreets/goconvey/convey"
"github.com/go-gitea/gitea/modules/setting"
"code.gitea.io/gitea/modules/setting"
)
func init() {

Some files were not shown because too many files have changed in this diff Show More