aboutsummaryrefslogtreecommitdiff
path: root/models
diff options
context:
space:
mode:
Diffstat (limited to 'models')
-rw-r--r--models/action.go4
-rw-r--r--models/admin.go4
-rw-r--r--models/attachment.go2
-rw-r--r--models/comment.go2
-rw-r--r--models/git_diff.go6
-rw-r--r--models/issue.go4
-rw-r--r--models/issue_label.go2
-rw-r--r--models/issue_mail.go6
-rw-r--r--models/login_source.go4
-rw-r--r--models/migrations/migrations.go4
-rw-r--r--models/migrations/v15.go2
-rw-r--r--models/migrations/v16.go2
-rw-r--r--models/milestone.go2
-rw-r--r--models/mirror.go6
-rw-r--r--models/models.go2
-rw-r--r--models/pull.go6
-rw-r--r--models/release.go2
-rw-r--r--models/repo.go10
-rw-r--r--models/repo_branch.go2
-rw-r--r--models/repo_editor.go4
-rw-r--r--models/repo_test.go2
-rw-r--r--models/ssh_key.go6
-rw-r--r--models/ssh_key_test.go2
-rw-r--r--models/token.go2
-rw-r--r--models/user.go6
-rw-r--r--models/webhook.go6
-rw-r--r--models/webhook_discord.go2
-rw-r--r--models/webhook_slack.go2
-rw-r--r--models/wiki.go4
29 files changed, 54 insertions, 54 deletions
diff --git a/models/action.go b/models/action.go
index d830a36f..e1378e99 100644
--- a/models/action.go
+++ b/models/action.go
@@ -21,8 +21,8 @@ import (
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models/errors"
- "github.com/gogits/gogs/modules/base"
- "github.com/gogits/gogs/modules/setting"
+ "github.com/gogits/gogs/pkg/base"
+ "github.com/gogits/gogs/pkg/setting"
)
type ActionType int
diff --git a/models/admin.go b/models/admin.go
index 045728e4..bad7a3bf 100644
--- a/models/admin.go
+++ b/models/admin.go
@@ -15,8 +15,8 @@ import (
"github.com/go-xorm/xorm"
log "gopkg.in/clog.v1"
- "github.com/gogits/gogs/modules/base"
- "github.com/gogits/gogs/modules/setting"
+ "github.com/gogits/gogs/pkg/base"
+ "github.com/gogits/gogs/pkg/setting"
)
type NoticeType int
diff --git a/models/attachment.go b/models/attachment.go
index 4ba6adcb..583cb10b 100644
--- a/models/attachment.go
+++ b/models/attachment.go
@@ -15,7 +15,7 @@ import (
"github.com/go-xorm/xorm"
gouuid "github.com/satori/go.uuid"
- "github.com/gogits/gogs/modules/setting"
+ "github.com/gogits/gogs/pkg/setting"
)
// Attachment represent a attachment of issue/comment/release.
diff --git a/models/comment.go b/models/comment.go
index 7a46f6f8..d18b14df 100644
--- a/models/comment.go
+++ b/models/comment.go
@@ -16,7 +16,7 @@ import (
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models/errors"
- "github.com/gogits/gogs/modules/markup"
+ "github.com/gogits/gogs/pkg/markup"
)
// CommentType defines whether a comment is just a simple comment, an action (like close) or a reference.
diff --git a/models/git_diff.go b/models/git_diff.go
index 7af7ee83..f8282940 100644
--- a/models/git_diff.go
+++ b/models/git_diff.go
@@ -17,9 +17,9 @@ import (
"github.com/gogits/git-module"
- "github.com/gogits/gogs/modules/base"
- "github.com/gogits/gogs/modules/setting"
- "github.com/gogits/gogs/modules/template/highlight"
+ "github.com/gogits/gogs/pkg/base"
+ "github.com/gogits/gogs/pkg/setting"
+ "github.com/gogits/gogs/pkg/template/highlight"
)
type DiffSection struct {
diff --git a/models/issue.go b/models/issue.go
index 6bcda7a9..789165c4 100644
--- a/models/issue.go
+++ b/models/issue.go
@@ -16,8 +16,8 @@ import (
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models/errors"
- "github.com/gogits/gogs/modules/base"
- "github.com/gogits/gogs/modules/setting"
+ "github.com/gogits/gogs/pkg/base"
+ "github.com/gogits/gogs/pkg/setting"
)
var (
diff --git a/models/issue_label.go b/models/issue_label.go
index 9136b81a..096bba25 100644
--- a/models/issue_label.go
+++ b/models/issue_label.go
@@ -15,7 +15,7 @@ import (
api "github.com/gogits/go-gogs-client"
- "github.com/gogits/gogs/modules/base"
+ "github.com/gogits/gogs/pkg/base"
)
var labelColorPattern = regexp.MustCompile("#([a-fA-F0-9]{6})")
diff --git a/models/issue_mail.go b/models/issue_mail.go
index d0447261..25f580d9 100644
--- a/models/issue_mail.go
+++ b/models/issue_mail.go
@@ -10,9 +10,9 @@ import (
"github.com/Unknwon/com"
log "gopkg.in/clog.v1"
- "github.com/gogits/gogs/modules/mailer"
- "github.com/gogits/gogs/modules/markup"
- "github.com/gogits/gogs/modules/setting"
+ "github.com/gogits/gogs/pkg/mailer"
+ "github.com/gogits/gogs/pkg/markup"
+ "github.com/gogits/gogs/pkg/setting"
)
func (issue *Issue) MailSubject() string {
diff --git a/models/login_source.go b/models/login_source.go
index 29977fa3..03e6d6a3 100644
--- a/models/login_source.go
+++ b/models/login_source.go
@@ -20,8 +20,8 @@ import (
log "gopkg.in/clog.v1"
"github.com/gogits/gogs/models/errors"
- "github.com/gogits/gogs/modules/auth/ldap"
- "github.com/gogits/gogs/modules/auth/pam"
+ "github.com/gogits/gogs/pkg/auth/ldap"
+ "github.com/gogits/gogs/pkg/auth/pam"
)
type LoginType int
diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index 7acd7259..2f6f828f 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -13,7 +13,7 @@ import (
"github.com/go-xorm/xorm"
log "gopkg.in/clog.v1"
- "github.com/gogits/gogs/modules/base"
+ "github.com/gogits/gogs/pkg/base"
)
const _MIN_DB_VER = 10
@@ -105,7 +105,7 @@ Please save following instructions to somewhere and start working:
Once finished downloading,
1. Extract the archive and to upgrade steps as usual.
-2. Run it once. To verify, you should see some migration traces.
+2. Run it once. To verify, you should see some migration traces.
3. Once it starts web server successfully, stop it.
4. Now it's time to put back the release archive you originally intent to upgrade.
5. Enjoy!
diff --git a/models/migrations/v15.go b/models/migrations/v15.go
index 5d907582..65b2a313 100644
--- a/models/migrations/v15.go
+++ b/models/migrations/v15.go
@@ -15,7 +15,7 @@ import (
"github.com/go-xorm/xorm"
log "gopkg.in/clog.v1"
- "github.com/gogits/gogs/modules/setting"
+ "github.com/gogits/gogs/pkg/setting"
)
func generateAndMigrateGitHooks(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v16.go b/models/migrations/v16.go
index 1c23dc41..c5facc81 100644
--- a/models/migrations/v16.go
+++ b/models/migrations/v16.go
@@ -14,7 +14,7 @@ import (
"github.com/gogits/git-module"
- "github.com/gogits/gogs/modules/setting"
+ "github.com/gogits/gogs/pkg/setting"
)
func updateRepositorySizes(x *xorm.Engine) (err error) {
diff --git a/models/milestone.go b/models/milestone.go
index 206798e6..dbba0312 100644
--- a/models/milestone.go
+++ b/models/milestone.go
@@ -13,7 +13,7 @@ import (
api "github.com/gogits/go-gogs-client"
- "github.com/gogits/gogs/modules/setting"
+ "github.com/gogits/gogs/pkg/setting"
)
// Milestone represents a milestone of repository.
diff --git a/models/mirror.go b/models/mirror.go
index 2200d777..4820520e 100644
--- a/models/mirror.go
+++ b/models/mirror.go
@@ -17,9 +17,9 @@ import (
"github.com/gogits/git-module"
"github.com/gogits/gogs/models/errors"
- "github.com/gogits/gogs/modules/process"
- "github.com/gogits/gogs/modules/setting"
- "github.com/gogits/gogs/modules/sync"
+ "github.com/gogits/gogs/pkg/process"
+ "github.com/gogits/gogs/pkg/setting"
+ "github.com/gogits/gogs/pkg/sync"
)
var MirrorQueue = sync.NewUniqueQueue(setting.Repository.MirrorQueueLength)
diff --git a/models/models.go b/models/models.go
index 1d0d5740..2eea56b1 100644
--- a/models/models.go
+++ b/models/models.go
@@ -24,7 +24,7 @@ import (
log "gopkg.in/clog.v1"
"github.com/gogits/gogs/models/migrations"
- "github.com/gogits/gogs/modules/setting"
+ "github.com/gogits/gogs/pkg/setting"
)
// Engine represents a xorm engine or session.
diff --git a/models/pull.go b/models/pull.go
index f46d69fc..5f7cbb57 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -19,9 +19,9 @@ import (
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models/errors"
- "github.com/gogits/gogs/modules/process"
- "github.com/gogits/gogs/modules/setting"
- "github.com/gogits/gogs/modules/sync"
+ "github.com/gogits/gogs/pkg/process"
+ "github.com/gogits/gogs/pkg/setting"
+ "github.com/gogits/gogs/pkg/sync"
)
var PullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength)
diff --git a/models/release.go b/models/release.go
index 993fa19a..1d387fb4 100644
--- a/models/release.go
+++ b/models/release.go
@@ -17,7 +17,7 @@ import (
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models/errors"
- "github.com/gogits/gogs/modules/process"
+ "github.com/gogits/gogs/pkg/process"
)
// Release represents a release of repository.
diff --git a/models/repo.go b/models/repo.go
index b12ed58e..c9cf64c5 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -27,11 +27,11 @@ import (
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models/errors"
- "github.com/gogits/gogs/modules/bindata"
- "github.com/gogits/gogs/modules/markup"
- "github.com/gogits/gogs/modules/process"
- "github.com/gogits/gogs/modules/setting"
- "github.com/gogits/gogs/modules/sync"
+ "github.com/gogits/gogs/pkg/bindata"
+ "github.com/gogits/gogs/pkg/markup"
+ "github.com/gogits/gogs/pkg/process"
+ "github.com/gogits/gogs/pkg/setting"
+ "github.com/gogits/gogs/pkg/sync"
)
var repoWorkingPool = sync.NewExclusivePool()
diff --git a/models/repo_branch.go b/models/repo_branch.go
index de0ee26d..b0c7d55d 100644
--- a/models/repo_branch.go
+++ b/models/repo_branch.go
@@ -11,7 +11,7 @@ import (
"github.com/Unknwon/com"
"github.com/gogits/git-module"
- "github.com/gogits/gogs/modules/base"
+ "github.com/gogits/gogs/pkg/base"
)
type Branch struct {
diff --git a/models/repo_editor.go b/models/repo_editor.go
index a9990c99..3d01de6e 100644
--- a/models/repo_editor.go
+++ b/models/repo_editor.go
@@ -21,8 +21,8 @@ import (
git "github.com/gogits/git-module"
- "github.com/gogits/gogs/modules/process"
- "github.com/gogits/gogs/modules/setting"
+ "github.com/gogits/gogs/pkg/process"
+ "github.com/gogits/gogs/pkg/setting"
)
// ___________ .___.__ __ ___________.__.__
diff --git a/models/repo_test.go b/models/repo_test.go
index 2da5d839..76025a4c 100644
--- a/models/repo_test.go
+++ b/models/repo_test.go
@@ -6,7 +6,7 @@ import (
. "github.com/smartystreets/goconvey/convey"
. "github.com/gogits/gogs/models"
- "github.com/gogits/gogs/modules/markup"
+ "github.com/gogits/gogs/pkg/markup"
)
func TestRepo(t *testing.T) {
diff --git a/models/ssh_key.go b/models/ssh_key.go
index aedf42b9..b8a5095b 100644
--- a/models/ssh_key.go
+++ b/models/ssh_key.go
@@ -23,9 +23,9 @@ import (
"golang.org/x/crypto/ssh"
log "gopkg.in/clog.v1"
- "github.com/gogits/gogs/modules/base"
- "github.com/gogits/gogs/modules/process"
- "github.com/gogits/gogs/modules/setting"
+ "github.com/gogits/gogs/pkg/base"
+ "github.com/gogits/gogs/pkg/process"
+ "github.com/gogits/gogs/pkg/setting"
)
const (
diff --git a/models/ssh_key_test.go b/models/ssh_key_test.go
index 1cda60c5..537f16b0 100644
--- a/models/ssh_key_test.go
+++ b/models/ssh_key_test.go
@@ -11,7 +11,7 @@ import (
. "github.com/smartystreets/goconvey/convey"
- "github.com/gogits/gogs/modules/setting"
+ "github.com/gogits/gogs/pkg/setting"
)
func init() {
diff --git a/models/token.go b/models/token.go
index d47545ae..c18a6616 100644
--- a/models/token.go
+++ b/models/token.go
@@ -10,7 +10,7 @@ import (
"github.com/go-xorm/xorm"
gouuid "github.com/satori/go.uuid"
- "github.com/gogits/gogs/modules/base"
+ "github.com/gogits/gogs/pkg/base"
)
// AccessToken represents a personal access token.
diff --git a/models/user.go b/models/user.go
index dadda252..13f37f6b 100644
--- a/models/user.go
+++ b/models/user.go
@@ -30,9 +30,9 @@ import (
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models/errors"
- "github.com/gogits/gogs/modules/avatar"
- "github.com/gogits/gogs/modules/base"
- "github.com/gogits/gogs/modules/setting"
+ "github.com/gogits/gogs/pkg/avatar"
+ "github.com/gogits/gogs/pkg/base"
+ "github.com/gogits/gogs/pkg/setting"
)
type UserType int
diff --git a/models/webhook.go b/models/webhook.go
index a1f8c343..e4e77490 100644
--- a/models/webhook.go
+++ b/models/webhook.go
@@ -22,9 +22,9 @@ import (
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models/errors"
- "github.com/gogits/gogs/modules/httplib"
- "github.com/gogits/gogs/modules/setting"
- "github.com/gogits/gogs/modules/sync"
+ "github.com/gogits/gogs/pkg/httplib"
+ "github.com/gogits/gogs/pkg/setting"
+ "github.com/gogits/gogs/pkg/sync"
)
var HookQueue = sync.NewUniqueQueue(setting.Webhook.QueueLength)
diff --git a/models/webhook_discord.go b/models/webhook_discord.go
index e403399a..e452043c 100644
--- a/models/webhook_discord.go
+++ b/models/webhook_discord.go
@@ -13,7 +13,7 @@ import (
"github.com/gogits/git-module"
api "github.com/gogits/go-gogs-client"
- "github.com/gogits/gogs/modules/setting"
+ "github.com/gogits/gogs/pkg/setting"
)
type DiscordEmbedFooterObject struct {
diff --git a/models/webhook_slack.go b/models/webhook_slack.go
index 46e8ef9a..e092d221 100644
--- a/models/webhook_slack.go
+++ b/models/webhook_slack.go
@@ -12,7 +12,7 @@ import (
"github.com/gogits/git-module"
api "github.com/gogits/go-gogs-client"
- "github.com/gogits/gogs/modules/setting"
+ "github.com/gogits/gogs/pkg/setting"
)
type SlackMeta struct {
diff --git a/models/wiki.go b/models/wiki.go
index 20285e3d..24d07938 100644
--- a/models/wiki.go
+++ b/models/wiki.go
@@ -17,8 +17,8 @@ import (
"github.com/gogits/git-module"
- "github.com/gogits/gogs/modules/setting"
- "github.com/gogits/gogs/modules/sync"
+ "github.com/gogits/gogs/pkg/setting"
+ "github.com/gogits/gogs/pkg/sync"
)
var wikiWorkingPool = sync.NewExclusivePool()
Powered by cgit, Themed by Ted Yin.