aboutsummaryrefslogtreecommitdiffstats
path: root/models
diff options
context:
space:
mode:
Diffstat (limited to 'models')
-rw-r--r--models/action.go2
-rw-r--r--models/action_test.go2
-rw-r--r--models/git_diff.go2
-rw-r--r--models/gpg_key.go2
-rw-r--r--models/graph.go2
-rw-r--r--models/graph_test.go2
-rw-r--r--models/issue_comment.go2
-rw-r--r--models/migrations/v28.go2
-rw-r--r--models/migrations/v39.go2
-rw-r--r--models/migrations/v82.go2
-rw-r--r--models/pull.go2
-rw-r--r--models/release.go4
-rw-r--r--models/release_test.go2
-rw-r--r--models/repo.go2
-rw-r--r--models/repo_branch.go2
-rw-r--r--models/repo_indexer.go2
-rw-r--r--models/repo_mirror.go2
-rw-r--r--models/repo_tag.go2
-rw-r--r--models/status.go2
-rw-r--r--models/update.go2
-rw-r--r--models/update_test.go2
-rw-r--r--models/user.go2
-rw-r--r--models/webhook_dingtalk.go3
-rw-r--r--models/webhook_discord.go2
-rw-r--r--models/webhook_slack.go2
-rw-r--r--models/wiki.go7
26 files changed, 30 insertions, 30 deletions
diff --git a/models/action.go b/models/action.go
index 2cd3616d63..d4cc4086db 100644
--- a/models/action.go
+++ b/models/action.go
@@ -14,8 +14,8 @@ import (
"time"
"unicode"
- "code.gitea.io/git"
"code.gitea.io/gitea/modules/base"
+ "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
diff --git a/models/action_test.go b/models/action_test.go
index 96d6ddb6dd..e30b706809 100644
--- a/models/action_test.go
+++ b/models/action_test.go
@@ -6,7 +6,7 @@ import (
"strings"
"testing"
- "code.gitea.io/git"
+ "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/setting"
"github.com/stretchr/testify/assert"
diff --git a/models/git_diff.go b/models/git_diff.go
index 2e76e56bea..ac2a5f90d7 100644
--- a/models/git_diff.go
+++ b/models/git_diff.go
@@ -19,8 +19,8 @@ import (
"strconv"
"strings"
- "code.gitea.io/git"
"code.gitea.io/gitea/modules/base"
+ "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/highlight"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process"
diff --git a/models/gpg_key.go b/models/gpg_key.go
index c9b57caaa6..03b0fd0f69 100644
--- a/models/gpg_key.go
+++ b/models/gpg_key.go
@@ -15,7 +15,7 @@ import (
"strings"
"time"
- "code.gitea.io/git"
+ "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/util"
diff --git a/models/graph.go b/models/graph.go
index 90b9ff11f8..5f68abaf74 100644
--- a/models/graph.go
+++ b/models/graph.go
@@ -8,7 +8,7 @@ import (
"fmt"
"strings"
- "code.gitea.io/git"
+ "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/setting"
)
diff --git a/models/graph_test.go b/models/graph_test.go
index 0f6e338792..5c78e3877b 100644
--- a/models/graph_test.go
+++ b/models/graph_test.go
@@ -8,7 +8,7 @@ import (
"fmt"
"testing"
- "code.gitea.io/git"
+ "code.gitea.io/gitea/modules/git"
)
func BenchmarkGetCommitGraph(b *testing.B) {
diff --git a/models/issue_comment.go b/models/issue_comment.go
index c3654460ff..d4a3d26a78 100644
--- a/models/issue_comment.go
+++ b/models/issue_comment.go
@@ -11,7 +11,7 @@ import (
"fmt"
"strings"
- "code.gitea.io/git"
+ "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/markup/markdown"
"code.gitea.io/gitea/modules/setting"
"github.com/Unknwon/com"
diff --git a/models/migrations/v28.go b/models/migrations/v28.go
index e9db42004d..a30cbf2afb 100644
--- a/models/migrations/v28.go
+++ b/models/migrations/v28.go
@@ -10,7 +10,7 @@ import (
"path/filepath"
"strings"
- "code.gitea.io/git"
+ "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
diff --git a/models/migrations/v39.go b/models/migrations/v39.go
index 9fb7390c7d..1312cb3313 100644
--- a/models/migrations/v39.go
+++ b/models/migrations/v39.go
@@ -7,8 +7,8 @@ package migrations
import (
"fmt"
- "code.gitea.io/git"
"code.gitea.io/gitea/models"
+ "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"github.com/go-xorm/xorm"
diff --git a/models/migrations/v82.go b/models/migrations/v82.go
index be9e71fd83..eb73f18343 100644
--- a/models/migrations/v82.go
+++ b/models/migrations/v82.go
@@ -7,8 +7,8 @@ package migrations
import (
"fmt"
- "code.gitea.io/git"
"code.gitea.io/gitea/models"
+ "code.gitea.io/gitea/modules/git"
"github.com/go-xorm/xorm"
)
diff --git a/models/pull.go b/models/pull.go
index 35fbc41788..ef3ec8e145 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -16,9 +16,9 @@ import (
"strings"
"time"
- "code.gitea.io/git"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/cache"
+ "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting"
diff --git a/models/release.go b/models/release.go
index 0c78707d6b..f147016b13 100644
--- a/models/release.go
+++ b/models/release.go
@@ -9,13 +9,13 @@ import (
"sort"
"strings"
- "code.gitea.io/git"
+ "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
-
api "code.gitea.io/sdk/gitea"
+
"github.com/go-xorm/builder"
)
diff --git a/models/release_test.go b/models/release_test.go
index de34109e8c..39c6613054 100644
--- a/models/release_test.go
+++ b/models/release_test.go
@@ -7,7 +7,7 @@ package models
import (
"testing"
- "code.gitea.io/git"
+ "code.gitea.io/gitea/modules/git"
"github.com/stretchr/testify/assert"
)
diff --git a/models/repo.go b/models/repo.go
index 9a85c77f0c..19526fb17c 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -21,7 +21,7 @@ import (
"strings"
"time"
- "code.gitea.io/git"
+ "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/markup"
"code.gitea.io/gitea/modules/options"
diff --git a/models/repo_branch.go b/models/repo_branch.go
index c4013dfb82..9ea4ce45fb 100644
--- a/models/repo_branch.go
+++ b/models/repo_branch.go
@@ -8,7 +8,7 @@ import (
"fmt"
"time"
- "code.gitea.io/git"
+ "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/setting"
"github.com/Unknwon/com"
diff --git a/models/repo_indexer.go b/models/repo_indexer.go
index b4f7bf1bd7..bfeeca26e9 100644
--- a/models/repo_indexer.go
+++ b/models/repo_indexer.go
@@ -9,8 +9,8 @@ import (
"strconv"
"strings"
- "code.gitea.io/git"
"code.gitea.io/gitea/modules/base"
+ "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/indexer"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
diff --git a/models/repo_mirror.go b/models/repo_mirror.go
index 9f8c9bee65..c3fc9a43db 100644
--- a/models/repo_mirror.go
+++ b/models/repo_mirror.go
@@ -10,8 +10,8 @@ import (
"strings"
"time"
- "code.gitea.io/git"
"code.gitea.io/gitea/modules/cache"
+ "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting"
diff --git a/models/repo_tag.go b/models/repo_tag.go
index 752eaf0282..fa3f19bb29 100644
--- a/models/repo_tag.go
+++ b/models/repo_tag.go
@@ -5,7 +5,7 @@
package models
import (
- "code.gitea.io/git"
+ "code.gitea.io/gitea/modules/git"
)
// GetTagsByPath returns repo tags by it's path
diff --git a/models/status.go b/models/status.go
index 91d011f7c5..93d82b76fc 100644
--- a/models/status.go
+++ b/models/status.go
@@ -9,7 +9,7 @@ import (
"fmt"
"strings"
- "code.gitea.io/git"
+ "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
diff --git a/models/update.go b/models/update.go
index 9cd4d0d977..cde6b217c1 100644
--- a/models/update.go
+++ b/models/update.go
@@ -11,8 +11,8 @@ import (
"strings"
"time"
- "code.gitea.io/git"
"code.gitea.io/gitea/modules/cache"
+ "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/util"
)
diff --git a/models/update_test.go b/models/update_test.go
index 45451ee437..f2219a4e68 100644
--- a/models/update_test.go
+++ b/models/update_test.go
@@ -9,7 +9,7 @@ import (
"testing"
"time"
- "code.gitea.io/git"
+ "code.gitea.io/gitea/modules/git"
"github.com/stretchr/testify/assert"
)
diff --git a/models/user.go b/models/user.go
index 8fc15848c8..b831a2ebfe 100644
--- a/models/user.go
+++ b/models/user.go
@@ -25,10 +25,10 @@ import (
"time"
"unicode/utf8"
- "code.gitea.io/git"
"code.gitea.io/gitea/modules/avatar"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/generate"
+ "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/structs"
diff --git a/models/webhook_dingtalk.go b/models/webhook_dingtalk.go
index 1021ab35f1..7086732707 100644
--- a/models/webhook_dingtalk.go
+++ b/models/webhook_dingtalk.go
@@ -9,8 +9,9 @@ import (
"fmt"
"strings"
- "code.gitea.io/git"
+ "code.gitea.io/gitea/modules/git"
api "code.gitea.io/sdk/gitea"
+
dingtalk "github.com/lunny/dingtalk_webhook"
)
diff --git a/models/webhook_discord.go b/models/webhook_discord.go
index 893e780965..8f1cb16940 100644
--- a/models/webhook_discord.go
+++ b/models/webhook_discord.go
@@ -11,7 +11,7 @@ import (
"strconv"
"strings"
- "code.gitea.io/git"
+ "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/sdk/gitea"
)
diff --git a/models/webhook_slack.go b/models/webhook_slack.go
index 90d5ccce0b..2bb84c2c4b 100644
--- a/models/webhook_slack.go
+++ b/models/webhook_slack.go
@@ -10,7 +10,7 @@ import (
"fmt"
"strings"
- "code.gitea.io/git"
+ "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/sdk/gitea"
)
diff --git a/models/wiki.go b/models/wiki.go
index 65cf26a44c..0f5cdc20bd 100644
--- a/models/wiki.go
+++ b/models/wiki.go
@@ -13,12 +13,11 @@ import (
"path/filepath"
"strings"
- "github.com/Unknwon/com"
-
- "code.gitea.io/git"
-
+ "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/sync"
+
+ "github.com/Unknwon/com"
)
var (