luckyimnotanigger/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-05-25 11:22:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

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
commit b0ddced2b5
No known key found for this signature in database
GPG key ID: BE39A108C4DDA755
168 changed files with 478 additions and 475 deletions
Download patch file Download diff file Expand all files Collapse all files

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() {

2
models/token.go
View file

@ -10,7 +10,7 @@ import (
"github.com/go-xorm/xorm"
gouuid "github.com/satori/go.uuid"
"github.com/go-gitea/gitea/modules/base"
"code.gitea.io/gitea/modules/base"
)
// AccessToken represents a personal access token.

4
models/update.go
View file

@ -10,9 +10,9 @@ import (
"os/exec"
"strings"
"github.com/go-gitea/git"
"code.gitea.io/git"
"github.com/go-gitea/gitea/modules/log"
"code.gitea.io/gitea/modules/log"
)
type UpdateTask struct {

14
models/user.go
View file

@ -24,14 +24,14 @@ import (
"github.com/go-xorm/xorm"
"github.com/nfnt/resize"
"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/avatar"
"github.com/go-gitea/gitea/modules/base"
"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/avatar"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/markdown"
"code.gitea.io/gitea/modules/setting"
)
type UserType int

10
models/webhook.go
View file

@ -15,12 +15,12 @@ import (
"github.com/go-xorm/xorm"
gouuid "github.com/satori/go.uuid"
api "github.com/go-gitea/go-sdk/gitea"
api "code.gitea.io/go-sdk/gitea"
"github.com/go-gitea/gitea/modules/httplib"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/modules/sync"
"code.gitea.io/gitea/modules/httplib"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/sync"
)
var HookQueue = sync.NewUniqueQueue(setting.Webhook.QueueLength)

6
models/webhook_slack.go
View file

@ -10,10 +10,10 @@ import (
"fmt"
"strings"
"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/setting"
"code.gitea.io/gitea/modules/setting"
)
type SlackMeta struct {

6
models/wiki.go
View file

@ -15,10 +15,10 @@ import (
"github.com/Unknwon/com"
"github.com/go-gitea/git"
"code.gitea.io/git"
"github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/modules/sync"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/sync"
)
var wikiWorkingPool = sync.NewExclusivePool()