diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-11-10 03:57:58 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-09 20:57:58 +0100 |
| commit | 99b2858e628d92bba252be72def409af77af735b (patch) | |
| tree | 56159cf10b271307911e6f01626c0c3efba789ab /services/pull/patch.go | |
| parent | b6b1e716654fec3b16d245ef65cf42e57e1bb5b6 (diff) | |
| download | gitea-99b2858e628d92bba252be72def409af77af735b.tar.gz gitea-99b2858e628d92bba252be72def409af77af735b.zip | |
Move unit into models/unit/ (#17576)
* Move unit into models/unit/
* Rename unit.UnitType as unit.Type
Diffstat (limited to 'services/pull/patch.go')
| -rw-r--r-- | services/pull/patch.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/pull/patch.go b/services/pull/patch.go index 27d7991919..b971eb4bf3 100644 --- a/services/pull/patch.go +++ b/services/pull/patch.go @@ -14,6 +14,7 @@ import ( "strings" "code.gitea.io/gitea/models" + "code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/util" @@ -142,7 +143,7 @@ func checkConflicts(pr *models.PullRequest, gitRepo *git.Repository, tmpBasePath } // 4. Now get the pull request configuration to check if we need to ignore whitespace - prUnit, err := pr.BaseRepo.GetUnit(models.UnitTypePullRequests) + prUnit, err := pr.BaseRepo.GetUnit(unit.TypePullRequests) if err != nil { return false, err } |