Skip to content

Commit 1a5635a

Browse files
jolheiserjolheiser
committed
This is a mess
1 parent 8d43563 commit 1a5635a

File tree

681 files changed

+2243
-2232
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

681 files changed

+2243
-2232
lines changed

‎.drone.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ platform:
88

99
workspace:
1010
base: /go
11-
path: src/code.gitea.io/gitea
11+
path: src/github.com/jolheiser/gitea
1212

1313
steps:
1414
- name: pre-build
@@ -57,7 +57,7 @@ platform:
5757

5858
workspace:
5959
base: /go
60-
path: src/code.gitea.io/gitea
60+
path: src/github.com/jolheiser/gitea
6161

6262
services:
6363
- name: mysql
@@ -215,7 +215,7 @@ platform:
215215

216216
workspace:
217217
base: /go
218-
path: src/code.gitea.io/gitea
218+
path: src/github.com/jolheiser/gitea
219219

220220
services:
221221
- name: pgsql
@@ -287,7 +287,7 @@ platform:
287287

288288
workspace:
289289
base: /go
290-
path: src/code.gitea.io/gitea
290+
path: src/github.com/jolheiser/gitea
291291

292292
trigger:
293293
branch:
@@ -349,7 +349,7 @@ platform:
349349

350350
workspace:
351351
base: /go
352-
path: src/code.gitea.io/gitea
352+
path: src/github.com/jolheiser/gitea
353353

354354
trigger:
355355
branch:
@@ -451,7 +451,7 @@ platform:
451451

452452
workspace:
453453
base: /go
454-
path: src/code.gitea.io/gitea
454+
path: src/github.com/jolheiser/gitea
455455

456456
trigger:
457457
event:
@@ -564,7 +564,7 @@ platform:
564564

565565
workspace:
566566
base: /go
567-
path: src/code.gitea.io/gitea
567+
path: src/github.com/jolheiser/gitea
568568

569569
depends_on:
570570
- testing-amd64
@@ -610,7 +610,7 @@ platform:
610610

611611
workspace:
612612
base: /go
613-
path: src/code.gitea.io/gitea
613+
path: src/github.com/jolheiser/gitea
614614

615615
depends_on:
616616
- compliance
@@ -643,7 +643,7 @@ platform:
643643

644644
workspace:
645645
base: /go
646-
path: src/code.gitea.io/gitea
646+
path: src/github.com/jolheiser/gitea
647647

648648
depends_on:
649649
- testing-amd64

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,6 @@ prime/
8383
*.snap-build
8484
*_source.tar.bz2
8585
.DS_Store
86+
87+
# SDK
88+
vendor/github.com/jolheiser/gitea/sdk

‎CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1254,7 +1254,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
12541254
* Drop the docker Makefile from the image (#6507)
12551255
* Add make version on gitea version (#6485)
12561256
* Fix #6468 - Uses space match and adds newline for all sed flavors (#6473)
1257-
* Move code.gitea.io/git to code.gitea.io/gitea/modules/git (#6364)
1257+
* Move code.gitea.io/git to github.com/jolheiser/gitea/modules/git (#6364)
12581258
* Update npm dependencies and various tweaks (#7344)
12591259
* Fix updated drone file (#7336)
12601260
* Add 'npm' and 'npm-update' make targets and lockfile (#7246)

‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ import (
146146
"fmt"
147147

148148
// local packages
149-
"code.gitea.io/gitea/models"
149+
"github.com/jolheiser/gitea/models"
150150
"code.gitea.io/sdk/gitea"
151151

152152
// external packages

‎Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ ENV TAGS "bindata $TAGS"
1414
RUN apk --no-cache add build-base git nodejs npm
1515

1616
#Setup repo
17-
COPY . ${GOPATH}/src/code.gitea.io/gitea
18-
WORKDIR ${GOPATH}/src/code.gitea.io/gitea
17+
COPY . ${GOPATH}/src/github.com/jolheiser/gitea
18+
WORKDIR ${GOPATH}/src/github.com/jolheiser/gitea
1919

2020
#Checkout version if set
2121
RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
@@ -60,5 +60,5 @@ ENTRYPOINT ["/usr/bin/entrypoint"]
6060
CMD ["/bin/s6-svscan", "/etc/s6"]
6161

6262
COPY docker/root /
63-
COPY --from=build-env /go/src/code.gitea.io/gitea/gitea /app/gitea/gitea
63+
COPY --from=build-env /go/src/github.com/jolheiser/gitea/gitea /app/gitea/gitea
6464
RUN ln -s /app/gitea/gitea /usr/local/bin/gitea

‎Makefile

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
DIST := dist
2-
IMPORT := code.gitea.io/gitea
2+
IMPORT := github.com/jolheiser/gitea
33
export GO111MODULE=off
44

55
GO ?= go
@@ -48,7 +48,7 @@ endif
4848

4949
LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)"
5050

51-
PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations/migration-test,$(filter-out code.gitea.io/gitea/integrations,$(shell GO111MODULE=on $(GO) list -mod=vendor ./... | grep -v /vendor/)))
51+
PACKAGES ?= $(filter-out github.com/jolheiser/gitea/integrations/migration-test,$(filter-out github.com/jolheiser/gitea/integrations,$(shell GO111MODULE=on $(GO) list -mod=vendor ./... | grep -v /vendor/)))
5252

5353
GO_SOURCES ?= $(shell find . -name "*.go" -type f)
5454
WEBPACK_SOURCES ?= $(shell find web_src/js web_src/css web_src/less -type f)
@@ -375,42 +375,42 @@ integration-test-coverage: integrations.cover.test generate-ini-mysql
375375
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.cover.test -test.coverprofile=integration.coverage.out
376376

377377
integrations.mysql.test: git-check $(GO_SOURCES)
378-
GO111MODULE=on $(GO) test $(GOTESTFLAGS) -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.mysql.test
378+
GO111MODULE=on $(GO) test $(GOTESTFLAGS) -mod=vendor -c github.com/jolheiser/gitea/integrations -o integrations.mysql.test
379379

380380
integrations.mysql8.test: git-check $(GO_SOURCES)
381-
GO111MODULE=on $(GO) test $(GOTESTFLAGS) -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.mysql8.test
381+
GO111MODULE=on $(GO) test $(GOTESTFLAGS) -mod=vendor -c github.com/jolheiser/gitea/integrations -o integrations.mysql8.test
382382

383383
integrations.pgsql.test: git-check $(GO_SOURCES)
384-
GO111MODULE=on $(GO) test $(GOTESTFLAGS) -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.pgsql.test
384+
GO111MODULE=on $(GO) test $(GOTESTFLAGS) -mod=vendor -c github.com/jolheiser/gitea/integrations -o integrations.pgsql.test
385385

386386
integrations.mssql.test: git-check $(GO_SOURCES)
387-
GO111MODULE=on $(GO) test $(GOTESTFLAGS) -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.mssql.test
387+
GO111MODULE=on $(GO) test $(GOTESTFLAGS) -mod=vendor -c github.com/jolheiser/gitea/integrations -o integrations.mssql.test
388388

389389
integrations.sqlite.test: git-check $(GO_SOURCES)
390-
GO111MODULE=on $(GO) test $(GOTESTFLAGS) -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.sqlite.test -tags 'sqlite sqlite_unlock_notify'
390+
GO111MODULE=on $(GO) test $(GOTESTFLAGS) -mod=vendor -c github.com/jolheiser/gitea/integrations -o integrations.sqlite.test -tags 'sqlite sqlite_unlock_notify'
391391

392392
integrations.cover.test: git-check $(GO_SOURCES)
393-
GO111MODULE=on $(GO) test $(GOTESTFLAGS) -mod=vendor -c code.gitea.io/gitea/integrations -coverpkg $(shell echo $(PACKAGES) | tr ' ' ',') -o integrations.cover.test
393+
GO111MODULE=on $(GO) test $(GOTESTFLAGS) -mod=vendor -c github.com/jolheiser/gitea/integrations -coverpkg $(shell echo $(PACKAGES) | tr ' ' ',') -o integrations.cover.test
394394

395395
.PHONY: migrations.mysql.test
396396
migrations.mysql.test: $(GO_SOURCES)
397-
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/integrations/migration-test -o migrations.mysql.test
397+
$(GO) test $(GOTESTFLAGS) -c github.com/jolheiser/gitea/integrations/migration-test -o migrations.mysql.test
398398

399399
.PHONY: migrations.mysql8.test
400400
migrations.mysql8.test: $(GO_SOURCES)
401-
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/integrations/migration-test -o migrations.mysql8.test
401+
$(GO) test $(GOTESTFLAGS) -c github.com/jolheiser/gitea/integrations/migration-test -o migrations.mysql8.test
402402

403403
.PHONY: migrations.pgsql.test
404404
migrations.pgsql.test: $(GO_SOURCES)
405-
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/integrations/migration-test -o migrations.pgsql.test
405+
$(GO) test $(GOTESTFLAGS) -c github.com/jolheiser/gitea/integrations/migration-test -o migrations.pgsql.test
406406

407407
.PHONY: migrations.mssql.test
408408
migrations.mssql.test: $(GO_SOURCES)
409-
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/integrations/migration-test -o migrations.mssql.test
409+
$(GO) test $(GOTESTFLAGS) -c github.com/jolheiser/gitea/integrations/migration-test -o migrations.mssql.test
410410

411411
.PHONY: migrations.sqlite.test
412412
migrations.sqlite.test: $(GO_SOURCES)
413-
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/integrations/migration-test -o migrations.sqlite.test -tags 'sqlite sqlite_unlock_notify'
413+
$(GO) test $(GOTESTFLAGS) -c github.com/jolheiser/gitea/integrations/migration-test -o migrations.sqlite.test -tags 'sqlite sqlite_unlock_notify'
414414

415415
.PHONY: check
416416
check: test

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
[![Join the Discord chat at https://discord.gg/NsatcWJ](https://img.shields.io/discord/322538954119184384.svg)](https://discord.gg/NsatcWJ)
77
[![](https://images.microbadger.com/badges/image/gitea/gitea.svg)](https://microbadger.com/images/gitea/gitea "Get your own image badge on microbadger.com")
88
[![codecov](https://codecov.io/gh/go-gitea/gitea/branch/master/graph/badge.svg)](https://codecov.io/gh/go-gitea/gitea)
9-
[![Go Report Card](https://goreportcard.com/badge/code.gitea.io/gitea)](https://goreportcard.com/report/code.gitea.io/gitea)
10-
[![GoDoc](https://godoc.org/code.gitea.io/gitea?status.svg)](https://godoc.org/code.gitea.io/gitea)
9+
[![Go Report Card](https://goreportcard.com/badge/github.com/jolheiser/gitea)](https://goreportcard.com/report/github.com/jolheiser/gitea)
10+
[![GoDoc](https://godoc.org/github.com/jolheiser/gitea?status.svg)](https://godoc.org/github.com/jolheiser/gitea)
1111
[![GitHub release](https://img.shields.io/github/release/go-gitea/gitea.svg)](https://github.com/go-gitea/gitea/releases/latest)
1212
[![Help Contribute to Open Source](https://www.codetriage.com/go-gitea/gitea/badges/users.svg)](https://www.codetriage.com/go-gitea/gitea)
1313
[![Become a backer/sponsor of gitea](https://opencollective.com/gitea/tiers/backers/badge.svg?label=backers&color=brightgreen)](https://opencollective.com/gitea)

‎README_ZH.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
[![Join the Discord chat at https://discord.gg/NsatcWJ](https://img.shields.io/discord/322538954119184384.svg)](https://discord.gg/NsatcWJ)
77
[![](https://images.microbadger.com/badges/image/gitea/gitea.svg)](https://microbadger.com/images/gitea/gitea "Get your own image badge on microbadger.com")
88
[![codecov](https://codecov.io/gh/go-gitea/gitea/branch/master/graph/badge.svg)](https://codecov.io/gh/go-gitea/gitea)
9-
[![Go Report Card](https://goreportcard.com/badge/code.gitea.io/gitea)](https://goreportcard.com/report/code.gitea.io/gitea)
10-
[![GoDoc](https://godoc.org/code.gitea.io/gitea?status.svg)](https://godoc.org/code.gitea.io/gitea)
9+
[![Go Report Card](https://goreportcard.com/badge/github.com/jolheiser/gitea)](https://goreportcard.com/report/github.com/jolheiser/gitea)
10+
[![GoDoc](https://godoc.org/github.com/jolheiser/gitea?status.svg)](https://godoc.org/github.com/jolheiser/gitea)
1111
[![GitHub release](https://img.shields.io/github/release/go-gitea/gitea.svg)](https://github.com/go-gitea/gitea/releases/latest)
1212
[![Help Contribute to Open Source](https://www.codetriage.com/go-gitea/gitea/badges/users.svg)](https://www.codetriage.com/go-gitea/gitea)
1313
[![Become a backer/sponsor of gitea](https://opencollective.com/gitea/tiers/backers/badge.svg?label=backers&color=brightgreen)](https://opencollective.com/gitea)

‎cmd/admin.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ import (
1111
"os"
1212
"text/tabwriter"
1313

14-
"code.gitea.io/gitea/models"
15-
"code.gitea.io/gitea/modules/auth/oauth2"
16-
"code.gitea.io/gitea/modules/git"
17-
"code.gitea.io/gitea/modules/graceful"
18-
"code.gitea.io/gitea/modules/log"
19-
pwd "code.gitea.io/gitea/modules/password"
20-
repo_module "code.gitea.io/gitea/modules/repository"
21-
"code.gitea.io/gitea/modules/setting"
14+
"github.com/jolheiser/gitea/models"
15+
"github.com/jolheiser/gitea/modules/auth/oauth2"
16+
"github.com/jolheiser/gitea/modules/git"
17+
"github.com/jolheiser/gitea/modules/graceful"
18+
"github.com/jolheiser/gitea/modules/log"
19+
pwd "github.com/jolheiser/gitea/modules/password"
20+
repo_module "github.com/jolheiser/gitea/modules/repository"
21+
"github.com/jolheiser/gitea/modules/setting"
2222

2323
"github.com/urfave/cli"
2424
)

‎cmd/admin_auth_ldap.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"fmt"
99
"strings"
1010

11-
"code.gitea.io/gitea/models"
12-
"code.gitea.io/gitea/modules/auth/ldap"
11+
"github.com/jolheiser/gitea/models"
12+
"github.com/jolheiser/gitea/modules/auth/ldap"
1313

1414
"github.com/urfave/cli"
1515
)

‎cmd/admin_auth_ldap_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ package cmd
77
import (
88
"testing"
99

10-
"code.gitea.io/gitea/models"
11-
"code.gitea.io/gitea/modules/auth/ldap"
10+
"github.com/jolheiser/gitea/models"
11+
"github.com/jolheiser/gitea/modules/auth/ldap"
1212

1313
"github.com/stretchr/testify/assert"
1414
"github.com/urfave/cli"

‎cmd/cmd.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"errors"
1111
"fmt"
1212

13-
"code.gitea.io/gitea/models"
14-
"code.gitea.io/gitea/modules/setting"
15-
"code.gitea.io/gitea/modules/util"
13+
"github.com/jolheiser/gitea/models"
14+
"github.com/jolheiser/gitea/modules/setting"
15+
"github.com/jolheiser/gitea/modules/util"
1616

1717
"github.com/urfave/cli"
1818
)

‎cmd/convert.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ package cmd
77
import (
88
"fmt"
99

10-
"code.gitea.io/gitea/models"
11-
"code.gitea.io/gitea/modules/log"
12-
"code.gitea.io/gitea/modules/setting"
10+
"github.com/jolheiser/gitea/models"
11+
"github.com/jolheiser/gitea/modules/log"
12+
"github.com/jolheiser/gitea/modules/setting"
1313

1414
"github.com/urfave/cli"
1515
)

‎cmd/doctor.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import (
1515
"regexp"
1616
"strings"
1717

18-
"code.gitea.io/gitea/modules/log"
19-
"code.gitea.io/gitea/modules/options"
20-
"code.gitea.io/gitea/modules/setting"
18+
"github.com/jolheiser/gitea/modules/log"
19+
"github.com/jolheiser/gitea/modules/options"
20+
"github.com/jolheiser/gitea/modules/setting"
2121

2222
"github.com/urfave/cli"
2323
)

‎cmd/dump.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313
"path/filepath"
1414
"time"
1515

16-
"code.gitea.io/gitea/models"
17-
"code.gitea.io/gitea/modules/log"
18-
"code.gitea.io/gitea/modules/setting"
16+
"github.com/jolheiser/gitea/models"
17+
"github.com/jolheiser/gitea/modules/log"
18+
"github.com/jolheiser/gitea/modules/setting"
1919

2020
"github.com/unknwon/cae/zip"
2121
"github.com/unknwon/com"

‎cmd/generate.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package cmd
88
import (
99
"fmt"
1010

11-
"code.gitea.io/gitea/modules/generate"
11+
"github.com/jolheiser/gitea/modules/generate"
1212

1313
"github.com/urfave/cli"
1414
)

‎cmd/hook.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ import (
1515
"strings"
1616
"time"
1717

18-
"code.gitea.io/gitea/models"
19-
"code.gitea.io/gitea/modules/git"
20-
"code.gitea.io/gitea/modules/private"
21-
"code.gitea.io/gitea/modules/setting"
18+
"github.com/jolheiser/gitea/models"
19+
"github.com/jolheiser/gitea/modules/git"
20+
"github.com/jolheiser/gitea/modules/private"
21+
"github.com/jolheiser/gitea/modules/setting"
2222

2323
"github.com/urfave/cli"
2424
)

‎cmd/keys.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"fmt"
1010
"strings"
1111

12-
"code.gitea.io/gitea/modules/private"
12+
"github.com/jolheiser/gitea/modules/private"
1313

1414
"github.com/urfave/cli"
1515
)

‎cmd/manager.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"os"
1111
"time"
1212

13-
"code.gitea.io/gitea/modules/private"
13+
"github.com/jolheiser/gitea/modules/private"
1414

1515
"github.com/urfave/cli"
1616
)

‎cmd/migrate.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ package cmd
77
import (
88
"context"
99

10-
"code.gitea.io/gitea/models"
11-
"code.gitea.io/gitea/models/migrations"
12-
"code.gitea.io/gitea/modules/log"
13-
"code.gitea.io/gitea/modules/setting"
10+
"github.com/jolheiser/gitea/models"
11+
"github.com/jolheiser/gitea/models/migrations"
12+
"github.com/jolheiser/gitea/modules/log"
13+
"github.com/jolheiser/gitea/modules/setting"
1414

1515
"github.com/urfave/cli"
1616
)

‎cmd/serv.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ import (
1616
"strings"
1717
"time"
1818

19-
"code.gitea.io/gitea/models"
20-
"code.gitea.io/gitea/modules/log"
21-
"code.gitea.io/gitea/modules/pprof"
22-
"code.gitea.io/gitea/modules/private"
23-
"code.gitea.io/gitea/modules/setting"
19+
"github.com/jolheiser/gitea/models"
20+
"github.com/jolheiser/gitea/modules/log"
21+
"github.com/jolheiser/gitea/modules/pprof"
22+
"github.com/jolheiser/gitea/modules/private"
23+
"github.com/jolheiser/gitea/modules/setting"
2424

2525
"github.com/dgrijalva/jwt-go"
2626
"github.com/unknwon/com"

0 commit comments

Comments
 (0)