diff --git a/.gitattributes b/.gitattributes index afd02555f5..3ddb8f641b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,6 +4,7 @@ /assets/*.json linguist-generated /public/assets/img/svg/*.svg linguist-generated /templates/swagger/v1_json.tmpl linguist-generated +/templates/swagger/v1_openapi3_json.tmpl linguist-generated /options/fileicon/** linguist-generated /vendor/** -text -eol linguist-vendored /web_src/js/vendor/** -text -eol linguist-vendored diff --git a/.github/actions/docker-dryrun/action.yml b/.github/actions/docker-dryrun/action.yml index d280ea26ce..e9cd88d46f 100644 --- a/.github/actions/docker-dryrun/action.yml +++ b/.github/actions/docker-dryrun/action.yml @@ -9,10 +9,10 @@ inputs: runs: using: composite steps: - - uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0 - - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 + - uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0 - name: Build regular image - uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0 + uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0 with: context: . platforms: ${{ inputs.platform }} @@ -20,7 +20,7 @@ runs: file: Dockerfile cache-from: type=registry,ref=ghcr.io/go-gitea/gitea:buildcache-rootful - name: Build rootless image - uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0 + uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0 with: context: . platforms: ${{ inputs.platform }} diff --git a/.github/workflows/cron-renovate.yml b/.github/workflows/cron-renovate.yml index 2c6cc8aedc..a50af530f2 100644 --- a/.github/workflows/cron-renovate.yml +++ b/.github/workflows/cron-renovate.yml @@ -28,5 +28,5 @@ jobs: token: ${{ secrets.RENOVATE_TOKEN }} env: RENOVATE_BINARY_SOURCE: install # auto-install go/node toolchains needed by post-upgrade tasks. - RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '["^make (tidy|svg nolyfill)$"]' + RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '["^make (tidy|svg)$"]' RENOVATE_REPOSITORIES: '["go-gitea/gitea"]' diff --git a/.github/workflows/giteabot-backport.yml b/.github/workflows/giteabot-backport.yml index 9a9c244b0c..b90c225b4b 100644 --- a/.github/workflows/giteabot-backport.yml +++ b/.github/workflows/giteabot-backport.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: go-gitea/giteabot@d4f19d5b4a88059d8c3ca78d660631506fc0c286 # add retry logic to giteabot + - uses: go-gitea/giteabot@f8a6f4c14d46920b4b5448852be3de72d00066f0 # v1.0.3 with: github_token: ${{ secrets.GITEABOT_TOKEN }} gitea_fork: giteabot/gitea diff --git a/.github/workflows/giteabot.yml b/.github/workflows/giteabot.yml index 9104398889..efa9fe047a 100644 --- a/.github/workflows/giteabot.yml +++ b/.github/workflows/giteabot.yml @@ -45,7 +45,7 @@ jobs: steps: # pull_request_review runs without repository secrets on fork PRs, so fall # back to the workflow token for the non-backport checks handled here. - - uses: go-gitea/giteabot@d4f19d5b4a88059d8c3ca78d660631506fc0c286 # add retry logic to giteabot + - uses: go-gitea/giteabot@f8a6f4c14d46920b4b5448852be3de72d00066f0 # v1.0.3 with: github_token: ${{ secrets.GITEABOT_TOKEN || github.token }} checks: ${{ github.event.inputs.checks || 'labels,merge_queue,lock,feedback,last_call,milestones,lgtm,translation_comment,pr_actions' }} diff --git a/.github/workflows/pull-db-tests.yml b/.github/workflows/pull-db-tests.yml index dd2c11a40b..cbf86247ce 100644 --- a/.github/workflows/pull-db-tests.yml +++ b/.github/workflows/pull-db-tests.yml @@ -119,7 +119,9 @@ jobs: env: discovery.type: single-node xpack.security.enabled: false - ES_JAVA_OPTS: "-Xms512m -Xmx512m" # reduce from ES default of 50% + xpack.ml.enabled: false + ingest.geoip.downloader.enabled: false + ES_JAVA_OPTS: "-Xms1g -Xmx1g" ports: - "9200:9200" meilisearch: @@ -129,7 +131,7 @@ jobs: ports: - "7700:7700" redis: - image: redis:latest@sha256:94ea4f5ccdaa6b154df99a792986ecb3ffbb3fe7722a197220477f1f3e65f9fe + image: redis:latest@sha256:e74c9b933d78e2829583d88f92793f4524752a15ac59c8baff2dd5ed000b7432 options: >- # wait until redis has started --health-cmd "redis-cli ping" --health-interval 5s @@ -193,7 +195,9 @@ jobs: env: discovery.type: single-node xpack.security.enabled: false - ES_JAVA_OPTS: "-Xms512m -Xmx512m" # reduce from ES default of 50% + xpack.ml.enabled: false + ingest.geoip.downloader.enabled: false + ES_JAVA_OPTS: "-Xms1g -Xmx1g" ports: - "9200:9200" smtpimap: diff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml index 82ebf79a61..d156132943 100644 --- a/.github/workflows/release-nightly.yml +++ b/.github/workflows/release-nightly.yml @@ -57,7 +57,7 @@ jobs: echo "Cleaned name is ${REF_NAME}" echo "branch=${REF_NAME}-nightly" >> "$GITHUB_OUTPUT" - name: configure aws - uses: aws-actions/configure-aws-credentials@d979d5b3a71173a29b74b5b88418bfda9437d885 # v6.1.1 + uses: aws-actions/configure-aws-credentials@acca2b1b2070338fb9fd1ca27ecee81d687e58e5 # v6.1.2 with: aws-region: ${{ secrets.AWS_REGION }} aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} @@ -79,8 +79,8 @@ jobs: # fetch all commits instead of only the last as some branches are long lived and could have many between versions # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567 - run: git fetch --unshallow --quiet --tags --force - - uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0 - - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 + - uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0 - name: Get cleaned branch name id: clean_name env: @@ -88,7 +88,7 @@ jobs: run: | REF_NAME=$(echo "$REF" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\///' -e 's/release\/v//') echo "branch=${REF_NAME}-nightly" >> "$GITHUB_OUTPUT" - - uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0 + - uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0 id: meta with: images: |- @@ -98,7 +98,7 @@ jobs: type=raw,value=${{ steps.clean_name.outputs.branch }} annotations: | org.opencontainers.image.authors="maintainers@gitea.io" - - uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0 + - uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0 id: meta_rootless with: images: |- @@ -112,18 +112,18 @@ jobs: annotations: | org.opencontainers.image.authors="maintainers@gitea.io" - name: Login to Docker Hub - uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0 + uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to GHCR using PAT - uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0 + uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - name: build regular docker image - uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0 + uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0 with: context: . platforms: linux/amd64,linux/arm64,linux/riscv64 @@ -133,7 +133,7 @@ jobs: cache-from: type=registry,ref=ghcr.io/go-gitea/gitea:buildcache-rootful cache-to: type=registry,ref=ghcr.io/go-gitea/gitea:buildcache-rootful,mode=max - name: build rootless docker image - uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0 + uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0 with: context: . platforms: linux/amd64,linux/arm64,linux/riscv64 diff --git a/.github/workflows/release-tag-rc.yml b/.github/workflows/release-tag-rc.yml index b246d87b9a..3e7655027c 100644 --- a/.github/workflows/release-tag-rc.yml +++ b/.github/workflows/release-tag-rc.yml @@ -58,7 +58,7 @@ jobs: echo "Cleaned name is ${REF_NAME}" echo "branch=${REF_NAME}" >> "$GITHUB_OUTPUT" - name: configure aws - uses: aws-actions/configure-aws-credentials@d979d5b3a71173a29b74b5b88418bfda9437d885 # v6.1.1 + uses: aws-actions/configure-aws-credentials@acca2b1b2070338fb9fd1ca27ecee81d687e58e5 # v6.1.2 with: aws-region: ${{ secrets.AWS_REGION }} aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} @@ -90,9 +90,9 @@ jobs: # fetch all commits instead of only the last as some branches are long lived and could have many between versions # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567 - run: git fetch --unshallow --quiet --tags --force - - uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0 - - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 - - uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0 + - uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0 + - uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0 id: meta with: images: |- @@ -105,7 +105,7 @@ jobs: type=semver,pattern={{version}} annotations: | org.opencontainers.image.authors="maintainers@gitea.io" - - uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0 + - uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0 id: meta_rootless with: images: |- @@ -121,18 +121,18 @@ jobs: annotations: | org.opencontainers.image.authors="maintainers@gitea.io" - name: Login to Docker Hub - uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0 + uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to GHCR using PAT - uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0 + uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - name: build regular container image - uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0 + uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0 with: context: . platforms: linux/amd64,linux/arm64,linux/riscv64 @@ -140,7 +140,7 @@ jobs: tags: ${{ steps.meta.outputs.tags }} annotations: ${{ steps.meta.outputs.annotations }} - name: build rootless container image - uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0 + uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0 with: context: . platforms: linux/amd64,linux/arm64,linux/riscv64 diff --git a/.github/workflows/release-tag-version.yml b/.github/workflows/release-tag-version.yml index 9eb910c8e3..66a2984def 100644 --- a/.github/workflows/release-tag-version.yml +++ b/.github/workflows/release-tag-version.yml @@ -61,7 +61,7 @@ jobs: echo "Cleaned name is ${REF_NAME}" echo "branch=${REF_NAME}" >> "$GITHUB_OUTPUT" - name: configure aws - uses: aws-actions/configure-aws-credentials@d979d5b3a71173a29b74b5b88418bfda9437d885 # v6.1.1 + uses: aws-actions/configure-aws-credentials@acca2b1b2070338fb9fd1ca27ecee81d687e58e5 # v6.1.2 with: aws-region: ${{ secrets.AWS_REGION }} aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} @@ -93,9 +93,9 @@ jobs: # fetch all commits instead of only the last as some branches are long lived and could have many between versions # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567 - run: git fetch --unshallow --quiet --tags --force - - uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0 - - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 - - uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0 + - uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0 + - uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0 id: meta with: images: |- @@ -112,7 +112,7 @@ jobs: type=semver,pattern={{major}}.{{minor}} annotations: | org.opencontainers.image.authors="maintainers@gitea.io" - - uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0 + - uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0 id: meta_rootless with: images: |- @@ -133,18 +133,18 @@ jobs: annotations: | org.opencontainers.image.authors="maintainers@gitea.io" - name: Login to Docker Hub - uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0 + uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to GHCR using PAT - uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0 + uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - name: build regular container image - uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0 + uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0 with: context: . platforms: linux/amd64,linux/arm64,linux/riscv64 @@ -152,7 +152,7 @@ jobs: tags: ${{ steps.meta.outputs.tags }} annotations: ${{ steps.meta.outputs.annotations }} - name: build rootless container image - uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0 + uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0 with: context: . platforms: linux/amd64,linux/arm64,linux/riscv64 diff --git a/.golangci.yml b/.golangci.yml index 056a6c2a08..b72b3fbebd 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -43,7 +43,7 @@ linters: desc: use os or io instead - pkg: golang.org/x/exp desc: it's experimental and unreliable - - pkg: code.gitea.io/gitea/modules/git/internal + - pkg: gitea.dev/modules/git/internal desc: do not use the internal package, use AddXxx function instead - pkg: gopkg.in/ini.v1 desc: do not use the ini package, use gitea's config system instead @@ -55,9 +55,9 @@ linters: files: - '**/models/migrations/**/*.go' deny: - - pkg: code.gitea.io/gitea/models$ + - pkg: gitea.dev/models$ desc: migrations must not depend on the models package - - pkg: code.gitea.io/gitea/modules/structs + - pkg: gitea.dev/modules/structs desc: migrations must not depend on modules/structs (API structures change over time) nolintlint: allow-unused: false @@ -173,7 +173,7 @@ formatters: custom-order: true sections: - standard - - prefix(code.gitea.io/gitea) + - prefix(gitea.dev) - blank - default gofumpt: diff --git a/AGENTS.md b/AGENTS.md index 2331da486a..5a4ecda6da 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -7,7 +7,7 @@ - Run single playwright e2e test files with `GITEA_TEST_E2E_FLAGS='' make test-e2e` - Add the current year into the copyright header of new `.go` files - Ensure no trailing whitespace in edited files -- Use Conventional Commits format for commit messages and PR titles (for example `type(scope): subject`; place `!` immediately before the colon when the change is breaking) +- Use Conventional Commits for commit messages and PR titles, e.g. `type(scope): subject`; `!` before the colon if breaking. Use `test` type for test-only changes. - Never force-push, amend, or squash unless asked. Use new commits and normal push for pull request updates - Preserve existing code comments, do not remove or rewrite comments that are still relevant - Keep comments short, prefer same-line, explain why, never narrate code @@ -16,4 +16,5 @@ - In TypeScript, use `!` (non-null assertion) instead of `?.`/`??` when a value is known to always exist - For CSS layout, prefer `flex-*` helpers over per-child `tw-ml-*` / `tw-mr-*` margins; fall back to `tw-*` utilities when specificity requires `!important` - Include authorship attribution in issue and pull request comments -- Add `Co-Authored-By` lines to all commits, indicating name and model used +- Always add `Assisted-By` trailers to commit messages in format `Assisted-by: AGENT_NAME:MODEL_VERSION` +- Never add `Co-Authored-By` `Signed-off-by` trailer to commit messages. Sign off must be done by a human. diff --git a/Dockerfile b/Dockerfile index c69b5a65d1..383e761330 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ RUN apk --no-cache add \ build-base \ git -WORKDIR ${GOPATH}/src/code.gitea.io/gitea +WORKDIR ${GOPATH}/src/gitea.dev COPY go.mod go.sum ./ RUN go mod download # Use COPY instead of bind mount as read-only one breaks makefile state tracking and read-write one needs binary to be moved as it's discarded. @@ -42,7 +42,7 @@ RUN chmod 755 /tmp/local/usr/bin/entrypoint \ /tmp/local/etc/s6/gitea/* \ /tmp/local/etc/s6/openssh/* \ /tmp/local/etc/s6/.s6-svscan/* \ - /go/src/code.gitea.io/gitea/gitea + /go/src/gitea.dev/gitea FROM docker.io/library/alpine:3.23 AS gitea @@ -74,7 +74,7 @@ RUN addgroup \ echo "git:*" | chpasswd -e COPY --from=build-env /tmp/local / -COPY --from=build-env /go/src/code.gitea.io/gitea/gitea /app/gitea/gitea +COPY --from=build-env /go/src/gitea.dev/gitea /app/gitea/gitea ENV USER=git ENV GITEA_CUSTOM=/data/gitea diff --git a/Dockerfile.rootless b/Dockerfile.rootless index 6f029067de..af1ef336ae 100644 --- a/Dockerfile.rootless +++ b/Dockerfile.rootless @@ -21,7 +21,7 @@ RUN apk --no-cache add \ build-base \ git -WORKDIR ${GOPATH}/src/code.gitea.io/gitea +WORKDIR ${GOPATH}/src/gitea.dev COPY go.mod go.sum ./ RUN go mod download # See the comments in Dockerfile @@ -37,7 +37,7 @@ COPY docker/rootless /tmp/local # Set permissions for builds that made under windows which strips the executable bit from file RUN chmod 755 /tmp/local/usr/local/bin/* \ - /go/src/code.gitea.io/gitea/gitea + /go/src/gitea.dev/gitea FROM docker.io/library/alpine:3.23 AS gitea-rootless @@ -68,7 +68,7 @@ RUN mkdir -p /var/lib/gitea /etc/gitea RUN chown git:git /var/lib/gitea /etc/gitea COPY --from=build-env /tmp/local / -COPY --from=build-env --chown=root:root /go/src/code.gitea.io/gitea/gitea /app/gitea/gitea +COPY --from=build-env --chown=root:root /go/src/gitea.dev/gitea /app/gitea/gitea # git:git USER 1000:1000 diff --git a/MAINTAINERS b/MAINTAINERS index 26192eff44..03ff6999f3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -64,4 +64,4 @@ metiftikci (@metiftikci) Christopher Homberger (@ChristopherHX) Tobias Balle-Petersen (@tobiasbp) TheFox (@TheFox0x7) -Nicolas (@bircni) \ No newline at end of file +Nicolas (@bircni) diff --git a/Makefile b/Makefile index 649465b2b4..2b19075a48 100644 --- a/Makefile +++ b/Makefile @@ -11,8 +11,8 @@ COMMA := , XGO_VERSION := go-1.26.x -AIR_PACKAGE ?= github.com/air-verse/air@v1.65.1 # renovate: datasource=go -EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker@v3.6.1 # renovate: datasource=go +AIR_PACKAGE ?= github.com/air-verse/air@v1.65.3 # renovate: datasource=go +EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker@v3.7.0 # renovate: datasource=go GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.12.2 # renovate: datasource=go GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.15 # renovate: datasource=go MISSPELL_PACKAGE ?= github.com/golangci/misspell/cmd/misspell@v0.8.0 # renovate: datasource=go @@ -113,8 +113,8 @@ LDFLAGS := $(LDFLAGS) -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)" LINUX_ARCHS ?= linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64,linux/riscv64 -GO_TEST_PACKAGES ?= $(filter-out $(shell $(GO) list code.gitea.io/gitea/models/migrations/...) code.gitea.io/gitea/tests/integration/migration-test code.gitea.io/gitea/tests code.gitea.io/gitea/tests/integration,$(shell $(GO) list ./... | grep -v /vendor/)) -MIGRATE_TEST_PACKAGES ?= $(shell $(GO) list code.gitea.io/gitea/models/migrations/...) +GO_TEST_PACKAGES ?= $(filter-out $(shell $(GO) list gitea.dev/models/migrations/...) gitea.dev/tests/integration/migration-test gitea.dev/tests gitea.dev/tests/integration,$(shell $(GO) list ./... | grep -v /vendor/)) +MIGRATE_TEST_PACKAGES ?= $(shell $(GO) list gitea.dev/models/migrations/...) FRONTEND_SOURCES := $(shell find web_src/js web_src/css -type f) FRONTEND_CONFIGS := vite.config.ts tailwind.config.ts @@ -150,7 +150,7 @@ ESLINT_CONCURRENCY ?= 2 SWAGGER_SPEC := templates/swagger/v1_json.tmpl SWAGGER_SPEC_INPUT := templates/swagger/v1_input.json -SWAGGER_EXCLUDE := code.gitea.io/sdk +SWAGGER_EXCLUDE := gitea.dev/sdk OPENAPI3_SPEC := templates/swagger/v1_openapi3_json.tmpl TEST_MYSQL_HOST ?= mysql:3306 @@ -447,23 +447,23 @@ test-integration: @# Use a compiled binary: testlogger forwards gitea logs to t.Log, so `go test -v` @# would flood output per passing test. testcache can't help these tests anyway — @# they mutate the work directory, so cache inputs change between runs. - $(GO) test $(GOTEST_FLAGS) -tags '$(TAGS)' -c code.gitea.io/gitea/tests/integration -o ./test-integration-$(GITEA_TEST_DATABASE).test + $(GO) test $(GOTEST_FLAGS) -tags '$(TAGS)' -c gitea.dev/tests/integration -o ./test-integration-$(GITEA_TEST_DATABASE).test ./tools/test-integration.sh ./test-integration-$(GITEA_TEST_DATABASE).test .PHONY: test-integration-compile test-integration-compile: - $(GO) test $(GOTEST_FLAGS) -tags '$(TAGS)' -c -o /dev/null code.gitea.io/gitea/tests/integration + $(GO) test $(GOTEST_FLAGS) -tags '$(TAGS)' -c -o /dev/null gitea.dev/tests/integration .PHONY: test-integration\#% test-integration\#%: - $(GO) test $(GOTEST_FLAGS) -tags '$(TAGS)' -run $(subst .,/,$*) code.gitea.io/gitea/tests/integration + $(GO) test $(GOTEST_FLAGS) -tags '$(TAGS)' -run $(subst .,/,$*) gitea.dev/tests/integration .PHONY: test-migration test-migration: migrations.integration.test migrations.individual.test .PHONY: migrations.integration.test migrations.integration.test: - $(GO) test $(GOTEST_FLAGS) -tags '$(TAGS)' code.gitea.io/gitea/tests/integration/migration-test + $(GO) test $(GOTEST_FLAGS) -tags '$(TAGS)' gitea.dev/tests/integration/migration-test .PHONY: migrations.individual.test migrations.individual.test: @@ -472,7 +472,7 @@ migrations.individual.test: .PHONY: migrations.individual.test\#% migrations.individual.test\#%: - $(GO) test $(GOTEST_FLAGS) -tags '$(TAGS)' code.gitea.io/gitea/models/migrations/$* + $(GO) test $(GOTEST_FLAGS) -tags '$(TAGS)' gitea.dev/models/migrations/$* .PHONY: playwright playwright: deps-frontend @@ -608,14 +608,6 @@ update-js: node_modules ## update js dependencies rm -rf node_modules pnpm-lock.yaml pnpm install @touch node_modules - $(MAKE) --no-print-directory nolyfill - -.PHONY: nolyfill -nolyfill: node_modules ## apply nolyfill overrides to package.json and relock - pnpm exec nolyfill install - node tools/migrate-nolyfills.ts - pnpm install - @touch node_modules .PHONY: update-py update-py: node_modules ## update py dependencies diff --git a/README.md b/README.md index 4c4fedd3b8..3aa5138dac 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ [![](https://github.com/go-gitea/gitea/actions/workflows/release-nightly.yml/badge.svg?branch=main)](https://github.com/go-gitea/gitea/actions/workflows/release-nightly.yml?query=branch%3Amain "Release Nightly") [![](https://img.shields.io/discord/322538954119184384.svg?logo=discord&logoColor=white&label=Discord&color=5865F2)](https://discord.gg/Gitea "Join the Discord chat at https://discord.gg/Gitea") -[![](https://goreportcard.com/badge/code.gitea.io/gitea)](https://goreportcard.com/report/code.gitea.io/gitea "Go Report Card") -[![](https://pkg.go.dev/badge/code.gitea.io/gitea?status.svg)](https://pkg.go.dev/code.gitea.io/gitea "GoDoc") +[![](https://goreportcard.com/badge/gitea.dev)](https://goreportcard.com/report/gitea.dev "Go Report Card") +[![](https://pkg.go.dev/badge/gitea.dev?status.svg)](https://pkg.go.dev/gitea.dev "GoDoc") [![](https://img.shields.io/github/release/go-gitea/gitea.svg)](https://github.com/go-gitea/gitea/releases/latest "GitHub release") [![](https://www.codetriage.com/go-gitea/gitea/badges/users.svg)](https://www.codetriage.com/go-gitea/gitea "Help Contribute to Open Source") [![](https://opencollective.com/gitea/tiers/backers/badge.svg?label=backers&color=brightgreen)](https://opencollective.com/gitea "Become a backer/sponsor of gitea") diff --git a/README.zh-cn.md b/README.zh-cn.md index 52c7781831..0855827f2e 100644 --- a/README.zh-cn.md +++ b/README.zh-cn.md @@ -2,8 +2,8 @@ [![](https://github.com/go-gitea/gitea/actions/workflows/release-nightly.yml/badge.svg?branch=main)](https://github.com/go-gitea/gitea/actions/workflows/release-nightly.yml?query=branch%3Amain "Release Nightly") [![](https://img.shields.io/discord/322538954119184384.svg?logo=discord&logoColor=white&label=Discord&color=5865F2)](https://discord.gg/Gitea "Join the Discord chat at https://discord.gg/Gitea") -[![](https://goreportcard.com/badge/code.gitea.io/gitea)](https://goreportcard.com/report/code.gitea.io/gitea "Go Report Card") -[![](https://pkg.go.dev/badge/code.gitea.io/gitea?status.svg)](https://pkg.go.dev/code.gitea.io/gitea "GoDoc") +[![](https://goreportcard.com/badge/gitea.dev)](https://goreportcard.com/report/gitea.dev "Go Report Card") +[![](https://pkg.go.dev/badge/gitea.dev?status.svg)](https://pkg.go.dev/gitea.dev "GoDoc") [![](https://img.shields.io/github/release/go-gitea/gitea.svg)](https://github.com/go-gitea/gitea/releases/latest "GitHub release") [![](https://www.codetriage.com/go-gitea/gitea/badges/users.svg)](https://www.codetriage.com/go-gitea/gitea "Help Contribute to Open Source") [![](https://opencollective.com/gitea/tiers/backers/badge.svg?label=backers&color=brightgreen)](https://opencollective.com/gitea "Become a backer/sponsor of gitea") diff --git a/README.zh-tw.md b/README.zh-tw.md index 77ad6828db..0c89d04166 100644 --- a/README.zh-tw.md +++ b/README.zh-tw.md @@ -2,8 +2,8 @@ [![](https://github.com/go-gitea/gitea/actions/workflows/release-nightly.yml/badge.svg?branch=main)](https://github.com/go-gitea/gitea/actions/workflows/release-nightly.yml?query=branch%3Amain "Release Nightly") [![](https://img.shields.io/discord/322538954119184384.svg?logo=discord&logoColor=white&label=Discord&color=5865F2)](https://discord.gg/Gitea "Join the Discord chat at https://discord.gg/Gitea") -[![](https://goreportcard.com/badge/code.gitea.io/gitea)](https://goreportcard.com/report/code.gitea.io/gitea "Go Report Card") -[![](https://pkg.go.dev/badge/code.gitea.io/gitea?status.svg)](https://pkg.go.dev/code.gitea.io/gitea "GoDoc") +[![](https://goreportcard.com/badge/gitea.dev)](https://goreportcard.com/report/gitea.dev "Go Report Card") +[![](https://pkg.go.dev/badge/gitea.dev?status.svg)](https://pkg.go.dev/gitea.dev "GoDoc") [![](https://img.shields.io/github/release/go-gitea/gitea.svg)](https://github.com/go-gitea/gitea/releases/latest "GitHub release") [![](https://www.codetriage.com/go-gitea/gitea/badges/users.svg)](https://www.codetriage.com/go-gitea/gitea "Help Contribute to Open Source") [![](https://opencollective.com/gitea/tiers/backers/badge.svg?label=backers&color=brightgreen)](https://opencollective.com/gitea "Become a backer/sponsor of gitea") diff --git a/assets/go-licenses.json b/assets/go-licenses.json index 3566fc2f6e..22dc169624 100644 --- a/assets/go-licenses.json +++ b/assets/go-licenses.json @@ -4,21 +4,6 @@ "path": "cloud.google.com/go/compute/metadata/LICENSE", "licenseText": "\n Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"[]\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-party archives.\n\n Copyright [yyyy] [name of copyright owner]\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n" }, - { - "name": "code.gitea.io/actions-proto-go", - "path": "code.gitea.io/actions-proto-go/LICENSE", - "licenseText": "MIT License\n\nCopyright (c) 2022 The Gitea Authors\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n" - }, - { - "name": "code.gitea.io/gitea/modules/lfs", - "path": "code.gitea.io/gitea/modules/lfs/LICENSE", - "licenseText": "Copyright (c) 2016 The Gitea Authors\nCopyright (c) GitHub, Inc. and LFS Test Server contributors\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n" - }, - { - "name": "code.gitea.io/sdk/gitea", - "path": "code.gitea.io/sdk/gitea/LICENSE", - "licenseText": "Copyright (c) 2016 The Gitea Authors\nCopyright (c) 2014 The Gogs Authors\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n" - }, { "name": "codeberg.org/gusted/mcaptcha", "path": "codeberg.org/gusted/mcaptcha/LICENSE", @@ -79,6 +64,21 @@ "path": "gitea.com/lunny/levelqueue/LICENSE", "licenseText": "Copyright (c) 2019 Lunny Xiao\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n" }, + { + "name": "gitea.dev/actions-proto-go", + "path": "gitea.dev/actions-proto-go/LICENSE", + "licenseText": "MIT License\n\nCopyright (c) 2022 The Gitea Authors\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n" + }, + { + "name": "gitea.dev/modules/lfs", + "path": "gitea.dev/modules/lfs/LICENSE", + "licenseText": "Copyright (c) 2016 The Gitea Authors\nCopyright (c) GitHub, Inc. and LFS Test Server contributors\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n" + }, + { + "name": "gitea.dev/sdk", + "path": "gitea.dev/sdk/LICENSE", + "licenseText": "Copyright (c) 2016 The Gitea Authors\nCopyright (c) 2014 The Gogs Authors\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n" + }, { "name": "github.com/42wim/httpsig", "path": "github.com/42wim/httpsig/LICENSE", @@ -114,6 +114,11 @@ "path": "github.com/DataDog/zstd/LICENSE", "licenseText": "Simplified BSD License\n\nCopyright (c) 2016, Datadog \u003cinfo@datadoghq.com\u003e\nAll rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:\n\n * Redistributions of source code must retain the above copyright notice,\n this list of conditions and the following disclaimer.\n * Redistributions in binary form must reproduce the above copyright notice,\n this list of conditions and the following disclaimer in the documentation\n and/or other materials provided with the distribution.\n * Neither the name of the copyright holder nor the names of its contributors\n may be used to endorse or promote products derived from this software\n without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\nAND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\nSERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\nCAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\nOR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" }, + { + "name": "github.com/Necoro/html2text", + "path": "github.com/Necoro/html2text/LICENSE", + "licenseText": "The MIT License (MIT)\n\nCopyright (c) 2015 Jay Taylor\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n\n" + }, { "name": "github.com/ProtonMail/go-crypto", "path": "github.com/ProtonMail/go-crypto/LICENSE", @@ -435,13 +440,8 @@ "licenseText": "ISC License\n\nCopyright (c) 2012-2016 Dave Collins \u003cdave@davec.name\u003e\n\nPermission to use, copy, modify, and/or distribute this software for any\npurpose with or without fee is hereby granted, provided that the above\ncopyright notice and this permission notice appear in all copies.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL WARRANTIES\nWITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF\nMERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR\nANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES\nWHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN\nACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF\nOR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.\n" }, { - "name": "github.com/dimiro1/reply", - "path": "github.com/dimiro1/reply/LICENSE", - "licenseText": "MIT License\n\nCopyright (c) Discourse\nCopyright (c) Claudemiro\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n" - }, - { - "name": "github.com/dlclark/regexp2", - "path": "github.com/dlclark/regexp2/LICENSE", + "name": "github.com/dlclark/regexp2/v2", + "path": "github.com/dlclark/regexp2/v2/LICENSE", "licenseText": "The MIT License (MIT)\n\nCopyright (c) Doug Clark\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n" }, { @@ -660,8 +660,8 @@ "licenseText": "\n Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"[]\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-party archives.\n\n Copyright [yyyy] [name of copyright owner]\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n" }, { - "name": "github.com/google/go-github/v86", - "path": "github.com/google/go-github/v86/LICENSE", + "name": "github.com/google/go-github/v88", + "path": "github.com/google/go-github/v88/LICENSE", "licenseText": "Copyright (c) 2013 The go-github AUTHORS. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" }, { @@ -759,11 +759,6 @@ "path": "github.com/inbucket/html2text/LICENSE", "licenseText": "The MIT License (MIT)\n\nCopyright (c) 2015 Jay Taylor\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n\n" }, - { - "name": "github.com/jaytaylor/html2text", - "path": "github.com/jaytaylor/html2text/LICENSE", - "licenseText": "The MIT License (MIT)\n\nCopyright (c) 2015 Jay Taylor\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n\n" - }, { "name": "github.com/jbenet/go-context", "path": "github.com/jbenet/go-context/LICENSE", diff --git a/build/generate-bindata.go b/build/generate-bindata.go index 2553770762..3e14eba4cb 100644 --- a/build/generate-bindata.go +++ b/build/generate-bindata.go @@ -9,7 +9,7 @@ import ( "fmt" "os" - "code.gitea.io/gitea/modules/assetfs" + "gitea.dev/modules/assetfs" ) func main() { diff --git a/build/generate-emoji.go b/build/generate-emoji.go index cbc1be2139..7d38a4cbd5 100644 --- a/build/generate-emoji.go +++ b/build/generate-emoji.go @@ -20,7 +20,7 @@ import ( "strings" "unicode/utf8" - "code.gitea.io/gitea/modules/json" + "gitea.dev/modules/json" ) const ( diff --git a/build/generate-gitignores.go b/build/generate-gitignores.go index 7a498f548e..11af4eb70e 100644 --- a/build/generate-gitignores.go +++ b/build/generate-gitignores.go @@ -18,7 +18,7 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/util" ) func main() { diff --git a/build/generate-go-licenses.go b/build/generate-go-licenses.go index 057e6a6e49..a4aa5b0832 100644 --- a/build/generate-go-licenses.go +++ b/build/generate-go-licenses.go @@ -29,8 +29,8 @@ var primaryLicenseRe = regexp.MustCompile(`^(?i)(LICEN[SC]E|COPYING)$`) // ignoredNames are LicenseEntry.Name values to exclude from the output. var ignoredNames = map[string]bool{ - "code.gitea.io/gitea": true, - "code.gitea.io/gitea/options/license": true, + "gitea.dev": true, + "gitea.dev/options/license": true, } var excludedExt = map[string]bool{ diff --git a/build/generate-openapi.go b/build/generate-openapi.go index 7b37a5bbba..3c65781481 100644 --- a/build/generate-openapi.go +++ b/build/generate-openapi.go @@ -25,7 +25,7 @@ import ( "sort" "strings" - "code.gitea.io/gitea/build/openapi3gen" + "gitea.dev/build/openapi3gen" "github.com/getkin/kin-openapi/openapi3" ) diff --git a/build/openapi3gen/convert.go b/build/openapi3gen/convert.go index 04587b3303..9d446ff45b 100644 --- a/build/openapi3gen/convert.go +++ b/build/openapi3gen/convert.go @@ -8,7 +8,7 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/json" + "gitea.dev/modules/json" "github.com/getkin/kin-openapi/openapi2" "github.com/getkin/kin-openapi/openapi2conv" diff --git a/cmd/actions.go b/cmd/actions.go index 44b6b7b54c..576be76488 100644 --- a/cmd/actions.go +++ b/cmd/actions.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/private" + "gitea.dev/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin.go b/cmd/admin.go index c0e21731cb..2396bbb47c 100644 --- a/cmd/admin.go +++ b/cmd/admin.go @@ -8,12 +8,12 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/modules/git" + "gitea.dev/modules/gitrepo" + "gitea.dev/modules/log" + repo_module "gitea.dev/modules/repository" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_auth.go b/cmd/admin_auth.go index b55bb1481c..6a00e961b9 100644 --- a/cmd/admin_auth.go +++ b/cmd/admin_auth.go @@ -10,9 +10,9 @@ import ( "os" "text/tabwriter" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - auth_service "code.gitea.io/gitea/services/auth" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + auth_service "gitea.dev/services/auth" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_auth_ldap.go b/cmd/admin_auth_ldap.go index c9be5abb37..d3266fa48d 100644 --- a/cmd/admin_auth_ldap.go +++ b/cmd/admin_auth_ldap.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/auth/source/ldap" + "gitea.dev/models/auth" + "gitea.dev/modules/util" + "gitea.dev/services/auth/source/ldap" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_auth_ldap_test.go b/cmd/admin_auth_ldap_test.go index 0e3e465e81..f9b5338ba0 100644 --- a/cmd/admin_auth_ldap_test.go +++ b/cmd/admin_auth_ldap_test.go @@ -7,9 +7,9 @@ import ( "context" "testing" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/services/auth/source/ldap" + "gitea.dev/models/auth" + "gitea.dev/modules/test" + "gitea.dev/services/auth/source/ldap" "github.com/stretchr/testify/assert" "github.com/urfave/cli/v3" diff --git a/cmd/admin_auth_oauth.go b/cmd/admin_auth_oauth.go index 8848c94fc5..c4a86191a1 100644 --- a/cmd/admin_auth_oauth.go +++ b/cmd/admin_auth_oauth.go @@ -9,9 +9,9 @@ import ( "fmt" "net/url" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/auth/source/oauth2" + auth_model "gitea.dev/models/auth" + "gitea.dev/modules/util" + "gitea.dev/services/auth/source/oauth2" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_auth_oauth_test.go b/cmd/admin_auth_oauth_test.go index bb9da667fd..c16dd96d56 100644 --- a/cmd/admin_auth_oauth_test.go +++ b/cmd/admin_auth_oauth_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/services/auth/source/oauth2" + auth_model "gitea.dev/models/auth" + "gitea.dev/services/auth/source/oauth2" "github.com/stretchr/testify/assert" "github.com/urfave/cli/v3" diff --git a/cmd/admin_auth_smtp.go b/cmd/admin_auth_smtp.go index 93e0587fc3..b7c1a8807e 100644 --- a/cmd/admin_auth_smtp.go +++ b/cmd/admin_auth_smtp.go @@ -8,9 +8,9 @@ import ( "errors" "strings" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/auth/source/smtp" + auth_model "gitea.dev/models/auth" + "gitea.dev/modules/util" + "gitea.dev/services/auth/source/smtp" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_auth_smtp_test.go b/cmd/admin_auth_smtp_test.go index e54e01830c..2b890f154a 100644 --- a/cmd/admin_auth_smtp_test.go +++ b/cmd/admin_auth_smtp_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/services/auth/source/smtp" + auth_model "gitea.dev/models/auth" + "gitea.dev/services/auth/source/smtp" "github.com/stretchr/testify/assert" "github.com/urfave/cli/v3" diff --git a/cmd/admin_regenerate.go b/cmd/admin_regenerate.go index aa235441ba..89b7bf383c 100644 --- a/cmd/admin_regenerate.go +++ b/cmd/admin_regenerate.go @@ -6,9 +6,9 @@ package cmd import ( "context" - "code.gitea.io/gitea/modules/graceful" - asymkey_service "code.gitea.io/gitea/services/asymkey" - repo_service "code.gitea.io/gitea/services/repository" + "gitea.dev/modules/graceful" + asymkey_service "gitea.dev/services/asymkey" + repo_service "gitea.dev/services/repository" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_user_change_password.go b/cmd/admin_user_change_password.go index c27905b4db..4d5fe586e1 100644 --- a/cmd/admin_user_change_password.go +++ b/cmd/admin_user_change_password.go @@ -8,11 +8,11 @@ import ( "errors" "fmt" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/password" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - user_service "code.gitea.io/gitea/services/user" + user_model "gitea.dev/models/user" + "gitea.dev/modules/auth/password" + "gitea.dev/modules/optional" + "gitea.dev/modules/setting" + user_service "gitea.dev/services/user" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_user_change_password_test.go b/cmd/admin_user_change_password_test.go index cf497517f7..50fd8d9e4d 100644 --- a/cmd/admin_user_change_password_test.go +++ b/cmd/admin_user_change_password_test.go @@ -7,9 +7,9 @@ import ( "io" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "gitea.dev/models/db" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cmd/admin_user_create.go b/cmd/admin_user_create.go index 7e5675cf58..340ea072d5 100644 --- a/cmd/admin_user_create.go +++ b/cmd/admin_user_create.go @@ -9,12 +9,12 @@ import ( "fmt" "strings" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - pwd "code.gitea.io/gitea/modules/auth/password" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + user_model "gitea.dev/models/user" + pwd "gitea.dev/modules/auth/password" + "gitea.dev/modules/optional" + "gitea.dev/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_user_create_test.go b/cmd/admin_user_create_test.go index dbe949ff8d..f3794c5dff 100644 --- a/cmd/admin_user_create_test.go +++ b/cmd/admin_user_create_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cmd/admin_user_delete.go b/cmd/admin_user_delete.go index f91041577c..cc70fe70bf 100644 --- a/cmd/admin_user_delete.go +++ b/cmd/admin_user_delete.go @@ -9,10 +9,10 @@ import ( "fmt" "strings" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - user_service "code.gitea.io/gitea/services/user" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + "gitea.dev/modules/storage" + user_service "gitea.dev/services/user" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_user_delete_test.go b/cmd/admin_user_delete_test.go index b68b358152..4fbd0435c5 100644 --- a/cmd/admin_user_delete_test.go +++ b/cmd/admin_user_delete_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" "github.com/stretchr/testify/require" ) diff --git a/cmd/admin_user_generate_access_token.go b/cmd/admin_user_generate_access_token.go index 7f8330ff7e..cf42a97cdd 100644 --- a/cmd/admin_user_generate_access_token.go +++ b/cmd/admin_user_generate_access_token.go @@ -8,8 +8,8 @@ import ( "errors" "fmt" - auth_model "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" + auth_model "gitea.dev/models/auth" + user_model "gitea.dev/models/user" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_user_list.go b/cmd/admin_user_list.go index 2958fe0cc8..7f9ce57e24 100644 --- a/cmd/admin_user_list.go +++ b/cmd/admin_user_list.go @@ -9,7 +9,7 @@ import ( "os" "text/tabwriter" - user_model "code.gitea.io/gitea/models/user" + user_model "gitea.dev/models/user" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_user_must_change_password.go b/cmd/admin_user_must_change_password.go index 468d462b74..ff318dd0bc 100644 --- a/cmd/admin_user_must_change_password.go +++ b/cmd/admin_user_must_change_password.go @@ -8,8 +8,8 @@ import ( "errors" "fmt" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_user_must_change_password_test.go b/cmd/admin_user_must_change_password_test.go index efdbe3a9ee..cf81fbe0ba 100644 --- a/cmd/admin_user_must_change_password_test.go +++ b/cmd/admin_user_must_change_password_test.go @@ -6,9 +6,9 @@ package cmd import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "gitea.dev/models/db" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cmd/cmdtest/cmd_test.go b/cmd/cmdtest/cmd_test.go index 4ff854f8ab..6d4937fa11 100644 --- a/cmd/cmdtest/cmd_test.go +++ b/cmd/cmdtest/cmd_test.go @@ -15,11 +15,11 @@ import ( "strings" "testing" - "code.gitea.io/gitea/cmd" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" + "gitea.dev/cmd" + "gitea.dev/models/unittest" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/modules/util" "github.com/stretchr/testify/assert" "github.com/urfave/cli/v3" diff --git a/cmd/config.go b/cmd/config.go index 5303b0e1e0..42880d99f2 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -9,7 +9,7 @@ import ( "fmt" "os" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/doctor.go b/cmd/doctor.go index 3593670047..8941be0ca0 100644 --- a/cmd/doctor.go +++ b/cmd/doctor.go @@ -12,13 +12,13 @@ import ( "strings" "text/tabwriter" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations" - migrate_base "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/doctor" + "gitea.dev/models/db" + "gitea.dev/models/migrations" + migrate_base "gitea.dev/models/migrations/base" + "gitea.dev/modules/container" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/services/doctor" "github.com/urfave/cli/v3" ) diff --git a/cmd/doctor_convert.go b/cmd/doctor_convert.go index f4867912ab..eceda00183 100644 --- a/cmd/doctor_convert.go +++ b/cmd/doctor_convert.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/doctor_test.go b/cmd/doctor_test.go index 7d2f358947..6cc22b0c49 100644 --- a/cmd/doctor_test.go +++ b/cmd/doctor_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/doctor" + "gitea.dev/modules/log" + "gitea.dev/services/doctor" "github.com/stretchr/testify/assert" "github.com/urfave/cli/v3" diff --git a/cmd/dump.go b/cmd/dump.go index 40b73f69aa..719e62d3af 100644 --- a/cmd/dump.go +++ b/cmd/dump.go @@ -11,13 +11,13 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/dump" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/dump" + "gitea.dev/modules/json" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/modules/storage" + "gitea.dev/modules/util" "gitea.com/go-chi/session" "github.com/urfave/cli/v3" diff --git a/cmd/dump_repo.go b/cmd/dump_repo.go index 367454366e..cc84922e6a 100644 --- a/cmd/dump_repo.go +++ b/cmd/dump_repo.go @@ -10,14 +10,14 @@ import ( "os" "strings" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/migrations" + "gitea.dev/modules/git" + "gitea.dev/modules/log" + base "gitea.dev/modules/migration" + "gitea.dev/modules/setting" + "gitea.dev/modules/structs" + "gitea.dev/modules/util" + "gitea.dev/services/convert" + "gitea.dev/services/migrations" "github.com/urfave/cli/v3" ) diff --git a/cmd/embedded.go b/cmd/embedded.go index e2110756b8..add8dda12b 100644 --- a/cmd/embedded.go +++ b/cmd/embedded.go @@ -11,14 +11,14 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/glob" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/options" - "code.gitea.io/gitea/modules/public" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/assetfs" + "gitea.dev/modules/glob" + "gitea.dev/modules/log" + "gitea.dev/modules/options" + "gitea.dev/modules/public" + "gitea.dev/modules/setting" + "gitea.dev/modules/templates" + "gitea.dev/modules/util" "github.com/urfave/cli/v3" ) diff --git a/cmd/generate.go b/cmd/generate.go index 21f8b42bff..01be73c2d1 100644 --- a/cmd/generate.go +++ b/cmd/generate.go @@ -9,7 +9,7 @@ import ( "fmt" "os" - "code.gitea.io/gitea/modules/generate" + "gitea.dev/modules/generate" "github.com/mattn/go-isatty" "github.com/urfave/cli/v3" diff --git a/cmd/helper.go b/cmd/helper.go index ca4cddb49d..9150e1c233 100644 --- a/cmd/helper.go +++ b/cmd/helper.go @@ -15,9 +15,9 @@ import ( "strings" "syscall" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" "github.com/urfave/cli/v3" ) @@ -142,9 +142,9 @@ func PrepareConsoleLoggerLevel(defaultLevel log.Level) func(context.Context, *cl func isValidDefaultSubCommand(cmd *cli.Command) (string, bool) { // Dirty patch for urfave/cli's strange design. // "./gitea bad-cmd" should not start the web server. - rootArgs := cmd.Root().Args().Slice() - if len(rootArgs) != 0 && rootArgs[0] != cmd.Name { - return rootArgs[0], false + args := cmd.Args().Slice() + if len(args) != 0 { + return args[0], false } return "", true } diff --git a/cmd/hook.go b/cmd/hook.go index 4a6c7c2905..26b3b56053 100644 --- a/cmd/hook.go +++ b/cmd/hook.go @@ -14,12 +14,12 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/git" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/log" + "gitea.dev/modules/private" + repo_module "gitea.dev/modules/repository" + "gitea.dev/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/keys.go b/cmd/keys.go index 912cf25091..2f9f52e5db 100644 --- a/cmd/keys.go +++ b/cmd/keys.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" + "gitea.dev/modules/log" + "gitea.dev/modules/private" "github.com/urfave/cli/v3" ) diff --git a/cmd/mailer.go b/cmd/mailer.go index a7dbd68e20..61bd66c963 100644 --- a/cmd/mailer.go +++ b/cmd/mailer.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/private" + "gitea.dev/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/main.go b/cmd/main.go index 27d8cba2e9..243995d634 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -10,8 +10,8 @@ import ( "os" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/main_test.go b/cmd/main_test.go index f367bf12e4..047698074c 100644 --- a/cmd/main_test.go +++ b/cmd/main_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/unittest" "github.com/stretchr/testify/assert" "github.com/urfave/cli/v3" @@ -41,4 +41,5 @@ func TestDefaultCommand(t *testing.T) { test(t, []string{"./gitea"}, "", true) test(t, []string{"./gitea", "test"}, "", true) test(t, []string{"./gitea", "other"}, "other", false) + test(t, []string{"./gitea", "test", "extra"}, "extra", false) } diff --git a/cmd/manager.go b/cmd/manager.go index 586c65990b..85fccc992d 100644 --- a/cmd/manager.go +++ b/cmd/manager.go @@ -8,7 +8,7 @@ import ( "os" "time" - "code.gitea.io/gitea/modules/private" + "gitea.dev/modules/private" "github.com/urfave/cli/v3" ) diff --git a/cmd/manager_logging.go b/cmd/manager_logging.go index 5812e707e2..4fae0c96c7 100644 --- a/cmd/manager_logging.go +++ b/cmd/manager_logging.go @@ -9,8 +9,8 @@ import ( "fmt" "os" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" + "gitea.dev/modules/log" + "gitea.dev/modules/private" "github.com/urfave/cli/v3" ) diff --git a/cmd/migrate.go b/cmd/migrate.go index 016f8a0db5..cc4fee3308 100644 --- a/cmd/migrate.go +++ b/cmd/migrate.go @@ -6,10 +6,10 @@ package cmd import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/versioned_migration" + "gitea.dev/models/db" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/services/versioned_migration" "github.com/urfave/cli/v3" ) diff --git a/cmd/migrate_storage.go b/cmd/migrate_storage.go index c9b82055c1..36b224fbf3 100644 --- a/cmd/migrate_storage.go +++ b/cmd/migrate_storage.go @@ -10,17 +10,17 @@ import ( "io/fs" "strings" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - packages_model "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/services/versioned_migration" + actions_model "gitea.dev/models/actions" + "gitea.dev/models/db" + git_model "gitea.dev/models/git" + packages_model "gitea.dev/models/packages" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/modules/log" + packages_module "gitea.dev/modules/packages" + "gitea.dev/modules/setting" + "gitea.dev/modules/storage" + "gitea.dev/services/versioned_migration" "github.com/urfave/cli/v3" ) diff --git a/cmd/migrate_storage_test.go b/cmd/migrate_storage_test.go index 3ea193eb1e..67a6b9e2ee 100644 --- a/cmd/migrate_storage_test.go +++ b/cmd/migrate_storage_test.go @@ -8,13 +8,13 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - packages_module "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - packages_service "code.gitea.io/gitea/services/packages" + "gitea.dev/models/packages" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + packages_module "gitea.dev/modules/packages" + "gitea.dev/modules/setting" + "gitea.dev/modules/storage" + packages_service "gitea.dev/services/packages" "github.com/stretchr/testify/assert" ) diff --git a/cmd/restore_repo.go b/cmd/restore_repo.go index 26b4682f13..c7bbddd7c4 100644 --- a/cmd/restore_repo.go +++ b/cmd/restore_repo.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/private" + "gitea.dev/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/serv.go b/cmd/serv.go index a35d476c86..93009cd32a 100644 --- a/cmd/serv.go +++ b/cmd/serv.go @@ -15,21 +15,21 @@ import ( "strings" "unicode" - asymkey_model "code.gitea.io/gitea/models/asymkey" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/lfstransfer" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/pprof" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/process" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/lfs" + asymkey_model "gitea.dev/models/asymkey" + git_model "gitea.dev/models/git" + "gitea.dev/models/perm" + repo_model "gitea.dev/models/repo" + "gitea.dev/modules/git" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/json" + "gitea.dev/modules/lfstransfer" + "gitea.dev/modules/log" + "gitea.dev/modules/pprof" + "gitea.dev/modules/private" + "gitea.dev/modules/process" + repo_module "gitea.dev/modules/repository" + "gitea.dev/modules/setting" + "gitea.dev/services/lfs" "github.com/kballard/go-shellquote" "github.com/urfave/cli/v3" diff --git a/cmd/web.go b/cmd/web.go index 19ced5a336..5644f37d23 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -15,17 +15,17 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/gtprof" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/public" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/routers/install" + "gitea.dev/modules/container" + "gitea.dev/modules/graceful" + "gitea.dev/modules/gtprof" + "gitea.dev/modules/log" + "gitea.dev/modules/process" + "gitea.dev/modules/public" + "gitea.dev/modules/setting" + "gitea.dev/modules/templates" + "gitea.dev/modules/util" + "gitea.dev/routers" + "gitea.dev/routers/install" "github.com/felixge/fgprof" "github.com/urfave/cli/v3" diff --git a/cmd/web_acme.go b/cmd/web_acme.go index a2e14638f8..512a990e02 100644 --- a/cmd/web_acme.go +++ b/cmd/web_acme.go @@ -13,11 +13,11 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/graceful" + "gitea.dev/modules/log" + "gitea.dev/modules/process" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" "github.com/caddyserver/certmagic" ) diff --git a/cmd/web_graceful.go b/cmd/web_graceful.go index 5e06d2c216..13eb9ddc46 100644 --- a/cmd/web_graceful.go +++ b/cmd/web_graceful.go @@ -9,9 +9,9 @@ import ( "net/http/fcgi" "strings" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/graceful" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" ) func runHTTP(network, listenAddr, name string, m http.Handler, useProxyProtocol bool) error { diff --git a/cmd/web_https.go b/cmd/web_https.go index 70d35cd40d..2eabe32ca5 100644 --- a/cmd/web_https.go +++ b/cmd/web_https.go @@ -9,9 +9,9 @@ import ( "os" "strings" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/graceful" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" "github.com/klauspost/cpuid/v2" ) diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index 50ec3d3954..4908fdf0cc 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -159,6 +159,16 @@ ;; Domain name to be exposed in clone URL, defaults to DOMAIN or the domain part of ROOT_URL ;SSH_DOMAIN = ;; +;; Port number to be exposed in clone URL. +;; If you need a different "SSH clone port" from the real "SSH listen port", set the SSH_LISTEN_PORT separately. +;SSH_PORT = 22 +;; +;; The network interface that the builtin SSH server should listen on +;SSH_LISTEN_HOST = +;; +;; The port number that the builtin SSH server should listen on, defaults to SSH_PORT +;SSH_LISTEN_PORT = +;; ;; SSH username displayed in clone URLs. It defaults to BUILTIN_SSH_SERVER_USER or RUN_USER. ;; If it is set to "(DOER_USERNAME)", it will use current signed-in user's username. ;; This option is only for some advanced users who have configured their SSH reverse-proxy @@ -166,15 +176,6 @@ ;; Most users should just leave it blank. ;SSH_USER = ;; -;; The network interface the builtin SSH server should listen on -;SSH_LISTEN_HOST = -;; -;; Port number to be exposed in clone URL -;SSH_PORT = 22 -;; -;; The port number the builtin SSH server should listen on, defaults to SSH_PORT -;SSH_LISTEN_PORT = -;; ;; Root path of SSH user directory for the system's standalone SSH server if Gitea is not using its builtin SSH server. ;; Default is the '.ssh' directory in the run user's home directory. ;SSH_ROOT_PATH = @@ -1023,9 +1024,18 @@ LEVEL = Info ;; Default private when using push-to-create ;DEFAULT_PUSH_CREATE_PRIVATE = true ;; -;; Global limit of repositories per user, applied at creation time. -1 means no limit +;; Global limit of repositories per user or org, applied at creation time. -1 means no limit +;; To configure independent limits for users and orgs, use USER_MAX_CREATION_LIMIT and ORG_MAX_CREATION_LIMIT ;MAX_CREATION_LIMIT = -1 ;; +;; Global limit of repositories per user, applied at creation time. -1 means no limit +;; Takes precedence over MAX_CREATION_LIMIT when set +;USER_MAX_CREATION_LIMIT = -1 +;; +;; Global limit of repositories per organization, applied at creation time. -1 means no limit +;; Takes precedence over MAX_CREATION_LIMIT when set +;ORG_MAX_CREATION_LIMIT = -1 +;; ;; Preferred Licenses to place at the top of the List ;; The name here must match the filename in options/license or custom/options/license ;PREFERRED_LICENSES = Apache License 2.0,MIT License diff --git a/docs/guideline-backend.md b/docs/guideline-backend.md index bc3e71113f..29fa92288c 100644 --- a/docs/guideline-backend.md +++ b/docs/guideline-backend.md @@ -56,3 +56,8 @@ Endpoints returning lists must - support pagination (`page` & `limit` options in query) - set `X-Total-Count` header via **SetTotalCountHeader** ([example](https://github.com/go-gitea/gitea/blob/7aae98cc5d4113f1e9918b7ee7dd09f67c189e3e/routers/api/v1/repo/issue.go#L444)) + +### Knowledge + +- Partially database table migration must use `SyncWithOptions(IgnoreDrop...)` +- Template variables with "camelCase" or "snake_case" are used for restoring the form values from a submitted form diff --git a/go.mod b/go.mod index 63767aa7b0..e7afe35bec 100644 --- a/go.mod +++ b/go.mod @@ -1,34 +1,30 @@ -module code.gitea.io/gitea +module gitea.dev go 1.26.3 -// rfc5280 said: "The serial number is an integer assigned by the CA to each certificate." -// But some CAs use negative serial number, just relax the check. related: -// Default TLS cert uses negative serial number #895 https://github.com/microsoft/mssql-docker/issues/895 -godebug x509negativeserial=1 - require ( - code.gitea.io/actions-proto-go v0.4.1 - code.gitea.io/sdk/gitea v0.25.1 codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570 - connectrpc.com/connect v1.19.2 - gitea.com/gitea/runner v1.0.3 + connectrpc.com/connect v1.20.0 + gitea.com/gitea/runner v1.0.5 gitea.com/go-chi/binding v0.0.0-20260414111559-654cea7ac60a gitea.com/go-chi/cache v0.2.1 gitea.com/go-chi/captcha v0.0.0-20240315150714-fb487f629098 gitea.com/go-chi/session v0.0.0-20251124165456-68e0254e989e gitea.com/lunny/dingtalk_webhook v0.0.0-20171025031554-e3534c89ef96 gitea.com/lunny/levelqueue v0.4.2-0.20230414023320-3c0159fe0fe4 + gitea.dev/actions-proto-go v0.5.0 + gitea.dev/sdk v1.0.1 github.com/42wim/httpsig v1.2.4 github.com/42wim/sshsig v0.0.0-20260317195500-b9f38cf0d432 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.20.0 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.3 github.com/Azure/go-ntlmssp v0.1.1 github.com/Microsoft/go-winio v0.6.2 + github.com/Necoro/html2text v0.0.0-20250804200300-7bf1ce1c7347 github.com/ProtonMail/go-crypto v1.4.1 github.com/PuerkitoBio/goquery v1.12.0 - github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.8.0 - github.com/alecthomas/chroma/v2 v2.24.1 + github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.8.3 + github.com/alecthomas/chroma/v2 v2.25.0 github.com/aws/aws-sdk-go-v2/credentials v1.19.16 github.com/aws/aws-sdk-go-v2/service/codecommit v1.33.14 github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb @@ -38,8 +34,7 @@ require ( github.com/caddyserver/certmagic v0.25.3 github.com/charmbracelet/git-lfs-transfer v0.1.1-0.20260309112543-12416315a635 github.com/chi-middleware/proxy v1.1.1 - github.com/dimiro1/reply v0.0.0-20200315094148-d0136a4c9e21 - github.com/dlclark/regexp2 v1.12.0 + github.com/dlclark/regexp2/v2 v2.1.0 github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 github.com/dustin/go-humanize v1.0.1 github.com/editorconfig/editorconfig-core-go/v2 v2.6.4 @@ -63,7 +58,7 @@ require ( github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85 github.com/golang-jwt/jwt/v5 v5.3.1 - github.com/google/go-github/v86 v86.0.0 + github.com/google/go-github/v88 v88.0.0 github.com/google/licenseclassifier/v2 v2.0.0 github.com/google/pprof v0.0.0-20260507013755-92041b743c96 github.com/google/uuid v1.6.0 @@ -72,8 +67,7 @@ require ( github.com/hashicorp/go-version v1.9.0 github.com/hashicorp/golang-lru/v2 v2.0.7 github.com/huandu/xstrings v1.5.0 - github.com/jaytaylor/html2text v0.0.0-20260303211410-1a4bdc82ecec - github.com/jhillyerd/enmime/v2 v2.3.0 + github.com/jhillyerd/enmime/v2 v2.4.0 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 github.com/klauspost/compress v1.18.6 github.com/klauspost/cpuid/v2 v2.3.0 @@ -103,15 +97,15 @@ require ( github.com/tstranex/u2f v1.0.0 github.com/ulikunitz/xz v0.5.15 github.com/urfave/cli-docs/v3 v3.1.0 - github.com/urfave/cli/v3 v3.6.1 + github.com/urfave/cli/v3 v3.9.0 github.com/wneessen/go-mail v0.7.3 github.com/yohcop/openid-go v1.0.1 github.com/yuin/goldmark v1.8.2 github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc - gitlab.com/gitlab-org/api/client-go/v2 v2.26.0 + gitlab.com/gitlab-org/api/client-go/v2 v2.30.0 go.yaml.in/yaml/v4 v4.0.0-rc.3 golang.org/x/crypto v0.52.0 - golang.org/x/image v0.40.0 + golang.org/x/image v0.41.0 golang.org/x/net v0.55.0 golang.org/x/oauth2 v0.36.0 golang.org/x/sync v0.20.0 @@ -120,7 +114,6 @@ require ( google.golang.org/grpc v1.81.1 google.golang.org/protobuf v1.36.11 gopkg.in/ini.v1 v1.67.2 - gopkg.in/yaml.v3 v3.0.1 modernc.org/sqlite v1.50.1 mvdan.cc/xurls/v2 v2.6.0 strk.kbt.io/projects/go/libravatar v0.0.0-20260301104140-add494e31dab @@ -183,6 +176,7 @@ require ( github.com/cyphar/filepath-securejoin v0.6.1 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/davidmz/go-pageant v1.0.2 // indirect + github.com/dlclark/regexp2 v1.12.0 // indirect github.com/emersion/go-sasl v0.0.0-20241020182733-b788ff22d5a6 // indirect github.com/fatih/color v1.19.0 // indirect github.com/fxamacker/cbor/v2 v2.9.2 // indirect @@ -224,7 +218,7 @@ require ( github.com/mailru/easyjson v0.7.7 // indirect github.com/markbates/going v1.0.3 // indirect github.com/mattn/go-colorable v0.1.14 // indirect - github.com/mattn/go-runewidth v0.0.21 // indirect + github.com/mattn/go-runewidth v0.0.23 // indirect github.com/mattn/go-shellwords v1.0.12 // indirect github.com/mholt/acmez/v3 v3.1.6 // indirect github.com/miekg/dns v1.1.72 // indirect @@ -243,7 +237,7 @@ require ( github.com/oasdiff/yaml v0.0.9 // indirect github.com/oasdiff/yaml3 v0.0.12 // indirect github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 // indirect - github.com/olekukonko/errors v1.2.0 // indirect + github.com/olekukonko/errors v1.3.0 // indirect github.com/olekukonko/ll v0.1.8 // indirect github.com/olekukonko/tablewriter v1.1.4 // indirect github.com/onsi/ginkgo v1.16.5 // indirect @@ -287,6 +281,7 @@ require ( golang.org/x/tools v0.44.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20260401020348-3a24fdc17823 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect modernc.org/libc v1.72.3 // indirect modernc.org/mathutil v1.7.1 // indirect modernc.org/memory v1.11.0 // indirect @@ -301,8 +296,6 @@ ignore ( // But not all latest versions of dependencies are compatible with other packages or our codebase, so we need to pin some dependencies to specific versions // Need to regularly maintain this list to try to update them to latest versions, especially the TODO ones -replace github.com/jaytaylor/html2text => github.com/Necoro/html2text v0.0.0-20250804200300-7bf1ce1c7347 // jaytaylor/html2text is unmaintained - replace go.yaml.in/yaml/v4 => go.yaml.in/yaml/v4 v4.0.0-rc.3 // rc.4 changes block scalar serialization, wait for stable release replace github.com/Azure/azure-sdk-for-go/sdk/azcore => github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.0 // v1.21.0+ uses API version unsupported by Azurite in CI diff --git a/go.sum b/go.sum index 9ade1fab9e..521779a027 100644 --- a/go.sum +++ b/go.sum @@ -1,21 +1,17 @@ cloud.google.com/go/compute/metadata v0.9.0 h1:pDUj4QMoPejqq20dK0Pg2N4yG9zIkYGdBtwLoEkH9Zs= cloud.google.com/go/compute/metadata v0.9.0/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10= -code.gitea.io/actions-proto-go v0.4.1 h1:l0EYhjsgpUe/1VABo2eK7zcoNX2W44WOnb0MSLrKfls= -code.gitea.io/actions-proto-go v0.4.1/go.mod h1:mn7Wkqz6JbnTOHQpot3yDeHx+O5C9EGhMEE+htvHBas= -code.gitea.io/sdk/gitea v0.25.1 h1:yywxWwoV+SdjHtbC6unBiXojWdZOtoHuGhEazEXeWuE= -code.gitea.io/sdk/gitea v0.25.1/go.mod h1:uDFWYBU8dgZsgOHwe6C/6olxvf8FHguNB3wW1i83fgg= code.pfad.fr/check v1.1.0 h1:GWvjdzhSEgHvEHe2uJujDcpmZoySKuHQNrZMfzfO0bE= code.pfad.fr/check v1.1.0/go.mod h1:NiUH13DtYsb7xp5wll0U4SXx7KhXQVCtRgdC96IPfoM= codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570 h1:TXbikPqa7YRtfU9vS6QJBg77pUvbEb6StRdZO8t1bEY= codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570/go.mod h1:IIAjsijsd8q1isWX8MACefDEgTQslQ4stk2AeeTt3kM= -connectrpc.com/connect v1.19.2 h1:McQ83FGdzL+t60peksi0gXC7MQ/iLKgLduAnThbM0mo= -connectrpc.com/connect v1.19.2/go.mod h1:tN20fjdGlewnSFeZxLKb0xwIZ6ozc3OQs2hTXy4du9w= +connectrpc.com/connect v1.20.0 h1:6TNDAB+WeNd2uolWNlYczB5E0KNNaVMNUEx8JEUsPmQ= +connectrpc.com/connect v1.20.0/go.mod h1:A2ygJrukXwWy32vkCAAHNVguZrqZ+jeZ9rGRnGR4dN4= dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8= dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA= filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= -gitea.com/gitea/runner v1.0.3 h1:jwwXPj2UKSrbFCfyAcqoiXcbaTNQTWlozRb1kikiquw= -gitea.com/gitea/runner v1.0.3/go.mod h1:0xR69LP2GwVJT9QnbLHok/87YIFDmpKnJVLkRKKJbSM= +gitea.com/gitea/runner v1.0.5 h1:9Idm8XXxXp4aHoLp0Ba0AEwv87YUblp9gk4qbih+DlE= +gitea.com/gitea/runner v1.0.5/go.mod h1:ff8SKVat/6FywBGpN4dKi2x3AlHZUfLOA/vVWHf7+Cw= gitea.com/go-chi/binding v0.0.0-20260414111559-654cea7ac60a h1:JHoBrfuTSF9Ke9aNfSYj1XRPBHjKPgCApVprnt2Am0M= gitea.com/go-chi/binding v0.0.0-20260414111559-654cea7ac60a/go.mod h1:FOsLJIMdpiHzBp3Vby6Wfkdw2ppGscrjgU1IC7E4/zQ= gitea.com/go-chi/cache v0.2.1 h1:bfAPkvXlbcZxPCpcmDVCWoHgiBSBmZN/QosnZvEC0+g= @@ -30,6 +26,10 @@ gitea.com/lunny/levelqueue v0.4.2-0.20230414023320-3c0159fe0fe4 h1:IFT+hup2xejHq gitea.com/lunny/levelqueue v0.4.2-0.20230414023320-3c0159fe0fe4/go.mod h1:HBqmLbz56JWpfEGG0prskAV97ATNRoj5LDmPicD22hU= gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s= gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU= +gitea.dev/actions-proto-go v0.5.0 h1:Fc3DI4Fm3B3JBRXFUjegql+usoNAjjAw1cxMansfA2I= +gitea.dev/actions-proto-go v0.5.0/go.mod h1:p4RX+D9oqiEEzzkPMXscw2CmaGuYFPWFc6xIOmDNDqs= +gitea.dev/sdk v1.0.1 h1:CWXQUQvp2I6YKOWkhYo1Flx2sRNfMK1X9Op4oR2awXs= +gitea.dev/sdk v1.0.1/go.mod h1:jCf5Uzz0Jkb61jxNgMxLOCWwle1J1B2nKdcRtxuK9rY= github.com/42wim/httpsig v1.2.4 h1:mI5bH0nm4xn7K18fo1K3okNDRq8CCJ0KbBYWyA6r8lU= github.com/42wim/httpsig v1.2.4/go.mod h1:yKsYfSyTBEohkPik224QPFylmzEBtda/kjyIAJjh3ps= github.com/42wim/sshsig v0.0.0-20260317195500-b9f38cf0d432 h1:3Fcz1QzlS7Jv4FT2KI3cHNSZL+KPN3dXxurn9f3YL/Y= @@ -71,13 +71,13 @@ github.com/RoaringBitmap/roaring/v2 v2.16.0 h1:Kys1UNf49d5W8Tq3bpuAhIr/Z8/yPB+59 github.com/RoaringBitmap/roaring/v2 v2.16.0/go.mod h1:eq4wdNXxtJIS/oikeCzdX1rBzek7ANzbth041hrU8Q4= github.com/STARRY-S/zip v0.2.3 h1:luE4dMvRPDOWQdeDdUxUoZkzUIpTccdKdhHHsQJ1fm4= github.com/STARRY-S/zip v0.2.3/go.mod h1:lqJ9JdeRipyOQJrYSOtpNAiaesFO6zVDsE8GIGFaoSk= -github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.8.0 h1:tgjwQrDH5m6jIYB7kac5IQZmfUzQNseac/e3H4VoCNE= -github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.8.0/go.mod h1:1HmmMEVsr+0R1QWahSeMJkjSkq6CYAZu1aIbYSpfJ4o= +github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.8.3 h1:ikrUPushSxbpr9mmDhSgz1KyUTChjwkDrxY/jzv2OTQ= +github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.8.3/go.mod h1:bnXbvnI9Mfqdj4L3Y9aCsB1A/ztuYLNRzgVKsJFgR/U= github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0= github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= github.com/alecthomas/chroma/v2 v2.2.0/go.mod h1:vf4zrexSH54oEjJ7EdB65tGNHmH3pGZmVkgTP5RHvAs= -github.com/alecthomas/chroma/v2 v2.24.1 h1:m5ffpfZbIb++k8AqFEKy9uVgY12xIQtBsQlc6DfZJQM= -github.com/alecthomas/chroma/v2 v2.24.1/go.mod h1:l+ohZ9xRXIbGe7cIW+YZgOGbvuVLjMps/FYN/CwuabI= +github.com/alecthomas/chroma/v2 v2.25.0 h1:DWkVlxrNpxPf+Qcfe04LBqUArxUiybK8ZQ9T7OFu68E= +github.com/alecthomas/chroma/v2 v2.25.0/go.mod h1:+95AZrRWlpW9g6qXD7S7UdHviopsGP/kCIrtJcU3QoQ= github.com/alecthomas/repr v0.0.0-20220113201626-b1b626ac65ae/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8= github.com/alecthomas/repr v0.5.2 h1:SU73FTI9D1P5UNtvseffFSGmdNci/O6RsqzeXJtP0Qs= github.com/alecthomas/repr v0.5.2/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= @@ -236,13 +236,12 @@ github.com/davidmz/go-pageant v1.0.2 h1:bPblRCh5jGU+Uptpz6LgMZGD5hJoOt7otgT454Wv github.com/davidmz/go-pageant v1.0.2/go.mod h1:P2EDDnMqIwG5Rrp05dTRITj9z2zpGcD9efWSkTNKLIE= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= -github.com/dimiro1/reply v0.0.0-20200315094148-d0136a4c9e21 h1:PdsjTl0Cg+ZJgOx/CFV5NNgO1ThTreqdgKYiDCMHJwA= -github.com/dimiro1/reply v0.0.0-20200315094148-d0136a4c9e21/go.mod h1:xJvkyD6Y2rZapGvPJLYo9dyx1s5dxBEDPa8T3YTuOk0= -github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= github.com/dlclark/regexp2 v1.12.0 h1:0j4c5qQmnC6XOWNjP3PIXURXN2gWx76rd3KvgdPkCz8= github.com/dlclark/regexp2 v1.12.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= +github.com/dlclark/regexp2/v2 v2.1.0 h1:jHXRmHRZGbuQzDZjMlCAXOvQb75iv3HyLDzXGj5H1AY= +github.com/dlclark/regexp2/v2 v2.1.0/go.mod h1:Bz5TMy5d8fPK0ximH0Yi9KvsRHNnvXqUx9XG6a4wB+I= github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 h1:2tV76y6Q9BB+NEBasnqvs7e49aEBFI8ejC89PSnWH+4= github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707/go.mod h1:qssHWj60/X5sZFNxpG4HBPDHVqxNm4DfnCKgrbZOT+s= github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY= @@ -381,8 +380,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= -github.com/google/go-github/v86 v86.0.0 h1:S/6aANJhwRm8EQmGKVML3j41yq0h2BsTP8FnDkO7kcA= -github.com/google/go-github/v86 v86.0.0/go.mod h1:zKv1l4SwDXNFMGByi2FWkq71KwSXqj/eQRZuqtmcot8= +github.com/google/go-github/v88 v88.0.0 h1:dZA9IKkPK1eXZj4ypngnpRj5FwdpTv4whix2PrQMP7M= +github.com/google/go-github/v88 v88.0.0/go.mod h1:rufTDgn2N45wjhukLTyxmvc9nilSp3mr3Rgtt6b1MPw= github.com/google/go-querystring v1.2.0 h1:yhqkPbu2/OH+V9BfpCVPZkNmUXhb2gBxJArfhIxNtP0= github.com/google/go-querystring v1.2.0/go.mod h1:8IFJqpSRITyJ8QhQ13bmbeMBDfmeEJZD5A0egEOmkqU= github.com/google/go-tpm v0.9.8 h1:slArAR9Ft+1ybZu0lBwpSmpwhRXaa85hWtMinMyRAWo= @@ -461,8 +460,8 @@ github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh6 github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs= github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= -github.com/jhillyerd/enmime/v2 v2.3.0 h1:Y/pzQanyU8nkSgB2npXX8Dha5OItJE/QwbDJM4sf/kU= -github.com/jhillyerd/enmime/v2 v2.3.0/go.mod h1:mGKXAP45l6pF6HZiaLhgSYsgteJskaSIYmEZXpw6ZpI= +github.com/jhillyerd/enmime/v2 v2.4.0 h1:6bPyyg2OPXEK1fKsLT89DntZf05LqaL2cIx+cvkEXTo= +github.com/jhillyerd/enmime/v2 v2.4.0/go.mod h1:TLpvqImPiumRecsJK5TYseRw2bPg3g0EtWc+SfU7cMs= github.com/jonboulle/clockwork v0.5.0 h1:Hyh9A8u51kptdkR+cqRpT1EebBwTn1oK9YfGYbdFz6I= github.com/jonboulle/clockwork v0.5.0/go.mod h1:3mZlmanh0g2NDKO5TWZVJAfofYk64M7XN3SzBPjZF60= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= @@ -517,8 +516,8 @@ github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHP github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4= github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4= -github.com/mattn/go-runewidth v0.0.21 h1:jJKAZiQH+2mIinzCJIaIG9Be1+0NR+5sz/lYEEjdM8w= -github.com/mattn/go-runewidth v0.0.21/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs= +github.com/mattn/go-runewidth v0.0.23 h1:7ykA0T0jkPpzSvMS5i9uoNn2Xy3R383f9HDx3RybWcw= +github.com/mattn/go-runewidth v0.0.23/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs= github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk= github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= github.com/mattn/go-sqlite3 v1.14.44 h1:3VSe+xafpbzsLbdr2AWlAZk9yRHiBhTBakioXaCKTF8= @@ -578,8 +577,8 @@ github.com/oasdiff/yaml3 v0.0.12 h1:75urAtPeDg2/iDEWwzNrLOWxI9N/dCh81nTTJtokt2M= github.com/oasdiff/yaml3 v0.0.12/go.mod h1:y5+oSEHCPT/DGrS++Wc/479ERge0zTFxaF8PbGKcg2o= github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 h1:zrbMGy9YXpIeTnGj4EljqMiZsIcE09mmF8XsD5AYOJc= github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6/go.mod h1:rEKTHC9roVVicUIfZK7DYrdIoM0EOr8mK1Hj5s3JjH0= -github.com/olekukonko/errors v1.2.0 h1:10Zcn4GeV59t/EGqJc8fUjtFT/FuUh5bTMzZ1XwmCRo= -github.com/olekukonko/errors v1.2.0/go.mod h1:ppzxA5jBKcO1vIpCXQ9ZqgDh8iwODz6OXIGKU8r5m4Y= +github.com/olekukonko/errors v1.3.0 h1:teJvgLGUEqMzBUms+Dj3/3szNqCG/Jdw9iDbum8fR6U= +github.com/olekukonko/errors v1.3.0/go.mod h1:ppzxA5jBKcO1vIpCXQ9ZqgDh8iwODz6OXIGKU8r5m4Y= github.com/olekukonko/ll v0.1.8 h1:ysHCJRGHYKzmBSdz9w5AySztx7lG8SQY+naTGYUbsz8= github.com/olekukonko/ll v0.1.8/go.mod h1:RPRC6UcscfFZgjo1nulkfMH5IM0QAYim0LfnMvUuozw= github.com/olekukonko/tablewriter v1.1.4 h1:ORUMI3dXbMnRlRggJX3+q7OzQFDdvgbN9nVWj1drm6I= @@ -720,8 +719,8 @@ github.com/unknwon/com v1.0.1 h1:3d1LTxD+Lnf3soQiD4Cp/0BRB+Rsa/+RTvz8GMMzIXs= github.com/unknwon/com v1.0.1/go.mod h1:tOOxU81rwgoCLoOVVPHb6T/wt8HZygqH5id+GNnlCXM= github.com/urfave/cli-docs/v3 v3.1.0 h1:Sa5xm19IpE5gpm6tZzXdfjdFxn67PnEsE4dpXF7vsKw= github.com/urfave/cli-docs/v3 v3.1.0/go.mod h1:59d+5Hz1h6GSGJ10cvcEkbIe3j233t4XDqI72UIx7to= -github.com/urfave/cli/v3 v3.6.1 h1:j8Qq8NyUawj/7rTYdBGrxcH7A/j7/G8Q5LhWEW4G3Mo= -github.com/urfave/cli/v3 v3.6.1/go.mod h1:ysVLtOEmg2tOy6PknnYVhDoouyC/6N42TMeoMzskhso= +github.com/urfave/cli/v3 v3.9.0 h1:AV9lIiPv3ukYnxunaCUsHnEozptYmDN2F0+yWqLMn/c= +github.com/urfave/cli/v3 v3.9.0/go.mod h1:ysVLtOEmg2tOy6PknnYVhDoouyC/6N42TMeoMzskhso= github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= github.com/wneessen/go-mail v0.7.3 h1:g3DravXC5SMlVdboFrQA8Jx95A8sOzoBeS5F+vzNRK0= github.com/wneessen/go-mail v0.7.3/go.mod h1:QGhBX0yNbc1J+Mkjcu7z2rpj4B4l+BmDY8gYznPC9sk= @@ -753,8 +752,8 @@ github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo= github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4= github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs= github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s= -gitlab.com/gitlab-org/api/client-go/v2 v2.26.0 h1:1E35d1GRLb22Yq7Jr4gWptjW1+Vg7ZDGogK/SZ6ijV8= -gitlab.com/gitlab-org/api/client-go/v2 v2.26.0/go.mod h1:wx4w52UDENs3jolsL9cYT4byPNN9Pc6UpfGtCcHEIWY= +gitlab.com/gitlab-org/api/client-go/v2 v2.30.0 h1:guXC+uOA325P1FIwUVesPoDcnogHnbPrhV8c+wMHZPE= +gitlab.com/gitlab-org/api/client-go/v2 v2.30.0/go.mod h1:0upZTKi9YMMvhavTlKJ3YgQUZE/GJkcLmXT/+6knTXU= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/bbolt v1.4.3 h1:dEadXpI6G79deX5prL3QRNP6JB8UxVkqo4UPnHaNXJo= go.etcd.io/bbolt v1.4.3/go.mod h1:tKQlpPaYCVFctUIgFKFnAlvbmB3tpy1vkTnDWohtc0E= @@ -794,8 +793,8 @@ golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988= golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc= golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f h1:W3F4c+6OLc6H2lb//N1q4WpJkhzJCK5J6kUi1NTVXfM= golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f/go.mod h1:J1xhfL/vlindoeF/aINzNzt2Bket5bjo9sdOYzOsU80= -golang.org/x/image v0.40.0 h1:Tw4GyDXMo+daZN1znreBRC3VayR1aLFUyUEOLUdW1a8= -golang.org/x/image v0.40.0/go.mod h1:uIc348UZMSvS5Z65CVZ7iDPaNobNFEPeJ4kbqTOszmA= +golang.org/x/image v0.41.0 h1:8wS72eGJMJaBxK6okTzd4WaXumUlTVlb753MlsSvTCo= +golang.org/x/image v0.41.0/go.mod h1:uIc348UZMSvS5Z65CVZ7iDPaNobNFEPeJ4kbqTOszmA= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= diff --git a/main.go b/main.go index fcfbb73371..bdb962f4fc 100644 --- a/main.go +++ b/main.go @@ -10,16 +10,16 @@ import ( "strings" "time" - "code.gitea.io/gitea/cmd" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/cmd" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" // register supported doc types - _ "code.gitea.io/gitea/modules/markup/asciicast" - _ "code.gitea.io/gitea/modules/markup/console" - _ "code.gitea.io/gitea/modules/markup/csv" - _ "code.gitea.io/gitea/modules/markup/markdown" - _ "code.gitea.io/gitea/modules/markup/orgmode" + _ "gitea.dev/modules/markup/asciicast" + _ "gitea.dev/modules/markup/console" + _ "gitea.dev/modules/markup/csv" + _ "gitea.dev/modules/markup/markdown" + _ "gitea.dev/modules/markup/orgmode" "github.com/urfave/cli/v3" ) diff --git a/models/actions/artifact.go b/models/actions/artifact.go index 1de83a29c5..8a50c09179 100644 --- a/models/actions/artifact.go +++ b/models/actions/artifact.go @@ -11,10 +11,10 @@ import ( "errors" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/optional" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/actions/config.go b/models/actions/config.go index 4f5357c560..f4d99b8f7a 100644 --- a/models/actions/config.go +++ b/models/actions/config.go @@ -6,11 +6,11 @@ package actions import ( "context" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/perm" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/modules/json" + "gitea.dev/modules/util" "xorm.io/xorm/convert" ) diff --git a/models/actions/main_test.go b/models/actions/main_test.go index 3c878c6844..c3ae15d769 100644 --- a/models/actions/main_test.go +++ b/models/actions/main_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/unittest" ) func TestMain(m *testing.M) { diff --git a/models/actions/run.go b/models/actions/run.go index 61cc4599b6..bba6b4c34e 100644 --- a/models/actions/run.go +++ b/models/actions/run.go @@ -10,19 +10,17 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" - - "xorm.io/builder" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/modules/git" + "gitea.dev/modules/json" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" + webhook_module "gitea.dev/modules/webhook" ) // ActionRun represents a run of a workflow file @@ -253,96 +251,6 @@ func UpdateRepoRunsNumbers(ctx context.Context, repoID int64) { } } -// CancelPreviousJobs cancels all previous jobs of the same repository, reference, workflow, and event. -// It's useful when a new run is triggered, and all previous runs needn't be continued anymore. -func CancelPreviousJobs(ctx context.Context, repoID int64, ref, workflowID string, event webhook_module.HookEventType) ([]*ActionRunJob, error) { - // Find all runs in the specified repository, reference, and workflow with non-final status - runs, total, err := db.FindAndCount[ActionRun](ctx, FindRunOptions{ - RepoID: repoID, - Ref: ref, - WorkflowID: workflowID, - TriggerEvent: event, - Status: []Status{StatusRunning, StatusWaiting, StatusBlocked, StatusCancelling}, - }) - if err != nil { - return nil, err - } - - // If there are no runs found, there's no need to proceed with cancellation, so return nil. - if total == 0 { - return nil, nil - } - - cancelledJobs := make([]*ActionRunJob, 0, total) - - // Iterate over each found run and cancel its associated jobs. - for _, run := range runs { - // Find all jobs associated with the current run. - jobs, err := db.Find[ActionRunJob](ctx, FindRunJobOptions{ - RunID: run.ID, - }) - if err != nil { - return cancelledJobs, err - } - - cjs, err := CancelJobs(ctx, jobs) - if err != nil { - return cancelledJobs, err - } - cancelledJobs = append(cancelledJobs, cjs...) - } - - // Return nil to indicate successful cancellation of all running and waiting jobs. - return cancelledJobs, nil -} - -func CancelJobs(ctx context.Context, jobs []*ActionRunJob) ([]*ActionRunJob, error) { - cancelledJobs := make([]*ActionRunJob, 0, len(jobs)) - // Iterate over each job and attempt to cancel it. - for _, job := range jobs { - // Skip jobs that are already in a terminal state (completed, cancelled, etc.). - status := job.Status - if status.IsDone() { - continue - } - - // If the job has no associated task (probably an error), set its status to 'Cancelled' and stop it. - if job.TaskID == 0 { - job.Status = StatusCancelled - job.Stopped = timeutil.TimeStampNow() - - // Update the job's status and stopped time in the database. - n, err := UpdateRunJob(ctx, job, builder.Eq{"task_id": 0}, "status", "stopped") - if err != nil { - return cancelledJobs, err - } - - // If the update affected 0 rows, it means the job has changed in the meantime - if n == 0 { - log.Error("Failed to cancel job %d because it has changed", job.ID) - continue - } - - cancelledJobs = append(cancelledJobs, job) - // Continue with the next job. - continue - } - - // If the job has an associated task, try to stop the task, effectively cancelling the job. - if err := StopTask(ctx, job.TaskID, StatusCancelling); err != nil { - return cancelledJobs, err - } - updatedJob, err := GetRunJobByRunAndID(ctx, job.RunID, job.ID) - if err != nil { - return cancelledJobs, fmt.Errorf("get job: %w", err) - } - cancelledJobs = append(cancelledJobs, updatedJob) - } - - // Return nil to indicate successful cancellation of all running and waiting jobs. - return cancelledJobs, nil -} - func GetRunByRepoAndID(ctx context.Context, repoID, runID int64) (*ActionRun, error) { var run ActionRun has, err := db.GetEngine(ctx).Where("id=? AND repo_id=?", runID, repoID).Get(&run) diff --git a/models/actions/run_attempt.go b/models/actions/run_attempt.go index 857247b068..778b153cb4 100644 --- a/models/actions/run_attempt.go +++ b/models/actions/run_attempt.go @@ -9,11 +9,11 @@ import ( "slices" "time" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + user_model "gitea.dev/models/user" + "gitea.dev/modules/log" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" ) // ActionRunAttempt represents a single execution attempt of an ActionRun. diff --git a/models/actions/run_attempt_list.go b/models/actions/run_attempt_list.go index 77a5b8f15c..9c125d559e 100644 --- a/models/actions/run_attempt_list.go +++ b/models/actions/run_attempt_list.go @@ -6,9 +6,9 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" + "gitea.dev/models/db" + user_model "gitea.dev/models/user" + "gitea.dev/modules/container" ) type ActionRunAttemptList []*ActionRunAttempt diff --git a/models/actions/run_job.go b/models/actions/run_job.go index 7a63845401..caf66ca451 100644 --- a/models/actions/run_job.go +++ b/models/actions/run_job.go @@ -9,11 +9,13 @@ import ( "slices" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/actions/jobparser" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/modules/actions/jobparser" + "gitea.dev/modules/log" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" + webhook_module "gitea.dev/modules/webhook" "xorm.io/builder" ) @@ -75,14 +77,55 @@ type ActionRunJob struct { // A value of 0 indicates a legacy job created before ActionRunAttempt existed. AttemptJobID int64 `xorm:"index NOT NULL DEFAULT 0"` + // WorkflowSourceRepoID + WorkflowSourceCommitSHA record the (repo, commit) this job's containing workflow file came from. + WorkflowSourceRepoID int64 `xorm:"NOT NULL DEFAULT 0"` + WorkflowSourceCommitSHA string `xorm:"VARCHAR(64) NOT NULL DEFAULT ''"` + + // IsReusableCaller marks this job as a reusable workflow caller. + // Caller jobs do not run on a runner; their status is derived from their child jobs. + IsReusableCaller bool `xorm:"index NOT NULL DEFAULT FALSE"` + // IsExpanded reports whether this job's lazy expansion (children-row insertion) is complete. + // For a reusable workflow caller, true means children rows exist and CallPayload is populated. + IsExpanded bool `xorm:"NOT NULL DEFAULT FALSE"` + // CallUses stores the raw "uses:" string of a reusable workflow caller job. + // Only set when IsReusableCaller is true. + CallUses string `xorm:"VARCHAR(512) NOT NULL DEFAULT ''"` + // ReusableWorkflowContent is the content of the reusable workflow specified by "uses:". + // Only set when IsReusableCaller is true. + ReusableWorkflowContent []byte `xorm:"LONGBLOB"` + // CallSecrets encodes the reusable workflow caller's "secrets:" section: + // - "" : no "secrets:" section (children only see auto-generated tokens). + // - "inherit" : the caller wrote "secrets: inherit". + // - JSON object : explicit mapping {alias: source_name}; names only, no values. + // Only set when IsReusableCaller is true. + CallSecrets string `xorm:"LONGTEXT"` + // CallPayload is the JSON-encoded WorkflowCallPayload exposed to children as gitea.event. + // Populated atomically with IsExpanded at the end of expandReusableWorkflowCaller. + // Only set when IsReusableCaller is true. + CallPayload string `xorm:"LONGTEXT"` + + // ParentJobID scopes `Needs` resolution: name lookups happen only among rows sharing the same ParentJobID. 0 for top-level rows. + ParentJobID int64 `xorm:"index NOT NULL DEFAULT 0"` + Started timeutil.TimeStamp Stopped timeutil.TimeStamp Created timeutil.TimeStamp `xorm:"created"` Updated timeutil.TimeStamp `xorm:"updated index"` } +// ActionRunAttemptJobIDIndex backs the run-wide AttemptJobID counter, keyed by ActionRun.ID. +// Use GetNextAttemptJobID to allocate the next ID for a run. +type ActionRunAttemptJobIDIndex db.ResourceIndex + +// GetNextAttemptJobID atomically allocates the next AttemptJobID for a job in the given run. +// AttemptJobIDs are unique within a single attempt and stable across attempts for the same logical job +func GetNextAttemptJobID(ctx context.Context, runID int64) (int64, error) { + return db.GetNextResourceIndex(ctx, "action_run_attempt_job_id_index", runID) +} + func init() { db.RegisterModel(new(ActionRunJob)) + db.RegisterModel(new(ActionRunAttemptJobIDIndex)) } func (job *ActionRunJob) Duration() time.Duration { @@ -218,6 +261,101 @@ func GetRunJobsByRunAndAttemptID(ctx context.Context, runID, runAttemptID int64) return jobs, nil } +// GetPriorAttemptChildrenByParent returns the children of the most recent prior attempt where +// the parent (identified by parentAttemptJobID) actually had children, indexed by child JobID then child Name. +// Returns (nil, nil) when no such attempt exists. +// The (JobID, Name) key disambiguates both reusable-workflow subtrees and matrix-expanded instances (whose Name carries the matrix suffix). +func GetPriorAttemptChildrenByParent(ctx context.Context, runID, currentAttemptID, parentAttemptJobID int64) (map[string]map[string]*ActionRunJob, error) { + // query every prior caller row sharing this AttemptJobID, newest first. + var priorCallers []*ActionRunJob + if err := db.GetEngine(ctx). + Where("run_id = ? AND attempt_job_id = ? AND run_attempt_id < ?", runID, parentAttemptJobID, currentAttemptID). + Desc("run_attempt_id"). + Find(&priorCallers); err != nil { + return nil, fmt.Errorf("find prior callers: %w", err) + } + if len(priorCallers) == 0 { + return nil, nil //nolint:nilnil // caller is brand new in this attempt + } + + // query for every child of every prior caller + callerIDs := make([]int64, len(priorCallers)) + for i, c := range priorCallers { + callerIDs[i] = c.ID + } + var allChildren []*ActionRunJob + if err := db.GetEngine(ctx). + Where("run_id = ?", runID). + In("parent_job_id", callerIDs). + Find(&allChildren); err != nil { + return nil, fmt.Errorf("find prior children: %w", err) + } + + childrenByCallerID := make(map[int64][]*ActionRunJob, len(callerIDs)) + for _, c := range allChildren { + childrenByCallerID[c.ParentJobID] = append(childrenByCallerID[c.ParentJobID], c) + } + + // Walk priorCallers in run_attempt_id-desc order and return the children of the first caller that actually had any. + // Skipped attempts (caller exists but no children) are bypassed. + for _, caller := range priorCallers { + children := childrenByCallerID[caller.ID] + if len(children) == 0 { + continue + } + out := make(map[string]map[string]*ActionRunJob) + for _, c := range children { + if out[c.JobID] == nil { + out[c.JobID] = make(map[string]*ActionRunJob) + } + out[c.JobID][c.Name] = c + } + return out, nil + } + + return nil, nil //nolint:nilnil // every prior attempt skipped this caller +} + +// GetDirectChildJobsByParent returns the direct child jobs of a parent job (e.g. a reusable workflow caller). +func GetDirectChildJobsByParent(ctx context.Context, parentJob *ActionRunJob) (ActionJobList, error) { + var jobs []*ActionRunJob + if err := db.GetEngine(ctx). + Where("run_id=? AND parent_job_id=?", parentJob.RunID, parentJob.ID). + OrderBy("id"). + Find(&jobs); err != nil { + return nil, err + } + return jobs, nil +} + +// CollectAllDescendantJobs returns every job in `allJobs` that lives under parent's subtree (recursively), excluding `parent` itself +func CollectAllDescendantJobs(parent *ActionRunJob, allJobs []*ActionRunJob) []*ActionRunJob { + parents := map[int64]bool{parent.ID: true} + for { + grew := false + for _, j := range allJobs { + if j.ParentJobID == 0 { + continue + } + if parents[j.ParentJobID] && !parents[j.ID] { + parents[j.ID] = true + grew = true + } + } + if !grew { + break + } + } + out := make([]*ActionRunJob, 0) + for _, j := range allJobs { + if j.ID == parent.ID || !parents[j.ID] { + continue + } + out = append(out, j) + } + return out +} + func UpdateRunJob(ctx context.Context, job *ActionRunJob, cond builder.Cond, cols ...string) (int64, error) { e := db.GetEngine(ctx) @@ -242,7 +380,8 @@ func UpdateRunJob(ctx context.Context, job *ActionRunJob, cond builder.Cond, col return affected, nil } - if slices.Contains(cols, "status") && job.Status.IsWaiting() { + // Reusable workflow caller jobs are never picked up by runners, so they don't need a task-version bump. + if statusUpdated && job.Status.IsWaiting() && !job.IsReusableCaller { // if the status of job changes to waiting again, increase tasks version. if err := IncreaseTaskVersion(ctx, job.OwnerID, job.RepoID); err != nil { return 0, err @@ -256,6 +395,15 @@ func UpdateRunJob(ctx context.Context, job *ActionRunJob, cond builder.Cond, col } } + if statusUpdated && job.ParentJobID > 0 { + // Reusable workflow caller's children cascade their status changes upward to the parent caller. + parent, err := GetRunJobByRunAndID(ctx, job.RunID, job.ParentJobID) + if err != nil { + return affected, fmt.Errorf("load parent caller %d: %w", job.ParentJobID, err) + } + return affected, RefreshReusableCallerStatus(ctx, parent) + } + { // Other goroutines may aggregate the status of the attempt/run and update it too. // So we need to load the current jobs before updating the aggregate state. @@ -308,6 +456,44 @@ func UpdateRunJob(ctx context.Context, job *ActionRunJob, cond builder.Cond, col return affected, nil } +// RefreshReusableCallerStatus recomputes a reusable workflow caller's Status, Started and Stopped from its current direct children and persists the change. +// No-op if caller is not a reusable caller. +// +// Concurrency: two sibling children finishing at roughly the same time can each invoke this for the same parent caller. +// No row-level lock is taken because AggregateJobStatus is a pure function of the children's statuses (order-independent), so racing callers arrive at the same Status. +func RefreshReusableCallerStatus(ctx context.Context, caller *ActionRunJob) error { + if !caller.IsReusableCaller { + return nil + } + children, err := GetDirectChildJobsByParent(ctx, caller) + if err != nil { + return err + } + + newStatus := AggregateJobStatus(children) + cols := make([]string, 0, 3) + if caller.Status != newStatus { + caller.Status = newStatus + cols = append(cols, "status") + } + if newStatus != StatusSkipped { + now := timeutil.TimeStampNow() + if caller.Started.IsZero() && newStatus == StatusRunning { + caller.Started = now + cols = append(cols, "started") + } + if caller.Stopped.IsZero() && newStatus.IsDone() { + caller.Stopped = now + cols = append(cols, "stopped") + } + } + if len(cols) == 0 { + return nil + } + _, err = UpdateRunJob(ctx, caller, nil, cols...) + return err +} + func AggregateJobStatus(jobs []*ActionRunJob) Status { allSuccessOrSkipped := len(jobs) != 0 allSkipped := len(jobs) != 0 @@ -346,6 +532,49 @@ func AggregateJobStatus(jobs []*ActionRunJob) Status { } } +// CancelPreviousJobs cancels all previous jobs of the same repository, reference, workflow, and event. +// It's useful when a new run is triggered, and all previous runs needn't be continued anymore. +func CancelPreviousJobs(ctx context.Context, repoID int64, ref, workflowID string, event webhook_module.HookEventType) ([]*ActionRunJob, error) { + // Find all runs in the specified repository, reference, and workflow with non-final status + runs, total, err := db.FindAndCount[ActionRun](ctx, FindRunOptions{ + RepoID: repoID, + Ref: ref, + WorkflowID: workflowID, + TriggerEvent: event, + Status: []Status{StatusRunning, StatusWaiting, StatusBlocked, StatusCancelling}, + }) + if err != nil { + return nil, err + } + + // If there are no runs found, there's no need to proceed with cancellation, so return nil. + if total == 0 { + return nil, nil + } + + cancelledJobs := make([]*ActionRunJob, 0, total) + + // Iterate over each found run and cancel its associated jobs. + for _, run := range runs { + // Find all jobs associated with the current run. + jobs, err := db.Find[ActionRunJob](ctx, FindRunJobOptions{ + RunID: run.ID, + }) + if err != nil { + return cancelledJobs, err + } + + cjs, err := CancelJobs(ctx, jobs) + if err != nil { + return cancelledJobs, err + } + cancelledJobs = append(cancelledJobs, cjs...) + } + + // Return nil to indicate successful cancellation of all running and waiting jobs. + return cancelledJobs, nil +} + func CancelPreviousJobsByJobConcurrency(ctx context.Context, job *ActionRunJob) (jobsToCancel []*ActionRunJob, _ error) { if job.RawConcurrency == "" { return nil, nil @@ -383,3 +612,84 @@ func CancelPreviousJobsByJobConcurrency(ctx context.Context, job *ActionRunJob) return CancelJobs(ctx, jobsToCancel) } + +func CancelJobs(ctx context.Context, jobs []*ActionRunJob) ([]*ActionRunJob, error) { + cancelledJobs := make([]*ActionRunJob, 0, len(jobs)) + + for _, job := range jobs { + if job.IsReusableCaller { + sub, err := cancelReusableCaller(ctx, job) + if err != nil { + return cancelledJobs, err + } + cancelledJobs = append(cancelledJobs, sub...) + continue + } + + c, err := cancelOneJob(ctx, job) + if err != nil { + return cancelledJobs, err + } + if c != nil { + cancelledJobs = append(cancelledJobs, c) + } + } + return cancelledJobs, nil +} + +// cancelOneJob cancels a single job and returns the post-cancel row +func cancelOneJob(ctx context.Context, job *ActionRunJob) (*ActionRunJob, error) { + if job.Status.IsDone() { + return nil, nil //nolint:nilnil // signal "nothing to cancel; not an error" + } + // No associated task: mark Cancelled directly. This includes reusable callers and jobs that never reached PickTask. + if job.TaskID == 0 { + job.Status = StatusCancelled + job.Stopped = timeutil.TimeStampNow() + n, err := UpdateRunJob(ctx, job, builder.Eq{"task_id": 0}, "status", "stopped") + if err != nil { + return nil, err + } + if n == 0 { + log.Error("Failed to cancel job %d because it has changed", job.ID) + return nil, nil //nolint:nilnil // signal "nothing to cancel; not an error" + } + return job, nil + } + // Has a task: stop the task and re-read the row. + if err := StopTask(ctx, job.TaskID, StatusCancelling); err != nil { + return nil, err + } + updated, err := GetRunJobByRunAndID(ctx, job.RunID, job.ID) + if err != nil { + return nil, fmt.Errorf("get job: %w", err) + } + return updated, nil +} + +// cancelReusableCaller cancels `caller` and all its child jobs +func cancelReusableCaller(ctx context.Context, caller *ActionRunJob) ([]*ActionRunJob, error) { + cancelledJobs := make([]*ActionRunJob, 0) + + if c, err := cancelOneJob(ctx, caller); err != nil { + return cancelledJobs, err + } else if c != nil { + cancelledJobs = append(cancelledJobs, c) + } + + attemptJobs, err := GetRunJobsByRunAndAttemptID(ctx, caller.RunID, caller.RunAttemptID) + if err != nil { + return cancelledJobs, err + } + + for _, c := range CollectAllDescendantJobs(caller, attemptJobs) { + cancelled, err := cancelOneJob(ctx, c) + if err != nil { + return cancelledJobs, err + } + if cancelled != nil { + cancelledJobs = append(cancelledJobs, cancelled) + } + } + return cancelledJobs, nil +} diff --git a/models/actions/run_job_list.go b/models/actions/run_job_list.go index 5f4e482720..f08f7c84a6 100644 --- a/models/actions/run_job_list.go +++ b/models/actions/run_job_list.go @@ -7,12 +7,12 @@ import ( "context" "slices" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/modules/base" + "gitea.dev/modules/container" + "gitea.dev/modules/optional" + "gitea.dev/modules/timeutil" "xorm.io/builder" ) diff --git a/models/actions/run_job_test.go b/models/actions/run_job_test.go new file mode 100644 index 0000000000..a9e07ce0cf --- /dev/null +++ b/models/actions/run_job_test.go @@ -0,0 +1,133 @@ +// Copyright 2026 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package actions + +import ( + "testing" + + "gitea.dev/models/db" + "gitea.dev/models/unittest" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestGetPriorAttemptChildrenByParent(t *testing.T) { + require.NoError(t, unittest.PrepareTestDatabase()) + ctx := t.Context() + + // 3 attempts of one run: + // 1: caller expanded with 3 matrix instances of "work" + non-matrix sibling "summary". + // 2: caller skipped, no children rows. + // 3: placeholder "current" attempt for the walkback subtest. + + run := &ActionRun{ + Title: "prior-children-test", + RepoID: 4, + Index: 9501, + OwnerID: 1, + WorkflowID: "matrix.yaml", + TriggerUserID: 1, + Ref: "refs/heads/master", + CommitSHA: "c2d72f548424103f01ee1dc02889c1e2bff816b0", + Event: "push", + TriggerEvent: "push", + EventPayload: "{}", + Status: StatusSuccess, + } + require.NoError(t, db.Insert(ctx, run)) + + const callerAttemptJobID int64 = 9001 + insertAttempt := func(t *testing.T, num int64, status Status) *ActionRunAttempt { + t.Helper() + a := &ActionRunAttempt{ + RepoID: run.RepoID, + RunID: run.ID, + Attempt: num, + TriggerUserID: 1, + Status: status, + } + require.NoError(t, db.Insert(ctx, a)) + return a + } + insertCaller := func(t *testing.T, attemptID int64, status Status, expanded bool) *ActionRunJob { + t.Helper() + caller := &ActionRunJob{ + RunID: run.ID, + RunAttemptID: attemptID, + RepoID: run.RepoID, + OwnerID: run.OwnerID, + CommitSHA: run.CommitSHA, + Name: "caller", + JobID: "caller", + Attempt: 1, + Status: status, + AttemptJobID: callerAttemptJobID, + IsReusableCaller: true, + IsExpanded: expanded, + } + require.NoError(t, db.Insert(ctx, caller)) + return caller + } + insertChild := func(t *testing.T, attemptID, parentID, attemptJobID int64, name, jobID string) { + t.Helper() + require.NoError(t, db.Insert(ctx, &ActionRunJob{ + RunID: run.ID, + RunAttemptID: attemptID, + RepoID: run.RepoID, + OwnerID: run.OwnerID, + CommitSHA: run.CommitSHA, + Name: name, + JobID: jobID, + Attempt: 1, + Status: StatusSuccess, + AttemptJobID: attemptJobID, + ParentJobID: parentID, + })) + } + + attempt1 := insertAttempt(t, 1, StatusSuccess) + caller1 := insertCaller(t, attempt1.ID, StatusSuccess, true) + insertChild(t, attempt1.ID, caller1.ID, 101, "work (alpha)", "work") + insertChild(t, attempt1.ID, caller1.ID, 102, "work (beta)", "work") + insertChild(t, attempt1.ID, caller1.ID, 103, "work (gamma)", "work") + insertChild(t, attempt1.ID, caller1.ID, 104, "summary", "summary") + + attempt2 := insertAttempt(t, 2, StatusSkipped) + insertCaller(t, attempt2.ID, StatusSkipped, false) // no children intentionally + + // both subtests expect attempt 1's expansion, differing only in the "current" attempt id + assertAttempt1Children := func(t *testing.T, out map[string]map[string]*ActionRunJob) { + t.Helper() + // outer map keyed by JobID: "work" has 3 matrix instances, "summary" 1 + assert.Len(t, out, 2) + assert.Len(t, out["work"], 3, "matrix instances must each get their own inner-map entry") + assert.Len(t, out["summary"], 1) + + require.NotNil(t, out["work"]["work (alpha)"]) + require.NotNil(t, out["work"]["work (beta)"]) + require.NotNil(t, out["work"]["work (gamma)"]) + require.NotNil(t, out["summary"]["summary"]) + + assert.Equal(t, int64(101), out["work"]["work (alpha)"].AttemptJobID) + assert.Equal(t, int64(102), out["work"]["work (beta)"].AttemptJobID) + assert.Equal(t, int64(103), out["work"]["work (gamma)"].AttemptJobID) + assert.Equal(t, int64(104), out["summary"]["summary"].AttemptJobID) + } + + t.Run("matrix instances and non-matrix sibling are indexed by (JobID, Name)", func(t *testing.T) { + // "current" = attempt 2; prior = attempt 1, which is the immediately preceding attempt. + out, err := GetPriorAttemptChildrenByParent(ctx, run.ID, attempt2.ID, callerAttemptJobID) + require.NoError(t, err) + assertAttempt1Children(t, out) + }) + + t.Run("walkback past an attempt where the caller had no children", func(t *testing.T) { + attempt3 := insertAttempt(t, 3, StatusRunning) + // "current" = attempt 3; the immediately preceding attempt 2 has no children, so the lookup must walk further back to attempt 1. + out, err := GetPriorAttemptChildrenByParent(ctx, run.ID, attempt3.ID, callerAttemptJobID) + require.NoError(t, err) + assertAttempt1Children(t, out) + }) +} diff --git a/models/actions/run_list.go b/models/actions/run_list.go index bfa9bbfb16..77de6a8512 100644 --- a/models/actions/run_list.go +++ b/models/actions/run_list.go @@ -6,12 +6,12 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/translation" - webhook_module "code.gitea.io/gitea/modules/webhook" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/modules/container" + "gitea.dev/modules/translation" + webhook_module "gitea.dev/modules/webhook" "xorm.io/builder" ) @@ -132,6 +132,32 @@ func GetStatusInfoList(ctx context.Context, lang translation.Locale) []StatusInf return statusInfoList } +// GetRunBranches returns branch names for the run-list "Branch" filter. +// Sourced from the `branch` table (indexed by repo_id) rather than DISTINCT-ing +// `action_run.ref`, which is wildcard-matched and slow on large repos; as a side +// effect the list reflects existing branches, not only ones that produced a run. +func GetRunBranches(ctx context.Context, repoID int64) ([]string, error) { + branches := make([]string, 0, 10) + return branches, db.GetEngine(ctx).Table("branch"). + Where("repo_id = ?", repoID). + And("is_deleted = ?", false). + Cols("name"). + OrderBy("name ASC"). + Find(&branches) +} + +// GetRunWorkflowIDs returns all distinct WorkflowIDs that have at least +// one ActionRun in the given repo. +func GetRunWorkflowIDs(ctx context.Context, repoID int64) ([]string, error) { + ids := make([]string, 0, 10) + return ids, db.GetEngine(ctx).Table("action_run"). + Where(builder.Eq{"repo_id": repoID}). + Distinct("workflow_id"). + Cols("workflow_id"). + Asc("workflow_id"). + Find(&ids) +} + // GetActors returns a slice of Actors func GetActors(ctx context.Context, repoID int64) ([]*user_model.User, error) { actors := make([]*user_model.User, 0, 10) diff --git a/models/actions/run_list_test.go b/models/actions/run_list_test.go new file mode 100644 index 0000000000..70d8dd91b1 --- /dev/null +++ b/models/actions/run_list_test.go @@ -0,0 +1,24 @@ +// Copyright 2026 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package actions + +import ( + "testing" + + "gitea.dev/models/unittest" + + "github.com/stretchr/testify/assert" +) + +func TestGetRunWorkflowIDs(t *testing.T) { + assert.NoError(t, unittest.PrepareTestDatabase()) + + ids, err := GetRunWorkflowIDs(t.Context(), 4) + assert.NoError(t, err) + assert.Equal(t, []string{"artifact.yaml", "test.yaml"}, ids) + + ids, err = GetRunWorkflowIDs(t.Context(), 999999) + assert.NoError(t, err) + assert.Empty(t, ids) +} diff --git a/models/actions/run_test.go b/models/actions/run_test.go index 6c8160beae..356ed28a74 100644 --- a/models/actions/run_test.go +++ b/models/actions/run_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + "gitea.dev/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/actions/runner.go b/models/actions/runner.go index 27b7509ac4..ba2b38ee7e 100644 --- a/models/actions/runner.go +++ b/models/actions/runner.go @@ -10,18 +10,18 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/shared/types" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" + runnerv1 "gitea.dev/actions-proto-go/runner/v1" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/shared/types" + user_model "gitea.dev/models/user" + "gitea.dev/modules/container" + "gitea.dev/modules/optional" + "gitea.dev/modules/setting" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/translation" + "gitea.dev/modules/util" - runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "xorm.io/builder" ) diff --git a/models/actions/runner_list.go b/models/actions/runner_list.go index 3ef8ebb254..1bd714c66f 100644 --- a/models/actions/runner_list.go +++ b/models/actions/runner_list.go @@ -6,10 +6,10 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/modules/container" ) type RunnerList []*ActionRunner diff --git a/models/actions/runner_token.go b/models/actions/runner_token.go index f7b7c9fdf0..0945ce3d48 100644 --- a/models/actions/runner_token.go +++ b/models/actions/runner_token.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" ) // ActionRunnerToken represents runner tokens diff --git a/models/actions/runner_token_test.go b/models/actions/runner_token_test.go index 243d6716a0..d95a530f10 100644 --- a/models/actions/runner_token_test.go +++ b/models/actions/runner_token_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/actions/schedule.go b/models/actions/schedule.go index ffde5092e0..031ea8350d 100644 --- a/models/actions/schedule.go +++ b/models/actions/schedule.go @@ -8,12 +8,12 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" + webhook_module "gitea.dev/modules/webhook" ) // ActionSchedule represents a schedule of a workflow file diff --git a/models/actions/schedule_list.go b/models/actions/schedule_list.go index 6b5cae94fe..549bbf1744 100644 --- a/models/actions/schedule_list.go +++ b/models/actions/schedule_list.go @@ -4,7 +4,7 @@ package actions import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/builder" ) diff --git a/models/actions/schedule_spec.go b/models/actions/schedule_spec.go index 923e5f7807..3e127cec8c 100644 --- a/models/actions/schedule_spec.go +++ b/models/actions/schedule_spec.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/modules/timeutil" "github.com/robfig/cron/v3" ) diff --git a/models/actions/schedule_spec_list.go b/models/actions/schedule_spec_list.go index e26b2c1120..81994471f0 100644 --- a/models/actions/schedule_spec_list.go +++ b/models/actions/schedule_spec_list.go @@ -6,9 +6,9 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/container" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/modules/container" "xorm.io/builder" ) diff --git a/models/actions/schedule_spec_test.go b/models/actions/schedule_spec_test.go index 57221461df..3b2cfd087b 100644 --- a/models/actions/schedule_spec_test.go +++ b/models/actions/schedule_spec_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/test" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/actions/status.go b/models/actions/status.go index f0701ad3b6..22ea0d1555 100644 --- a/models/actions/status.go +++ b/models/actions/status.go @@ -6,9 +6,8 @@ package actions import ( "slices" - "code.gitea.io/gitea/modules/translation" - - runnerv1 "code.gitea.io/actions-proto-go/runner/v1" + runnerv1 "gitea.dev/actions-proto-go/runner/v1" + "gitea.dev/modules/translation" ) // Status represents the status of ActionRun, ActionRunJob, ActionTask, or ActionTaskStep diff --git a/models/actions/status_test.go b/models/actions/status_test.go index 2363101c5d..f1551b2892 100644 --- a/models/actions/status_test.go +++ b/models/actions/status_test.go @@ -6,7 +6,8 @@ package actions import ( "testing" - runnerv1 "code.gitea.io/actions-proto-go/runner/v1" + runnerv1 "gitea.dev/actions-proto-go/runner/v1" + "github.com/stretchr/testify/assert" ) diff --git a/models/actions/task.go b/models/actions/task.go index 38a92714b0..36318c878a 100644 --- a/models/actions/task.go +++ b/models/actions/task.go @@ -11,16 +11,16 @@ import ( "strings" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/actions/jobparser" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + runnerv1 "gitea.dev/actions-proto-go/runner/v1" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + "gitea.dev/models/unit" + "gitea.dev/modules/actions/jobparser" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" - runnerv1 "code.gitea.io/actions-proto-go/runner/v1" lru "github.com/hashicorp/golang-lru/v2" "google.golang.org/protobuf/types/known/timestamppb" "xorm.io/builder" @@ -249,7 +249,7 @@ func CreateTaskForRunner(ctx context.Context, runner *ActionRunner) (*ActionTask } var jobs []*ActionRunJob - if err := e.Where("task_id=? AND status=?", 0, StatusWaiting).And(jobCond).Asc("updated", "id").Find(&jobs); err != nil { + if err := e.Where("task_id=? AND status=? AND is_reusable_caller=?", 0, StatusWaiting, false).And(jobCond).Asc("updated", "id").Find(&jobs); err != nil { return nil, false, err } @@ -390,7 +390,7 @@ func UpdateTaskByState(ctx context.Context, runnerID int64, state *runnerv1.Task RepoID: task.RepoID, Status: task.Status, Stopped: task.Stopped, - }, nil); err != nil { + }, nil, "status", "stopped"); err != nil { return nil, err } } else { diff --git a/models/actions/task_list.go b/models/actions/task_list.go index 0c80397899..5df0f3bfa5 100644 --- a/models/actions/task_list.go +++ b/models/actions/task_list.go @@ -6,9 +6,9 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/container" + "gitea.dev/modules/timeutil" "xorm.io/builder" ) diff --git a/models/actions/task_output.go b/models/actions/task_output.go index eab5b93118..36cc77e6d1 100644 --- a/models/actions/task_output.go +++ b/models/actions/task_output.go @@ -6,7 +6,7 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) // ActionTaskOutput represents an output of ActionTask. diff --git a/models/actions/task_step.go b/models/actions/task_step.go index 3b477d8483..598b9adb1a 100644 --- a/models/actions/task_step.go +++ b/models/actions/task_step.go @@ -7,8 +7,8 @@ import ( "context" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) // ActionTaskStep represents a step of ActionTask diff --git a/models/actions/task_test.go b/models/actions/task_test.go index 9d719d3c3a..fe4436ec63 100644 --- a/models/actions/task_test.go +++ b/models/actions/task_test.go @@ -7,12 +7,12 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/actions/jobparser" - "code.gitea.io/gitea/modules/timeutil" + runnerv1 "gitea.dev/actions-proto-go/runner/v1" + "gitea.dev/models/db" + "gitea.dev/models/unittest" + "gitea.dev/modules/actions/jobparser" + "gitea.dev/modules/timeutil" - runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/models/actions/tasks_version.go b/models/actions/tasks_version.go index b686ce2443..c8fd0db36b 100644 --- a/models/actions/tasks_version.go +++ b/models/actions/tasks_version.go @@ -6,9 +6,9 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/log" + "gitea.dev/modules/timeutil" ) // ActionTasksVersion diff --git a/models/actions/token_permissions.go b/models/actions/token_permissions.go index 985f6cc97b..f77ce48878 100644 --- a/models/actions/token_permissions.go +++ b/models/actions/token_permissions.go @@ -6,8 +6,8 @@ package actions import ( "context" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unit" ) // ComputeTaskTokenPermissions computes the effective permissions for a job token against the target repository. diff --git a/models/actions/utils.go b/models/actions/utils.go index e5704d0377..25b6532972 100644 --- a/models/actions/utils.go +++ b/models/actions/utils.go @@ -12,10 +12,10 @@ import ( "io" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + auth_model "gitea.dev/models/auth" + "gitea.dev/modules/log" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" ) func generateSaltedToken() (string, string, string, string) { diff --git a/models/actions/utils_test.go b/models/actions/utils_test.go index 2f7e7da360..c83173e81e 100644 --- a/models/actions/utils_test.go +++ b/models/actions/utils_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/actions/variable.go b/models/actions/variable.go index 7154843c17..839b8129ad 100644 --- a/models/actions/variable.go +++ b/models/actions/variable.go @@ -8,10 +8,10 @@ import ( "strings" "unicode/utf8" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/log" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/activities/action.go b/models/activities/action.go index 97388402d4..a666c31c27 100644 --- a/models/activities/action.go +++ b/models/activities/action.go @@ -14,17 +14,17 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + issues_model "gitea.dev/models/issues" + "gitea.dev/models/organization" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/modules/git" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/modules/structs" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" "xorm.io/xorm/schemas" diff --git a/models/activities/action_list.go b/models/activities/action_list.go index e9e3873f9a..f1c617f594 100644 --- a/models/activities/action_list.go +++ b/models/activities/action_list.go @@ -9,12 +9,12 @@ import ( "fmt" "strconv" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/modules/container" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/activities/action_test.go b/models/activities/action_test.go index 9447f39d62..0a60cd9c78 100644 --- a/models/activities/action_test.go +++ b/models/activities/action_test.go @@ -8,14 +8,14 @@ import ( "path" "testing" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - issue_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + activities_model "gitea.dev/models/activities" + "gitea.dev/models/db" + issue_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/models/activities/main_test.go b/models/activities/main_test.go index 43afb84ef1..5b64a455fe 100644 --- a/models/activities/main_test.go +++ b/models/activities/main_test.go @@ -6,10 +6,10 @@ package activities_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" + _ "gitea.dev/models" + _ "gitea.dev/models/actions" ) func TestMain(m *testing.M) { diff --git a/models/activities/notification.go b/models/activities/notification.go index 8a830c5aa2..c786811fcd 100644 --- a/models/activities/notification.go +++ b/models/activities/notification.go @@ -9,13 +9,13 @@ import ( "net/url" "strconv" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + issues_model "gitea.dev/models/issues" + "gitea.dev/models/organization" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + "gitea.dev/modules/timeutil" "xorm.io/builder" "xorm.io/xorm/schemas" diff --git a/models/activities/notification_list.go b/models/activities/notification_list.go index d38758bc41..70bf6811bc 100644 --- a/models/activities/notification_list.go +++ b/models/activities/notification_list.go @@ -6,15 +6,15 @@ package activities import ( "context" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + issues_model "gitea.dev/models/issues" + access_model "gitea.dev/models/perm/access" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unit" + user_model "gitea.dev/models/user" + "gitea.dev/modules/container" + "gitea.dev/modules/log" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/activities/notification_test.go b/models/activities/notification_test.go index 6f2253c815..eaf96bf31e 100644 --- a/models/activities/notification_test.go +++ b/models/activities/notification_test.go @@ -7,11 +7,11 @@ import ( "context" "testing" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + activities_model "gitea.dev/models/activities" + "gitea.dev/models/db" + issues_model "gitea.dev/models/issues" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/activities/repo_activity.go b/models/activities/repo_activity.go index 54ea6be773..fd6a1630e5 100644 --- a/models/activities/repo_activity.go +++ b/models/activities/repo_activity.go @@ -9,12 +9,12 @@ import ( "sort" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" + "gitea.dev/models/db" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/modules/git" + "gitea.dev/modules/gitrepo" "xorm.io/builder" ) diff --git a/models/activities/statistic.go b/models/activities/statistic.go index 940651d359..087a257a33 100644 --- a/models/activities/statistic.go +++ b/models/activities/statistic.go @@ -6,20 +6,20 @@ package activities import ( "context" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" + asymkey_model "gitea.dev/models/asymkey" + "gitea.dev/models/auth" + "gitea.dev/models/db" + git_model "gitea.dev/models/git" + issues_model "gitea.dev/models/issues" + "gitea.dev/models/organization" + access_model "gitea.dev/models/perm/access" + project_model "gitea.dev/models/project" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/models/webhook" + "gitea.dev/modules/optional" + "gitea.dev/modules/setting" + "gitea.dev/modules/structs" ) // Statistic contains the database statistics diff --git a/models/activities/user_heatmap.go b/models/activities/user_heatmap.go index 2d1635917e..643c86e480 100644 --- a/models/activities/user_heatmap.go +++ b/models/activities/user_heatmap.go @@ -6,11 +6,11 @@ package activities import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/models/organization" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + "gitea.dev/modules/timeutil" ) // UserHeatmapData represents the data needed to create a heatmap diff --git a/models/activities/user_heatmap_test.go b/models/activities/user_heatmap_test.go index 66087325b1..1a8ad7620f 100644 --- a/models/activities/user_heatmap_test.go +++ b/models/activities/user_heatmap_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/timeutil" + activities_model "gitea.dev/models/activities" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/json" + "gitea.dev/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/admin/task.go b/models/admin/task.go index 7056a8359e..be02137c90 100644 --- a/models/admin/task.go +++ b/models/admin/task.go @@ -7,17 +7,17 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/modules/json" + "gitea.dev/modules/log" + "gitea.dev/modules/migration" + "gitea.dev/modules/secret" + "gitea.dev/modules/setting" + "gitea.dev/modules/structs" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" ) // Task represents a task diff --git a/models/asymkey/error.go b/models/asymkey/error.go index 5df7beb8cd..1a862954a3 100644 --- a/models/asymkey/error.go +++ b/models/asymkey/error.go @@ -6,7 +6,7 @@ package asymkey import ( "fmt" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/util" ) // ErrKeyUnableVerify represents a "KeyUnableVerify" kind of error. diff --git a/models/asymkey/gpg_key.go b/models/asymkey/gpg_key.go index 38de7cbda6..77034eb089 100644 --- a/models/asymkey/gpg_key.go +++ b/models/asymkey/gpg_key.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + user_model "gitea.dev/models/user" + "gitea.dev/modules/timeutil" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/packet" diff --git a/models/asymkey/gpg_key_add.go b/models/asymkey/gpg_key_add.go index 3969edcc86..aa74f66c55 100644 --- a/models/asymkey/gpg_key_add.go +++ b/models/asymkey/gpg_key_add.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" + "gitea.dev/models/db" + "gitea.dev/modules/log" "github.com/ProtonMail/go-crypto/openpgp" ) diff --git a/models/asymkey/gpg_key_commit_verification.go b/models/asymkey/gpg_key_commit_verification.go index ae5192de9f..17244076dd 100644 --- a/models/asymkey/gpg_key_commit_verification.go +++ b/models/asymkey/gpg_key_commit_verification.go @@ -8,9 +8,9 @@ import ( "fmt" "hash" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/modules/log" "github.com/ProtonMail/go-crypto/openpgp/packet" ) diff --git a/models/asymkey/gpg_key_import.go b/models/asymkey/gpg_key_import.go index c9d46d29e5..0189f331f8 100644 --- a/models/asymkey/gpg_key_import.go +++ b/models/asymkey/gpg_key_import.go @@ -6,7 +6,7 @@ package asymkey import ( "context" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) // __________________ ________ ____ __. diff --git a/models/asymkey/gpg_key_list.go b/models/asymkey/gpg_key_list.go index 89548e495e..e7cff4e3fb 100644 --- a/models/asymkey/gpg_key_list.go +++ b/models/asymkey/gpg_key_list.go @@ -6,7 +6,7 @@ package asymkey import ( "context" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) type GPGKeyList []*GPGKey diff --git a/models/asymkey/gpg_key_test.go b/models/asymkey/gpg_key_test.go index e6656cb70d..5cce164a78 100644 --- a/models/asymkey/gpg_key_test.go +++ b/models/asymkey/gpg_key_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/timeutil" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/packet" diff --git a/models/asymkey/gpg_key_verify.go b/models/asymkey/gpg_key_verify.go index 5df0265c88..b699a1d3cb 100644 --- a/models/asymkey/gpg_key_verify.go +++ b/models/asymkey/gpg_key_verify.go @@ -8,10 +8,10 @@ import ( "strconv" "time" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" + "gitea.dev/models/db" + user_model "gitea.dev/models/user" + "gitea.dev/modules/base" + "gitea.dev/modules/log" ) // This file provides functions relating verifying gpg keys diff --git a/models/asymkey/key_display.go b/models/asymkey/key_display.go index ee17553b5b..0bfba26bac 100644 --- a/models/asymkey/key_display.go +++ b/models/asymkey/key_display.go @@ -6,9 +6,9 @@ package asymkey import ( "os" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/git" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" ) func GetDisplaySigningKey(key *git.SigningKey) string { diff --git a/models/asymkey/main_test.go b/models/asymkey/main_test.go index be71f848d9..3c64834e27 100644 --- a/models/asymkey/main_test.go +++ b/models/asymkey/main_test.go @@ -6,7 +6,7 @@ package asymkey import ( "testing" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/unittest" ) func TestMain(m *testing.M) { diff --git a/models/asymkey/ssh_key.go b/models/asymkey/ssh_key.go index 1873c30859..e72a88ae8f 100644 --- a/models/asymkey/ssh_key.go +++ b/models/asymkey/ssh_key.go @@ -10,14 +10,14 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/auth" + "gitea.dev/models/db" + "gitea.dev/models/perm" + user_model "gitea.dev/models/user" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "golang.org/x/crypto/ssh" "xorm.io/builder" diff --git a/models/asymkey/ssh_key_authorized_keys.go b/models/asymkey/ssh_key_authorized_keys.go index cb2943e31d..8eb5d24c82 100644 --- a/models/asymkey/ssh_key_authorized_keys.go +++ b/models/asymkey/ssh_key_authorized_keys.go @@ -14,10 +14,10 @@ import ( "strings" "sync" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" "golang.org/x/crypto/ssh" ) diff --git a/models/asymkey/ssh_key_authorized_keys_test.go b/models/asymkey/ssh_key_authorized_keys_test.go index 36ed57a653..0eb4097f85 100644 --- a/models/asymkey/ssh_key_authorized_keys_test.go +++ b/models/asymkey/ssh_key_authorized_keys_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/models/asymkey/ssh_key_deploy.go b/models/asymkey/ssh_key_deploy.go index ea3d93e8c8..e7cbc9253e 100644 --- a/models/asymkey/ssh_key_deploy.go +++ b/models/asymkey/ssh_key_deploy.go @@ -8,9 +8,9 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/models/perm" + "gitea.dev/modules/timeutil" "xorm.io/builder" ) diff --git a/models/asymkey/ssh_key_fingerprint.go b/models/asymkey/ssh_key_fingerprint.go index b666469ae8..c495275e21 100644 --- a/models/asymkey/ssh_key_fingerprint.go +++ b/models/asymkey/ssh_key_fingerprint.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "golang.org/x/crypto/ssh" "xorm.io/builder" diff --git a/models/asymkey/ssh_key_parse.go b/models/asymkey/ssh_key_parse.go index fc39f28624..d39ddf3c77 100644 --- a/models/asymkey/ssh_key_parse.go +++ b/models/asymkey/ssh_key_parse.go @@ -15,9 +15,9 @@ import ( "math/big" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" "golang.org/x/crypto/ssh" ) diff --git a/models/asymkey/ssh_key_principals.go b/models/asymkey/ssh_key_principals.go index 2d4c74740d..2407266764 100644 --- a/models/asymkey/ssh_key_principals.go +++ b/models/asymkey/ssh_key_principals.go @@ -8,10 +8,10 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" ) // CheckPrincipalKeyString strips spaces and returns an error if the given principal contains newlines diff --git a/models/asymkey/ssh_key_test.go b/models/asymkey/ssh_key_test.go index d7f48ada03..8ecb3f9474 100644 --- a/models/asymkey/ssh_key_test.go +++ b/models/asymkey/ssh_key_test.go @@ -12,8 +12,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/unittest" + "gitea.dev/modules/setting" "github.com/42wim/sshsig" "github.com/stretchr/testify/assert" diff --git a/models/asymkey/ssh_key_verify.go b/models/asymkey/ssh_key_verify.go index 04917239ee..85dba08746 100644 --- a/models/asymkey/ssh_key_verify.go +++ b/models/asymkey/ssh_key_verify.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" + "gitea.dev/models/db" + "gitea.dev/modules/log" "github.com/42wim/sshsig" ) diff --git a/models/auth/access_token.go b/models/auth/access_token.go index 7578528be8..da451fb044 100644 --- a/models/auth/access_token.go +++ b/models/auth/access_token.go @@ -11,10 +11,10 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/setting" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" lru "github.com/hashicorp/golang-lru/v2" "xorm.io/builder" diff --git a/models/auth/access_token_scope.go b/models/auth/access_token_scope.go index 3eae19b2a5..71a81425a0 100644 --- a/models/auth/access_token_scope.go +++ b/models/auth/access_token_scope.go @@ -8,7 +8,7 @@ import ( "slices" "strings" - "code.gitea.io/gitea/models/perm" + "gitea.dev/models/perm" ) // AccessTokenScopeCategory represents the scope category for an access token diff --git a/models/auth/access_token_test.go b/models/auth/access_token_test.go index 9ae072cc5f..504600cd08 100644 --- a/models/auth/access_token_test.go +++ b/models/auth/access_token_test.go @@ -6,9 +6,9 @@ package auth_test import ( "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + "gitea.dev/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/auth/auth_token.go b/models/auth/auth_token.go index 54ff5a0d75..0eaf700c2e 100644 --- a/models/auth/auth_token.go +++ b/models/auth/auth_token.go @@ -6,9 +6,9 @@ package auth import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/auth/main_test.go b/models/auth/main_test.go index d772ea6b1c..0d9eddbdfe 100644 --- a/models/auth/main_test.go +++ b/models/auth/main_test.go @@ -6,13 +6,13 @@ package auth_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/auth" - _ "code.gitea.io/gitea/models/perm/access" + _ "gitea.dev/models" + _ "gitea.dev/models/actions" + _ "gitea.dev/models/activities" + _ "gitea.dev/models/auth" + _ "gitea.dev/models/perm/access" ) func TestMain(m *testing.M) { diff --git a/models/auth/oauth2.go b/models/auth/oauth2.go index 104a7ba9f4..f67a556065 100644 --- a/models/auth/oauth2.go +++ b/models/auth/oauth2.go @@ -15,11 +15,11 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/container" + "gitea.dev/modules/setting" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" uuid "github.com/google/uuid" "golang.org/x/crypto/bcrypt" diff --git a/models/auth/oauth2_list.go b/models/auth/oauth2_list.go index c55f10b3c8..9a4271fb6d 100644 --- a/models/auth/oauth2_list.go +++ b/models/auth/oauth2_list.go @@ -4,7 +4,7 @@ package auth import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/builder" ) diff --git a/models/auth/oauth2_test.go b/models/auth/oauth2_test.go index 465dfb14f2..ea760eb263 100644 --- a/models/auth/oauth2_test.go +++ b/models/auth/oauth2_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/timeutil" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/unittest" + "gitea.dev/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/auth/session.go b/models/auth/session.go index dbdcde03a0..6de69a6130 100644 --- a/models/auth/session.go +++ b/models/auth/session.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" "xorm.io/builder" ) diff --git a/models/auth/source.go b/models/auth/source.go index 16f36eb0c2..278898e49d 100644 --- a/models/auth/source.go +++ b/models/auth/source.go @@ -9,12 +9,12 @@ import ( "fmt" "reflect" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/log" + "gitea.dev/modules/optional" + "gitea.dev/modules/setting" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/auth/source_test.go b/models/auth/source_test.go index fbd663a64f..b09fc7f4b0 100644 --- a/models/auth/source_test.go +++ b/models/auth/source_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/json" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/unittest" + "gitea.dev/modules/json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/auth/twofactor.go b/models/auth/twofactor.go index 80c34ba6ad..9c0208f47f 100644 --- a/models/auth/twofactor.go +++ b/models/auth/twofactor.go @@ -13,11 +13,11 @@ import ( "encoding/hex" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/secret" + "gitea.dev/modules/setting" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "github.com/pquerna/otp/totp" "golang.org/x/crypto/pbkdf2" diff --git a/models/auth/webauthn.go b/models/auth/webauthn.go index 7bd79ed3f5..11297556d2 100644 --- a/models/auth/webauthn.go +++ b/models/auth/webauthn.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "github.com/go-webauthn/webauthn/protocol" "github.com/go-webauthn/webauthn/webauthn" diff --git a/models/auth/webauthn_test.go b/models/auth/webauthn_test.go index 41c5f6de94..a648319226 100644 --- a/models/auth/webauthn_test.go +++ b/models/auth/webauthn_test.go @@ -6,8 +6,8 @@ package auth_test import ( "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/unittest" "github.com/go-webauthn/webauthn/webauthn" "github.com/stretchr/testify/assert" diff --git a/models/avatars/avatar.go b/models/avatars/avatar.go index 9c56e0f9a0..7ecb55183c 100644 --- a/models/avatars/avatar.go +++ b/models/avatars/avatar.go @@ -14,10 +14,10 @@ import ( "strings" "sync/atomic" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/modules/cache" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" "strk.kbt.io/projects/go/libravatar" ) diff --git a/models/avatars/avatar_test.go b/models/avatars/avatar_test.go index 43a062cc2a..cfc578d27b 100644 --- a/models/avatars/avatar_test.go +++ b/models/avatars/avatar_test.go @@ -6,10 +6,10 @@ package avatars_test import ( "testing" - avatars_model "code.gitea.io/gitea/models/avatars" - system_model "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/setting/config" + avatars_model "gitea.dev/models/avatars" + system_model "gitea.dev/models/system" + "gitea.dev/modules/setting" + "gitea.dev/modules/setting/config" "github.com/stretchr/testify/assert" ) diff --git a/models/avatars/main_test.go b/models/avatars/main_test.go index c721a7dc2a..ce48dada28 100644 --- a/models/avatars/main_test.go +++ b/models/avatars/main_test.go @@ -6,11 +6,11 @@ package avatars_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/perm/access" + _ "gitea.dev/models" + _ "gitea.dev/models/activities" + _ "gitea.dev/models/perm/access" ) func TestMain(m *testing.M) { diff --git a/models/db/collation.go b/models/db/collation.go index 56173ad97d..d9a54e5768 100644 --- a/models/db/collation.go +++ b/models/db/collation.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/container" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" "xorm.io/xorm/schemas" ) diff --git a/models/db/common.go b/models/db/common.go index b3c43f8b62..ff17962fa4 100644 --- a/models/db/common.go +++ b/models/db/common.go @@ -6,8 +6,8 @@ package db import ( "strings" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/db/conn.go b/models/db/conn.go index 944b6e7b97..3434912417 100644 --- a/models/db/conn.go +++ b/models/db/conn.go @@ -13,8 +13,8 @@ import ( "slices" "strings" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" ) type ConnOptions struct { diff --git a/models/db/context.go b/models/db/context.go index 5e74f458ec..bb2001673d 100644 --- a/models/db/context.go +++ b/models/db/context.go @@ -11,7 +11,7 @@ import ( "slices" "sync" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/setting" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/db/context_test.go b/models/db/context_test.go index 1719a7bfe8..7804a15d1a 100644 --- a/models/db/context_test.go +++ b/models/db/context_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/db" + "gitea.dev/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/db/convert.go b/models/db/convert.go index 374dbfd8a8..125449705c 100644 --- a/models/db/convert.go +++ b/models/db/convert.go @@ -6,7 +6,7 @@ package db import ( "fmt" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/setting" "xorm.io/xorm" "xorm.io/xorm/convert" diff --git a/models/db/driver_postgresschema.go b/models/db/driver_postgresschema.go index b673500763..ad2b5abc04 100644 --- a/models/db/driver_postgresschema.go +++ b/models/db/driver_postgresschema.go @@ -8,7 +8,7 @@ import ( "database/sql/driver" "sync" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/setting" "github.com/lib/pq" "xorm.io/xorm/dialects" diff --git a/models/db/engine_dump.go b/models/db/engine_dump.go index 1d8d555b44..016bc99287 100644 --- a/models/db/engine_dump.go +++ b/models/db/engine_dump.go @@ -4,7 +4,7 @@ package db import ( - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/setting" "xorm.io/xorm/schemas" ) diff --git a/models/db/engine_hook.go b/models/db/engine_hook.go index 8d8ed3992c..00318d28e7 100644 --- a/models/db/engine_hook.go +++ b/models/db/engine_hook.go @@ -7,9 +7,9 @@ import ( "context" "time" - "code.gitea.io/gitea/modules/gtprof" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/gtprof" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" "xorm.io/xorm/contexts" ) diff --git a/models/db/engine_init.go b/models/db/engine_init.go index 2680bcf5ef..a7ae3488da 100644 --- a/models/db/engine_init.go +++ b/models/db/engine_init.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" "xorm.io/xorm" "xorm.io/xorm/names" diff --git a/models/db/engine_test.go b/models/db/engine_test.go index 6a6264b535..69e30aaa4b 100644 --- a/models/db/engine_test.go +++ b/models/db/engine_test.go @@ -7,12 +7,12 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + issues_model "gitea.dev/models/issues" + "gitea.dev/models/unittest" + "gitea.dev/modules/setting" - _ "code.gitea.io/gitea/cmd" // for TestPrimaryKeys + _ "gitea.dev/cmd" // for TestPrimaryKeys "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -60,7 +60,7 @@ func TestPrimaryKeys(t *testing.T) { // https://github.com/go-gitea/gitea/issues/21086 // https://github.com/go-gitea/gitea/issues/16802 // To avoid creating tables without primary key again, this test will check them. - // Import "code.gitea.io/gitea/cmd" to make sure each db.RegisterModel in init functions has been called. + // Import "gitea.dev/cmd" to make sure each db.RegisterModel in init functions has been called. beans, err := db.NamesToBean() require.NoError(t, err) diff --git a/models/db/error.go b/models/db/error.go index d47c7adac4..e44886dcd7 100644 --- a/models/db/error.go +++ b/models/db/error.go @@ -6,7 +6,7 @@ package db import ( "fmt" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/util" ) // ErrCancelled represents an error due to context cancellation diff --git a/models/db/index.go b/models/db/index.go index 7a11645bd4..488e188aca 100644 --- a/models/db/index.go +++ b/models/db/index.go @@ -9,7 +9,7 @@ import ( "fmt" "strconv" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/setting" ) // ResourceIndex represents a resource index which could be used as issue/release and others diff --git a/models/db/index_test.go b/models/db/index_test.go index e2af7f35bb..5dece7e1be 100644 --- a/models/db/index_test.go +++ b/models/db/index_test.go @@ -9,8 +9,8 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/db" + "gitea.dev/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/db/install/db.go b/models/db/install/db.go index a84e5e54fe..1fee5ff9db 100644 --- a/models/db/install/db.go +++ b/models/db/install/db.go @@ -6,8 +6,8 @@ package install import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/modules/setting" ) // CheckDatabaseConnection checks the database connection diff --git a/models/db/iterate.go b/models/db/iterate.go index 481be1b4b7..171ad9f557 100644 --- a/models/db/iterate.go +++ b/models/db/iterate.go @@ -6,7 +6,7 @@ package db import ( "context" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/setting" "xorm.io/builder" ) diff --git a/models/db/iterate_test.go b/models/db/iterate_test.go index 21bb0c0b4b..d6d5073087 100644 --- a/models/db/iterate_test.go +++ b/models/db/iterate_test.go @@ -7,9 +7,9 @@ import ( "context" "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/db/list.go b/models/db/list.go index 3d61d7d46c..47c163c1d7 100644 --- a/models/db/list.go +++ b/models/db/list.go @@ -6,7 +6,7 @@ package db import ( "context" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/setting" "xorm.io/builder" ) diff --git a/models/db/list_test.go b/models/db/list_test.go index ddcfff1f88..959cb91bfb 100644 --- a/models/db/list_test.go +++ b/models/db/list_test.go @@ -6,9 +6,9 @@ package db_test import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" "github.com/stretchr/testify/assert" "xorm.io/builder" diff --git a/models/db/log.go b/models/db/log.go index 4f563a4df0..55b03c8164 100644 --- a/models/db/log.go +++ b/models/db/log.go @@ -7,7 +7,7 @@ import ( "fmt" "sync/atomic" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/log" xormlog "xorm.io/xorm/log" ) diff --git a/models/db/main_test.go b/models/db/main_test.go index 7d80b400fe..81cd92a9f6 100644 --- a/models/db/main_test.go +++ b/models/db/main_test.go @@ -6,10 +6,10 @@ package db_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/repo" + _ "gitea.dev/models" + _ "gitea.dev/models/repo" ) func TestMain(m *testing.M) { diff --git a/models/db/name.go b/models/db/name.go index 48c7fdbce5..dc449ba9d7 100644 --- a/models/db/name.go +++ b/models/db/name.go @@ -9,7 +9,7 @@ import ( "strings" "unicode/utf8" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/util" ) // ErrNameReserved represents a "reserved name" error. diff --git a/models/db/paginator/main_test.go b/models/db/paginator/main_test.go index 47993aed6b..2f5ef392df 100644 --- a/models/db/paginator/main_test.go +++ b/models/db/paginator/main_test.go @@ -6,7 +6,7 @@ package paginator import ( "testing" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/unittest" ) func TestMain(m *testing.M) { diff --git a/models/db/paginator/paginator_test.go b/models/db/paginator/paginator_test.go index 20602212d9..7511ed5ea8 100644 --- a/models/db/paginator/paginator_test.go +++ b/models/db/paginator/paginator_test.go @@ -6,8 +6,8 @@ package paginator import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/models/db/sequence.go b/models/db/sequence.go index 9adc5113ac..446f344fbc 100644 --- a/models/db/sequence.go +++ b/models/db/sequence.go @@ -8,7 +8,7 @@ import ( "fmt" "regexp" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/setting" ) // CountBadSequences looks for broken sequences from recreate-table mistakes diff --git a/models/dbfs/dbfile.go b/models/dbfs/dbfile.go index a6981cb7d6..8ff836452e 100644 --- a/models/dbfs/dbfile.go +++ b/models/dbfs/dbfile.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) var defaultFileBlockSize int64 = 32 * 1024 diff --git a/models/dbfs/dbfs.go b/models/dbfs/dbfs.go index 3f768b5339..92581857f9 100644 --- a/models/dbfs/dbfs.go +++ b/models/dbfs/dbfs.go @@ -10,7 +10,7 @@ import ( "path" "time" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) /* diff --git a/models/dbfs/dbfs_test.go b/models/dbfs/dbfs_test.go index ca57ebe171..7dff86153f 100644 --- a/models/dbfs/dbfs_test.go +++ b/models/dbfs/dbfs_test.go @@ -9,7 +9,7 @@ import ( "os" "testing" - "code.gitea.io/gitea/modules/test" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/dbfs/main_test.go b/models/dbfs/main_test.go index 537ba0935d..7c737a1b74 100644 --- a/models/dbfs/main_test.go +++ b/models/dbfs/main_test.go @@ -6,7 +6,7 @@ package dbfs import ( "testing" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/unittest" ) func TestMain(m *testing.M) { diff --git a/models/git/branch.go b/models/git/branch.go index db53ca0ac7..17433fcff8 100644 --- a/models/git/branch.go +++ b/models/git/branch.go @@ -8,16 +8,16 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unit" + user_model "gitea.dev/models/user" + "gitea.dev/modules/container" + "gitea.dev/modules/git" + "gitea.dev/modules/log" + "gitea.dev/modules/optional" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/git/branch_list.go b/models/git/branch_list.go index 17cac4531b..45b02d9d33 100644 --- a/models/git/branch_list.go +++ b/models/git/branch_list.go @@ -6,10 +6,10 @@ package git import ( "context" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" + "gitea.dev/models/db" + user_model "gitea.dev/models/user" + "gitea.dev/modules/container" + "gitea.dev/modules/optional" "xorm.io/builder" ) diff --git a/models/git/branch_test.go b/models/git/branch_test.go index be67439285..54ee652abd 100644 --- a/models/git/branch_test.go +++ b/models/git/branch_test.go @@ -8,15 +8,15 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + git_model "gitea.dev/models/git" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/git" + "gitea.dev/modules/optional" + "gitea.dev/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/git/commit_status.go b/models/git/commit_status.go index 07beb2372a..918e45c207 100644 --- a/models/git/commit_status.go +++ b/models/git/commit_status.go @@ -13,16 +13,16 @@ import ( "strings" "time" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/commitstatus" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/translation" + asymkey_model "gitea.dev/models/asymkey" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/modules/commitstatus" + "gitea.dev/modules/git" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/translation" "xorm.io/builder" ) diff --git a/models/git/commit_status_summary.go b/models/git/commit_status_summary.go index dd416fa015..4ab1beec92 100644 --- a/models/git/commit_status_summary.go +++ b/models/git/commit_status_summary.go @@ -6,9 +6,9 @@ package git import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/commitstatus" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/modules/commitstatus" + "gitea.dev/modules/setting" "xorm.io/builder" ) diff --git a/models/git/commit_status_test.go b/models/git/commit_status_test.go index f18d3470b0..bb0858c44e 100644 --- a/models/git/commit_status_test.go +++ b/models/git/commit_status_test.go @@ -8,14 +8,14 @@ import ( "testing" "time" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/commitstatus" - "code.gitea.io/gitea/modules/gitrepo" + actions_model "gitea.dev/models/actions" + "gitea.dev/models/db" + git_model "gitea.dev/models/git" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/commitstatus" + "gitea.dev/modules/gitrepo" "github.com/stretchr/testify/assert" ) diff --git a/models/git/lfs.go b/models/git/lfs.go index 1f3d086ac2..1cfb933100 100644 --- a/models/git/lfs.go +++ b/models/git/lfs.go @@ -7,15 +7,15 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unit" + user_model "gitea.dev/models/user" + "gitea.dev/modules/lfs" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/git/lfs_lock.go b/models/git/lfs_lock.go index 8e63598fb2..92fb06f5b6 100644 --- a/models/git/lfs_lock.go +++ b/models/git/lfs_lock.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" ) // LFSLock represents a git lfs lock of repository. diff --git a/models/git/lfs_lock_list.go b/models/git/lfs_lock_list.go index cab1e61cab..85cce753c8 100644 --- a/models/git/lfs_lock_list.go +++ b/models/git/lfs_lock_list.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" + "gitea.dev/models/db" + user_model "gitea.dev/models/user" + "gitea.dev/modules/container" ) // LFSLockList is a list of LFSLock diff --git a/models/git/lfs_lock_test.go b/models/git/lfs_lock_test.go index c88e89be47..ca87553491 100644 --- a/models/git/lfs_lock_test.go +++ b/models/git/lfs_lock_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/git/lfs_test.go b/models/git/lfs_test.go index 4c0242f439..17772cdd3c 100644 --- a/models/git/lfs_test.go +++ b/models/git/lfs_test.go @@ -10,14 +10,14 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + git_model "gitea.dev/models/git" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + "gitea.dev/modules/lfs" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/git/main_test.go b/models/git/main_test.go index aab1fa9a26..98f0bf32ee 100644 --- a/models/git/main_test.go +++ b/models/git/main_test.go @@ -6,11 +6,11 @@ package git_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" + _ "gitea.dev/models" + _ "gitea.dev/models/actions" + _ "gitea.dev/models/activities" ) func TestMain(m *testing.M) { diff --git a/models/git/protected_branch.go b/models/git/protected_branch.go index 32014615e6..ec710a710e 100644 --- a/models/git/protected_branch.go +++ b/models/git/protected_branch.go @@ -9,17 +9,17 @@ import ( "slices" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/glob" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/models/organization" + "gitea.dev/models/perm" + access_model "gitea.dev/models/perm/access" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unit" + user_model "gitea.dev/models/user" + "gitea.dev/modules/glob" + "gitea.dev/modules/log" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/git/protected_branch_list.go b/models/git/protected_branch_list.go index 6b282835a4..9defb70840 100644 --- a/models/git/protected_branch_list.go +++ b/models/git/protected_branch_list.go @@ -7,9 +7,9 @@ import ( "context" "sort" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/glob" - "code.gitea.io/gitea/modules/optional" + "gitea.dev/models/db" + "gitea.dev/modules/glob" + "gitea.dev/modules/optional" ) type ProtectedBranchRules []*ProtectedBranch diff --git a/models/git/protected_branch_test.go b/models/git/protected_branch_test.go index 043e24cbe8..da642d6aad 100644 --- a/models/git/protected_branch_test.go +++ b/models/git/protected_branch_test.go @@ -6,10 +6,10 @@ package git import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/git/protected_tag.go b/models/git/protected_tag.go index dc38daf981..35d406f45c 100644 --- a/models/git/protected_tag.go +++ b/models/git/protected_tag.go @@ -9,10 +9,10 @@ import ( "slices" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/modules/glob" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/models/organization" + "gitea.dev/modules/glob" + "gitea.dev/modules/timeutil" ) // ProtectedTag struct diff --git a/models/git/protected_tag_test.go b/models/git/protected_tag_test.go index 252eaf1bba..a0400c9bfa 100644 --- a/models/git/protected_tag_test.go +++ b/models/git/protected_tag_test.go @@ -6,8 +6,8 @@ package git_test import ( "testing" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/unittest" + git_model "gitea.dev/models/git" + "gitea.dev/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/assignees.go b/models/issues/assignees.go index 54f995dd2e..a45ab468eb 100644 --- a/models/issues/assignees.go +++ b/models/issues/assignees.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + user_model "gitea.dev/models/user" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/issues/assignees_test.go b/models/issues/assignees_test.go index 13922899dc..58a1edc02b 100644 --- a/models/issues/assignees_test.go +++ b/models/issues/assignees_test.go @@ -6,9 +6,9 @@ package issues_test import ( "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + issues_model "gitea.dev/models/issues" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/comment.go b/models/issues/comment.go index bb4a38a51b..febc49ca76 100644 --- a/models/issues/comment.go +++ b/models/issues/comment.go @@ -14,23 +14,23 @@ import ( "strconv" "unicode/utf8" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/organization" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/htmlutil" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/references" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + git_model "gitea.dev/models/git" + "gitea.dev/models/organization" + project_model "gitea.dev/models/project" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/modules/container" + "gitea.dev/modules/htmlutil" + "gitea.dev/modules/json" + "gitea.dev/modules/log" + "gitea.dev/modules/markup" + "gitea.dev/modules/optional" + "gitea.dev/modules/references" + "gitea.dev/modules/structs" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/translation" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/issues/comment_code.go b/models/issues/comment_code.go index 8de52f815a..7195736f92 100644 --- a/models/issues/comment_code.go +++ b/models/issues/comment_code.go @@ -7,10 +7,10 @@ import ( "context" "strconv" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/renderhelper" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/markup/markdown" + "gitea.dev/models/db" + "gitea.dev/models/renderhelper" + user_model "gitea.dev/models/user" + "gitea.dev/modules/markup/markdown" "xorm.io/builder" ) diff --git a/models/issues/comment_list.go b/models/issues/comment_list.go index f6c485449f..522c066309 100644 --- a/models/issues/comment_list.go +++ b/models/issues/comment_list.go @@ -6,11 +6,11 @@ package issues import ( "context" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/modules/container" + "gitea.dev/modules/log" ) // CommentList defines a list of comments diff --git a/models/issues/comment_test.go b/models/issues/comment_test.go index 3660f9c939..c47a0c7a4a 100644 --- a/models/issues/comment_test.go +++ b/models/issues/comment_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "gitea.dev/models/db" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/content_history.go b/models/issues/content_history.go index 31c80d2cea..fe2fc0d680 100644 --- a/models/issues/content_history.go +++ b/models/issues/content_history.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/avatars" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/avatars" + "gitea.dev/models/db" + "gitea.dev/modules/log" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/issues/content_history_test.go b/models/issues/content_history_test.go index d2fcc82b1d..9efd4a33e2 100644 --- a/models/issues/content_history_test.go +++ b/models/issues/content_history_test.go @@ -6,10 +6,10 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + issues_model "gitea.dev/models/issues" + "gitea.dev/models/unittest" + "gitea.dev/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/dependency.go b/models/issues/dependency.go index db8054e161..cf76fec2bf 100644 --- a/models/issues/dependency.go +++ b/models/issues/dependency.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + user_model "gitea.dev/models/user" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" ) // ErrDependencyExists represents a "DependencyAlreadyExists" kind of error. diff --git a/models/issues/dependency_test.go b/models/issues/dependency_test.go index 0e6a870ff9..786a24f146 100644 --- a/models/issues/dependency_test.go +++ b/models/issues/dependency_test.go @@ -6,9 +6,9 @@ package issues_test import ( "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + issues_model "gitea.dev/models/issues" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/issue.go b/models/issues/issue.go index 6765defa0c..1dba275ff0 100644 --- a/models/issues/issue.go +++ b/models/issues/issue.go @@ -12,17 +12,17 @@ import ( "slices" "strconv" - "code.gitea.io/gitea/models/db" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + project_model "gitea.dev/models/project" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/modules/container" + "gitea.dev/modules/log" + "gitea.dev/modules/optional" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/issues/issue_index.go b/models/issues/issue_index.go index 1fe4a08a09..895fd34193 100644 --- a/models/issues/issue_index.go +++ b/models/issues/issue_index.go @@ -6,7 +6,7 @@ package issues import ( "context" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) // RecalculateIssueIndexForRepo create issue_index for repo if not exist and diff --git a/models/issues/issue_label.go b/models/issues/issue_label.go index 697448cf5e..b628a25c14 100644 --- a/models/issues/issue_label.go +++ b/models/issues/issue_label.go @@ -8,9 +8,9 @@ import ( "fmt" "sort" - "code.gitea.io/gitea/models/db" - access_model "code.gitea.io/gitea/models/perm/access" - user_model "code.gitea.io/gitea/models/user" + "gitea.dev/models/db" + access_model "gitea.dev/models/perm/access" + user_model "gitea.dev/models/user" "xorm.io/builder" ) diff --git a/models/issues/issue_label_test.go b/models/issues/issue_label_test.go index 6ccf6debae..fc01feaecf 100644 --- a/models/issues/issue_label_test.go +++ b/models/issues/issue_label_test.go @@ -6,9 +6,9 @@ package issues_test import ( "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + issues_model "gitea.dev/models/issues" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/issue_list.go b/models/issues/issue_list.go index da407094a7..45e25c2da8 100644 --- a/models/issues/issue_list.go +++ b/models/issues/issue_list.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" + "gitea.dev/models/db" + project_model "gitea.dev/models/project" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/modules/container" "xorm.io/builder" ) diff --git a/models/issues/issue_list_test.go b/models/issues/issue_list_test.go index 842249bad2..1c9f2a1e8e 100644 --- a/models/issues/issue_list_test.go +++ b/models/issues/issue_list_test.go @@ -6,9 +6,9 @@ package issues_test import ( "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" + issues_model "gitea.dev/models/issues" + "gitea.dev/models/unittest" + "gitea.dev/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/issue_lock.go b/models/issues/issue_lock.go index 2e5bf64cc6..0bb4dc149a 100644 --- a/models/issues/issue_lock.go +++ b/models/issues/issue_lock.go @@ -6,8 +6,8 @@ package issues import ( "context" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" + "gitea.dev/models/db" + user_model "gitea.dev/models/user" ) // IssueLockOptions defines options for locking and/or unlocking an issue/PR diff --git a/models/issues/issue_pin.go b/models/issues/issue_pin.go index 753c96ed18..b3f2a48522 100644 --- a/models/issues/issue_pin.go +++ b/models/issues/issue_pin.go @@ -8,10 +8,10 @@ import ( "errors" "sort" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" ) type IssuePin struct { diff --git a/models/issues/issue_project.go b/models/issues/issue_project.go index 18f0f91c38..894eede22c 100644 --- a/models/issues/issue_project.go +++ b/models/issues/issue_project.go @@ -6,10 +6,10 @@ package issues import ( "context" - "code.gitea.io/gitea/models/db" - project_model "code.gitea.io/gitea/models/project" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + project_model "gitea.dev/models/project" + user_model "gitea.dev/models/user" + "gitea.dev/modules/util" ) // LoadProjects loads all projects the issue is assigned to diff --git a/models/issues/issue_project_multi_test.go b/models/issues/issue_project_multi_test.go index b004f994b1..5d5aae3b9c 100644 --- a/models/issues/issue_project_multi_test.go +++ b/models/issues/issue_project_multi_test.go @@ -7,10 +7,10 @@ import ( "fmt" "testing" - issues_model "code.gitea.io/gitea/models/issues" - project_model "code.gitea.io/gitea/models/project" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + issues_model "gitea.dev/models/issues" + project_model "gitea.dev/models/project" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/issue_search.go b/models/issues/issue_search.go index 0a9d5d93d5..bc39199766 100644 --- a/models/issues/issue_search.go +++ b/models/issues/issue_search.go @@ -9,14 +9,14 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/models/organization" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unit" + user_model "gitea.dev/models/user" + "gitea.dev/modules/container" + "gitea.dev/modules/optional" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/issues/issue_stats.go b/models/issues/issue_stats.go index 027f0f2bd8..0be8216c31 100644 --- a/models/issues/issue_stats.go +++ b/models/issues/issue_stats.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/builder" ) diff --git a/models/issues/issue_test.go b/models/issues/issue_test.go index 99a09de0ec..9d975d998e 100644 --- a/models/issues/issue_test.go +++ b/models/issues/issue_test.go @@ -11,13 +11,13 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "gitea.dev/models/db" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" "xorm.io/builder" @@ -299,7 +299,7 @@ func TestIssue_ResolveMentions(t *testing.T) { func TestResourceIndex(t *testing.T) { assert.NoError(t, unittest.PrepareTestDatabase()) var wg sync.WaitGroup - for i := range 25 { + for i := range 10 { wg.Go(func() { testInsertIssue(t, fmt.Sprintf("issue %d", i+1), "my issue", 0) }) diff --git a/models/issues/issue_update.go b/models/issues/issue_update.go index c58a2f319d..74a4b4aac1 100644 --- a/models/issues/issue_update.go +++ b/models/issues/issue_update.go @@ -9,17 +9,17 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/references" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/models/organization" + access_model "gitea.dev/models/perm/access" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unit" + user_model "gitea.dev/models/user" + "gitea.dev/modules/git" + "gitea.dev/modules/references" + api "gitea.dev/modules/structs" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/issues/issue_user.go b/models/issues/issue_user.go index 6b59e0725e..038447dca1 100644 --- a/models/issues/issue_user.go +++ b/models/issues/issue_user.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" ) // IssueUser represents an issue-user relation. diff --git a/models/issues/issue_user_test.go b/models/issues/issue_user_test.go index ec6d85c2bb..58d2698e76 100644 --- a/models/issues/issue_user_test.go +++ b/models/issues/issue_user_test.go @@ -6,10 +6,10 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/db" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/issue_watch.go b/models/issues/issue_watch.go index 8f8d155436..9ac7278f83 100644 --- a/models/issues/issue_watch.go +++ b/models/issues/issue_watch.go @@ -6,10 +6,10 @@ package issues import ( "context" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/modules/timeutil" ) // IssueWatch is connection request for receiving issue notification. diff --git a/models/issues/issue_watch_test.go b/models/issues/issue_watch_test.go index c860e8b8ca..9ff5bd7e8e 100644 --- a/models/issues/issue_watch_test.go +++ b/models/issues/issue_watch_test.go @@ -6,9 +6,9 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/db" + issues_model "gitea.dev/models/issues" + "gitea.dev/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/issue_xref.go b/models/issues/issue_xref.go index 41a867c892..0bdc48d715 100644 --- a/models/issues/issue_xref.go +++ b/models/issues/issue_xref.go @@ -7,12 +7,12 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/references" + "gitea.dev/models/db" + access_model "gitea.dev/models/perm/access" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/modules/log" + "gitea.dev/modules/references" ) type crossReference struct { diff --git a/models/issues/issue_xref_test.go b/models/issues/issue_xref_test.go index b25a704bec..4ecc654785 100644 --- a/models/issues/issue_xref_test.go +++ b/models/issues/issue_xref_test.go @@ -7,12 +7,12 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/references" + "gitea.dev/models/db" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/references" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/label.go b/models/issues/label.go index c120f7530b..e3312bdab1 100644 --- a/models/issues/label.go +++ b/models/issues/label.go @@ -11,12 +11,12 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/label" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/container" + "gitea.dev/modules/label" + "gitea.dev/modules/optional" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/issues/label_test.go b/models/issues/label_test.go index 42f774e750..f336190f0f 100644 --- a/models/issues/label_test.go +++ b/models/issues/label_test.go @@ -6,12 +6,12 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/main_test.go b/models/issues/main_test.go index ba83ca5552..ad43ffbc85 100644 --- a/models/issues/main_test.go +++ b/models/issues/main_test.go @@ -6,14 +6,14 @@ package issues_test import ( "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" + issues_model "gitea.dev/models/issues" + "gitea.dev/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/repo" - _ "code.gitea.io/gitea/models/user" + _ "gitea.dev/models" + _ "gitea.dev/models/actions" + _ "gitea.dev/models/activities" + _ "gitea.dev/models/repo" + _ "gitea.dev/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/milestone.go b/models/issues/milestone.go index 1dd8630276..eb3c548c08 100644 --- a/models/issues/milestone.go +++ b/models/issues/milestone.go @@ -9,12 +9,12 @@ import ( "html/template" "strings" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/optional" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/modules/optional" + api "gitea.dev/modules/structs" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/issues/milestone_list.go b/models/issues/milestone_list.go index 021b8beb9e..3b4bdc6e9f 100644 --- a/models/issues/milestone_list.go +++ b/models/issues/milestone_list.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/optional" + "gitea.dev/models/db" + "gitea.dev/modules/optional" "xorm.io/builder" ) diff --git a/models/issues/milestone_test.go b/models/issues/milestone_test.go index 107ad305d4..925038f68e 100644 --- a/models/issues/milestone_test.go +++ b/models/issues/milestone_test.go @@ -7,14 +7,14 @@ import ( "sort" "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + "gitea.dev/modules/optional" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/pull.go b/models/issues/pull.go index 4c8d02a990..7dbcef0d3f 100644 --- a/models/issues/pull.go +++ b/models/issues/pull.go @@ -11,19 +11,19 @@ import ( "io" "strings" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - org_model "code.gitea.io/gitea/models/organization" - pull_model "code.gitea.io/gitea/models/pull" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + git_model "gitea.dev/models/git" + org_model "gitea.dev/models/organization" + pull_model "gitea.dev/models/pull" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/modules/git" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" - "github.com/dlclark/regexp2" + "github.com/dlclark/regexp2/v2" "xorm.io/builder" ) diff --git a/models/issues/pull_list.go b/models/issues/pull_list.go index c7a2eb6c48..f271850a14 100644 --- a/models/issues/pull_list.go +++ b/models/issues/pull_list.go @@ -7,15 +7,15 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + access_model "gitea.dev/models/perm/access" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unit" + user_model "gitea.dev/models/user" + "gitea.dev/modules/container" + "gitea.dev/modules/log" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/issues/pull_list_test.go b/models/issues/pull_list_test.go index 302b2ca0ba..1312ba1fee 100644 --- a/models/issues/pull_list_test.go +++ b/models/issues/pull_list_test.go @@ -6,13 +6,13 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "gitea.dev/models/db" + issues_model "gitea.dev/models/issues" + "gitea.dev/models/perm" + "gitea.dev/models/perm/access" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/pull_test.go b/models/issues/pull_test.go index 79d1f8aa9b..166fdd8482 100644 --- a/models/issues/pull_test.go +++ b/models/issues/pull_test.go @@ -6,12 +6,12 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/reaction.go b/models/issues/reaction.go index 551f8f09d7..0043379d6d 100644 --- a/models/issues/reaction.go +++ b/models/issues/reaction.go @@ -9,13 +9,13 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/modules/container" + "gitea.dev/modules/setting" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/issues/review.go b/models/issues/review.go index 9936622219..e1f522be75 100644 --- a/models/issues/review.go +++ b/models/issues/review.go @@ -10,16 +10,16 @@ import ( "slices" "strings" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + git_model "gitea.dev/models/git" + "gitea.dev/models/organization" + "gitea.dev/models/perm" + access_model "gitea.dev/models/perm/access" + "gitea.dev/models/unit" + user_model "gitea.dev/models/user" + "gitea.dev/modules/structs" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/issues/review_list.go b/models/issues/review_list.go index 80703778a5..d65c3fc6d7 100644 --- a/models/issues/review_list.go +++ b/models/issues/review_list.go @@ -8,11 +8,11 @@ import ( "slices" "sort" - "code.gitea.io/gitea/models/db" - organization_model "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" + "gitea.dev/models/db" + organization_model "gitea.dev/models/organization" + user_model "gitea.dev/models/user" + "gitea.dev/modules/container" + "gitea.dev/modules/optional" "xorm.io/builder" ) diff --git a/models/issues/review_test.go b/models/issues/review_test.go index a384dbd30f..3d2672c403 100644 --- a/models/issues/review_test.go +++ b/models/issues/review_test.go @@ -6,10 +6,10 @@ package issues_test import ( "testing" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/stopwatch.go b/models/issues/stopwatch.go index 66e03479bc..9ad5796c34 100644 --- a/models/issues/stopwatch.go +++ b/models/issues/stopwatch.go @@ -7,11 +7,11 @@ import ( "context" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/issues/stopwatch_test.go b/models/issues/stopwatch_test.go index 684ec6cd31..e22328061f 100644 --- a/models/issues/stopwatch_test.go +++ b/models/issues/stopwatch_test.go @@ -6,9 +6,9 @@ package issues_test import ( "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + issues_model "gitea.dev/models/issues" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/tracked_time.go b/models/issues/tracked_time.go index 9df868c89a..764d03e4aa 100644 --- a/models/issues/tracked_time.go +++ b/models/issues/tracked_time.go @@ -9,11 +9,11 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + user_model "gitea.dev/models/user" + "gitea.dev/modules/optional" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/issues/tracked_time_test.go b/models/issues/tracked_time_test.go index ef7c72958f..3b8004b9e6 100644 --- a/models/issues/tracked_time_test.go +++ b/models/issues/tracked_time_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" + issues_model "gitea.dev/models/issues" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/optional" "github.com/stretchr/testify/assert" ) diff --git a/models/main_test.go b/models/main_test.go index 600dcc889b..21112a1736 100644 --- a/models/main_test.go +++ b/models/main_test.go @@ -6,14 +6,14 @@ package models import ( "testing" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + activities_model "gitea.dev/models/activities" + "gitea.dev/models/organization" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/system" + _ "gitea.dev/models/actions" + _ "gitea.dev/models/system" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/base/db.go b/models/migrations/base/db.go index ae33daf1af..569fd2109f 100644 --- a/models/migrations/base/db.go +++ b/models/migrations/base/db.go @@ -11,9 +11,9 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" "xorm.io/xorm/schemas" ) diff --git a/models/migrations/base/db_test.go b/models/migrations/base/db_test.go index ce6e1169d8..3f04e6620f 100644 --- a/models/migrations/base/db_test.go +++ b/models/migrations/base/db_test.go @@ -6,8 +6,8 @@ package base import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/migrations/migrationtest" + "gitea.dev/modules/timeutil" "xorm.io/xorm/names" ) diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 2040b105bd..904a3ffa20 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -9,32 +9,32 @@ import ( "errors" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/v1_10" - "code.gitea.io/gitea/models/migrations/v1_11" - "code.gitea.io/gitea/models/migrations/v1_12" - "code.gitea.io/gitea/models/migrations/v1_13" - "code.gitea.io/gitea/models/migrations/v1_14" - "code.gitea.io/gitea/models/migrations/v1_15" - "code.gitea.io/gitea/models/migrations/v1_16" - "code.gitea.io/gitea/models/migrations/v1_17" - "code.gitea.io/gitea/models/migrations/v1_18" - "code.gitea.io/gitea/models/migrations/v1_19" - "code.gitea.io/gitea/models/migrations/v1_20" - "code.gitea.io/gitea/models/migrations/v1_21" - "code.gitea.io/gitea/models/migrations/v1_22" - "code.gitea.io/gitea/models/migrations/v1_23" - "code.gitea.io/gitea/models/migrations/v1_24" - "code.gitea.io/gitea/models/migrations/v1_25" - "code.gitea.io/gitea/models/migrations/v1_26" - "code.gitea.io/gitea/models/migrations/v1_27" - "code.gitea.io/gitea/models/migrations/v1_6" - "code.gitea.io/gitea/models/migrations/v1_7" - "code.gitea.io/gitea/models/migrations/v1_8" - "code.gitea.io/gitea/models/migrations/v1_9" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/models/migrations/v1_10" + "gitea.dev/models/migrations/v1_11" + "gitea.dev/models/migrations/v1_12" + "gitea.dev/models/migrations/v1_13" + "gitea.dev/models/migrations/v1_14" + "gitea.dev/models/migrations/v1_15" + "gitea.dev/models/migrations/v1_16" + "gitea.dev/models/migrations/v1_17" + "gitea.dev/models/migrations/v1_18" + "gitea.dev/models/migrations/v1_19" + "gitea.dev/models/migrations/v1_20" + "gitea.dev/models/migrations/v1_21" + "gitea.dev/models/migrations/v1_22" + "gitea.dev/models/migrations/v1_23" + "gitea.dev/models/migrations/v1_24" + "gitea.dev/models/migrations/v1_25" + "gitea.dev/models/migrations/v1_26" + "gitea.dev/models/migrations/v1_27" + "gitea.dev/models/migrations/v1_6" + "gitea.dev/models/migrations/v1_7" + "gitea.dev/models/migrations/v1_8" + "gitea.dev/models/migrations/v1_9" + "gitea.dev/modules/git" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" "xorm.io/xorm/names" ) @@ -412,6 +412,7 @@ func prepareMigrationTasks() []*migration { newMigration(332, "Add last_sync_unix to mirror", v1_27.AddLastSyncUnixToMirror), newMigration(333, "Add bypass allowlist to branch protection", v1_27.AddBranchProtectionBypassAllowlist), newMigration(334, "Add cancelling support to action runners", v1_27.AddCancellingSupportToActionRunner), + newMigration(335, "Add reusable workflow fields and action_run_attempt_job_id_index table for ActionRunJob", v1_27.AddReusableWorkflowFieldsToActionRunJob), } return preparedMigrations } diff --git a/models/migrations/migrations_test.go b/models/migrations/migrations_test.go index 8649d116f5..bc94d7b1e6 100644 --- a/models/migrations/migrations_test.go +++ b/models/migrations/migrations_test.go @@ -6,7 +6,7 @@ package migrations import ( "testing" - "code.gitea.io/gitea/modules/test" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/migrationtest/tests.go b/models/migrations/migrationtest/tests.go index be2557a902..bafdea24cf 100644 --- a/models/migrations/migrationtest/tests.go +++ b/models/migrations/migrationtest/tests.go @@ -8,11 +8,11 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/testlogger" + "gitea.dev/models/db" + "gitea.dev/models/unittest" + "gitea.dev/modules/git" + "gitea.dev/modules/setting" + "gitea.dev/modules/testlogger" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_10/v100.go b/models/migrations/v1_10/v100.go index db581ca175..9a2bf5fe09 100644 --- a/models/migrations/v1_10/v100.go +++ b/models/migrations/v1_10/v100.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) func UpdateMigrationServiceTypes(x db.EngineMigration) error { diff --git a/models/migrations/v1_10/v101.go b/models/migrations/v1_10/v101.go index 221d151ff6..06415af073 100644 --- a/models/migrations/v1_10/v101.go +++ b/models/migrations/v1_10/v101.go @@ -3,7 +3,7 @@ package v1_10 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func ChangeSomeColumnsLengthOfExternalLoginUser(x db.EngineMigration) error { type ExternalLoginUser struct { diff --git a/models/migrations/v1_10/v88.go b/models/migrations/v1_10/v88.go index ae129d8e66..dc086488ed 100644 --- a/models/migrations/v1_10/v88.go +++ b/models/migrations/v1_10/v88.go @@ -7,7 +7,7 @@ import ( "crypto/sha1" "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) func hashContext(context string) string { diff --git a/models/migrations/v1_10/v89.go b/models/migrations/v1_10/v89.go index 0f9f5a01ea..336c637f18 100644 --- a/models/migrations/v1_10/v89.go +++ b/models/migrations/v1_10/v89.go @@ -3,7 +3,7 @@ package v1_10 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddOriginalMigrationInfo(x db.EngineMigration) error { // Issue see models/issue.go diff --git a/models/migrations/v1_10/v90.go b/models/migrations/v1_10/v90.go index b8003ea5e0..b00607f596 100644 --- a/models/migrations/v1_10/v90.go +++ b/models/migrations/v1_10/v90.go @@ -3,7 +3,7 @@ package v1_10 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func ChangeSomeColumnsLengthOfRepo(x db.EngineMigration) error { type Repository struct { diff --git a/models/migrations/v1_10/v91.go b/models/migrations/v1_10/v91.go index 825c0cf336..e78b39b7ec 100644 --- a/models/migrations/v1_10/v91.go +++ b/models/migrations/v1_10/v91.go @@ -3,7 +3,7 @@ package v1_10 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddIndexOnRepositoryAndComment(x db.EngineMigration) error { type Repository struct { diff --git a/models/migrations/v1_10/v92.go b/models/migrations/v1_10/v92.go index 7fb6d209f1..15ed28ad20 100644 --- a/models/migrations/v1_10/v92.go +++ b/models/migrations/v1_10/v92.go @@ -4,7 +4,7 @@ package v1_10 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/builder" ) diff --git a/models/migrations/v1_10/v93.go b/models/migrations/v1_10/v93.go index 5803722c70..08dc4b4118 100644 --- a/models/migrations/v1_10/v93.go +++ b/models/migrations/v1_10/v93.go @@ -3,7 +3,7 @@ package v1_10 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddEmailNotificationEnabledToUser(x db.EngineMigration) error { // User see models/user.go diff --git a/models/migrations/v1_10/v94.go b/models/migrations/v1_10/v94.go index df2d016fe0..ace5f4eec2 100644 --- a/models/migrations/v1_10/v94.go +++ b/models/migrations/v1_10/v94.go @@ -3,7 +3,7 @@ package v1_10 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddStatusCheckColumnsForProtectedBranches(x db.EngineMigration) error { type ProtectedBranch struct { diff --git a/models/migrations/v1_10/v95.go b/models/migrations/v1_10/v95.go index 2c8bc75e91..4638cb175a 100644 --- a/models/migrations/v1_10/v95.go +++ b/models/migrations/v1_10/v95.go @@ -3,7 +3,7 @@ package v1_10 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddCrossReferenceColumns(x db.EngineMigration) error { // Comment see models/comment.go diff --git a/models/migrations/v1_10/v96.go b/models/migrations/v1_10/v96.go index 9950f30dec..8fc0c8b71c 100644 --- a/models/migrations/v1_10/v96.go +++ b/models/migrations/v1_10/v96.go @@ -6,9 +6,9 @@ package v1_10 import ( "path/filepath" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" ) func DeleteOrphanedAttachments(x db.EngineMigration) error { diff --git a/models/migrations/v1_10/v97.go b/models/migrations/v1_10/v97.go index 6ccac1299f..554869af3e 100644 --- a/models/migrations/v1_10/v97.go +++ b/models/migrations/v1_10/v97.go @@ -3,7 +3,7 @@ package v1_10 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddRepoAdminChangeTeamAccessColumnForUser(x db.EngineMigration) error { type User struct { diff --git a/models/migrations/v1_10/v98.go b/models/migrations/v1_10/v98.go index 427c8da534..9f4d1eb846 100644 --- a/models/migrations/v1_10/v98.go +++ b/models/migrations/v1_10/v98.go @@ -3,7 +3,7 @@ package v1_10 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddOriginalAuthorOnMigratedReleases(x db.EngineMigration) error { type Release struct { diff --git a/models/migrations/v1_10/v99.go b/models/migrations/v1_10/v99.go index e0b14f90f6..36802c6cb6 100644 --- a/models/migrations/v1_10/v99.go +++ b/models/migrations/v1_10/v99.go @@ -4,8 +4,8 @@ package v1_10 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func AddTaskTable(x db.EngineMigration) error { diff --git a/models/migrations/v1_11/v102.go b/models/migrations/v1_11/v102.go index b66943a10c..e5263f6b94 100644 --- a/models/migrations/v1_11/v102.go +++ b/models/migrations/v1_11/v102.go @@ -4,8 +4,8 @@ package v1_11 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/base" + "gitea.dev/models/db" + "gitea.dev/models/migrations/base" ) func DropColumnHeadUserNameOnPullRequest(x db.EngineMigration) error { diff --git a/models/migrations/v1_11/v103.go b/models/migrations/v1_11/v103.go index d9beed9c28..1bb4fb4dff 100644 --- a/models/migrations/v1_11/v103.go +++ b/models/migrations/v1_11/v103.go @@ -3,7 +3,7 @@ package v1_11 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddWhitelistDeployKeysToBranches(x db.EngineMigration) error { type ProtectedBranch struct { diff --git a/models/migrations/v1_11/v104.go b/models/migrations/v1_11/v104.go index 19ba7d56b3..e907c21208 100644 --- a/models/migrations/v1_11/v104.go +++ b/models/migrations/v1_11/v104.go @@ -4,8 +4,8 @@ package v1_11 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/base" + "gitea.dev/models/db" + "gitea.dev/models/migrations/base" ) func RemoveLabelUneededCols(x db.EngineMigration) error { diff --git a/models/migrations/v1_11/v105.go b/models/migrations/v1_11/v105.go index 93c96bb098..49544148f8 100644 --- a/models/migrations/v1_11/v105.go +++ b/models/migrations/v1_11/v105.go @@ -3,7 +3,7 @@ package v1_11 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddTeamIncludesAllRepositories(x db.EngineMigration) error { type Team struct { diff --git a/models/migrations/v1_11/v106.go b/models/migrations/v1_11/v106.go index 61f5be6c41..8e5848cb90 100644 --- a/models/migrations/v1_11/v106.go +++ b/models/migrations/v1_11/v106.go @@ -3,7 +3,7 @@ package v1_11 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" // RepoWatchMode specifies what kind of watch the user has on a repository type RepoWatchMode int8 diff --git a/models/migrations/v1_11/v107.go b/models/migrations/v1_11/v107.go index 7bdd401d16..83efb24253 100644 --- a/models/migrations/v1_11/v107.go +++ b/models/migrations/v1_11/v107.go @@ -3,7 +3,7 @@ package v1_11 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddTemplateToRepo(x db.EngineMigration) error { type Repository struct { diff --git a/models/migrations/v1_11/v108.go b/models/migrations/v1_11/v108.go index 816206d992..a8b1e50b11 100644 --- a/models/migrations/v1_11/v108.go +++ b/models/migrations/v1_11/v108.go @@ -3,7 +3,7 @@ package v1_11 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddCommentIDOnNotification(x db.EngineMigration) error { type Notification struct { diff --git a/models/migrations/v1_11/v109.go b/models/migrations/v1_11/v109.go index 8a30905ace..63f4e521ef 100644 --- a/models/migrations/v1_11/v109.go +++ b/models/migrations/v1_11/v109.go @@ -3,7 +3,7 @@ package v1_11 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddCanCreateOrgRepoColumnForTeam(x db.EngineMigration) error { type Team struct { diff --git a/models/migrations/v1_11/v110.go b/models/migrations/v1_11/v110.go index 6f2c63018f..ccd5bb0fc1 100644 --- a/models/migrations/v1_11/v110.go +++ b/models/migrations/v1_11/v110.go @@ -4,7 +4,7 @@ package v1_11 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm/schemas" ) diff --git a/models/migrations/v1_11/v111.go b/models/migrations/v1_11/v111.go index f2e6e7b74c..7f3cf4fc92 100644 --- a/models/migrations/v1_11/v111.go +++ b/models/migrations/v1_11/v111.go @@ -7,7 +7,7 @@ import ( "fmt" "slices" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) func AddBranchProtectionCanPushAndEnableWhitelist(x db.EngineMigration) error { diff --git a/models/migrations/v1_11/v112.go b/models/migrations/v1_11/v112.go index 1c6e72be99..1acc7e6dfa 100644 --- a/models/migrations/v1_11/v112.go +++ b/models/migrations/v1_11/v112.go @@ -6,10 +6,10 @@ package v1_11 import ( "path/filepath" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/migrations/v1_11/v113.go b/models/migrations/v1_11/v113.go index 1a3584be8e..0cdf0a9dfe 100644 --- a/models/migrations/v1_11/v113.go +++ b/models/migrations/v1_11/v113.go @@ -6,7 +6,7 @@ package v1_11 import ( "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) func FeatureChangeTargetBranch(x db.EngineMigration) error { diff --git a/models/migrations/v1_11/v114.go b/models/migrations/v1_11/v114.go index 021e28b437..3402542856 100644 --- a/models/migrations/v1_11/v114.go +++ b/models/migrations/v1_11/v114.go @@ -6,7 +6,7 @@ package v1_11 import ( "net/url" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) func SanitizeOriginalURL(x db.EngineMigration) error { diff --git a/models/migrations/v1_11/v115.go b/models/migrations/v1_11/v115.go index 6c13d89b6b..d63c9c09ec 100644 --- a/models/migrations/v1_11/v115.go +++ b/models/migrations/v1_11/v115.go @@ -12,11 +12,11 @@ import ( "path/filepath" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/container" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" ) func RenameExistingUserAvatarName(x db.EngineMigration) error { diff --git a/models/migrations/v1_11/v116.go b/models/migrations/v1_11/v116.go index 19a40ede9d..9397d2a02c 100644 --- a/models/migrations/v1_11/v116.go +++ b/models/migrations/v1_11/v116.go @@ -3,7 +3,7 @@ package v1_11 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func ExtendTrackedTimes(x db.EngineMigration) error { type TrackedTime struct { diff --git a/models/migrations/v1_12/v117.go b/models/migrations/v1_12/v117.go index b9d240226e..d15c55cac3 100644 --- a/models/migrations/v1_12/v117.go +++ b/models/migrations/v1_12/v117.go @@ -3,7 +3,7 @@ package v1_12 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddBlockOnRejectedReviews(x db.EngineMigration) error { type ProtectedBranch struct { diff --git a/models/migrations/v1_12/v118.go b/models/migrations/v1_12/v118.go index 756b112d00..878b0e8b24 100644 --- a/models/migrations/v1_12/v118.go +++ b/models/migrations/v1_12/v118.go @@ -3,7 +3,7 @@ package v1_12 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddReviewCommitAndStale(x db.EngineMigration) error { type Review struct { diff --git a/models/migrations/v1_12/v119.go b/models/migrations/v1_12/v119.go index dfbee84d82..b4ed7c42a4 100644 --- a/models/migrations/v1_12/v119.go +++ b/models/migrations/v1_12/v119.go @@ -3,7 +3,7 @@ package v1_12 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func FixMigratedRepositoryServiceType(x db.EngineMigration) error { // structs.GithubService: diff --git a/models/migrations/v1_12/v120.go b/models/migrations/v1_12/v120.go index abec02d313..7f0088346f 100644 --- a/models/migrations/v1_12/v120.go +++ b/models/migrations/v1_12/v120.go @@ -3,7 +3,7 @@ package v1_12 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddOwnerNameOnRepository(x db.EngineMigration) error { type Repository struct { diff --git a/models/migrations/v1_12/v121.go b/models/migrations/v1_12/v121.go index 4036795fcb..fc436259b9 100644 --- a/models/migrations/v1_12/v121.go +++ b/models/migrations/v1_12/v121.go @@ -3,7 +3,7 @@ package v1_12 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddIsRestricted(x db.EngineMigration) error { // User see models/user.go diff --git a/models/migrations/v1_12/v122.go b/models/migrations/v1_12/v122.go index 5982dd5662..c2d114d925 100644 --- a/models/migrations/v1_12/v122.go +++ b/models/migrations/v1_12/v122.go @@ -3,7 +3,7 @@ package v1_12 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddRequireSignedCommits(x db.EngineMigration) error { type ProtectedBranch struct { diff --git a/models/migrations/v1_12/v123.go b/models/migrations/v1_12/v123.go index 3550b710a7..159d0c2e0d 100644 --- a/models/migrations/v1_12/v123.go +++ b/models/migrations/v1_12/v123.go @@ -3,7 +3,7 @@ package v1_12 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddReactionOriginals(x db.EngineMigration) error { type Reaction struct { diff --git a/models/migrations/v1_12/v124.go b/models/migrations/v1_12/v124.go index d124918f09..928d13f3a1 100644 --- a/models/migrations/v1_12/v124.go +++ b/models/migrations/v1_12/v124.go @@ -3,7 +3,7 @@ package v1_12 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddUserRepoMissingColumns(x db.EngineMigration) error { type VisibleType int diff --git a/models/migrations/v1_12/v125.go b/models/migrations/v1_12/v125.go index ce94711599..c83c068b6b 100644 --- a/models/migrations/v1_12/v125.go +++ b/models/migrations/v1_12/v125.go @@ -6,7 +6,7 @@ package v1_12 import ( "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) func AddReviewMigrateInfo(x db.EngineMigration) error { diff --git a/models/migrations/v1_12/v126.go b/models/migrations/v1_12/v126.go index 41f816353a..f74dac9985 100644 --- a/models/migrations/v1_12/v126.go +++ b/models/migrations/v1_12/v126.go @@ -4,7 +4,7 @@ package v1_12 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/builder" ) diff --git a/models/migrations/v1_12/v127.go b/models/migrations/v1_12/v127.go index 82b2db2eb5..2a2438bacc 100644 --- a/models/migrations/v1_12/v127.go +++ b/models/migrations/v1_12/v127.go @@ -6,8 +6,8 @@ package v1_12 import ( "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func AddLanguageStats(x db.EngineMigration) error { diff --git a/models/migrations/v1_12/v128.go b/models/migrations/v1_12/v128.go index 7f337db8bc..b2486ea3c6 100644 --- a/models/migrations/v1_12/v128.go +++ b/models/migrations/v1_12/v128.go @@ -11,11 +11,11 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/modules/git" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" ) func FixMergeBase(ctx context.Context, x db.EngineMigration) error { diff --git a/models/migrations/v1_12/v129.go b/models/migrations/v1_12/v129.go index 90666e5f6f..5867530090 100644 --- a/models/migrations/v1_12/v129.go +++ b/models/migrations/v1_12/v129.go @@ -3,7 +3,7 @@ package v1_12 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func PurgeUnusedDependencies(x db.EngineMigration) error { if _, err := x.Exec("DELETE FROM issue_dependency WHERE issue_id NOT IN (SELECT id FROM issue)"); err != nil { diff --git a/models/migrations/v1_12/v130.go b/models/migrations/v1_12/v130.go index 5245df0fe5..290cb0af05 100644 --- a/models/migrations/v1_12/v130.go +++ b/models/migrations/v1_12/v130.go @@ -4,9 +4,9 @@ package v1_12 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/modules/json" + "gitea.dev/modules/setting" ) func ExpandWebhooks(x db.EngineMigration) error { diff --git a/models/migrations/v1_12/v131.go b/models/migrations/v1_12/v131.go index cb7d4f01a6..35831d0cc6 100644 --- a/models/migrations/v1_12/v131.go +++ b/models/migrations/v1_12/v131.go @@ -6,7 +6,7 @@ package v1_12 import ( "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) func AddSystemWebhookColumn(x db.EngineMigration) error { diff --git a/models/migrations/v1_12/v132.go b/models/migrations/v1_12/v132.go index 2649fd6457..2248251b57 100644 --- a/models/migrations/v1_12/v132.go +++ b/models/migrations/v1_12/v132.go @@ -6,7 +6,7 @@ package v1_12 import ( "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) func AddBranchProtectionProtectedFilesColumn(x db.EngineMigration) error { diff --git a/models/migrations/v1_12/v133.go b/models/migrations/v1_12/v133.go index 8b7e17cd59..6eb6cdc504 100644 --- a/models/migrations/v1_12/v133.go +++ b/models/migrations/v1_12/v133.go @@ -3,7 +3,7 @@ package v1_12 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddEmailHashTable(x db.EngineMigration) error { // EmailHash represents a pre-generated hash map diff --git a/models/migrations/v1_12/v134.go b/models/migrations/v1_12/v134.go index e804fd6c8d..017fb547d3 100644 --- a/models/migrations/v1_12/v134.go +++ b/models/migrations/v1_12/v134.go @@ -11,10 +11,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" ) func RefixMergeBase(ctx context.Context, x db.EngineMigration) error { diff --git a/models/migrations/v1_12/v135.go b/models/migrations/v1_12/v135.go index e9a0bc7c0b..00664ca2ff 100644 --- a/models/migrations/v1_12/v135.go +++ b/models/migrations/v1_12/v135.go @@ -6,7 +6,7 @@ package v1_12 import ( "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) func AddOrgIDLabelColumn(x db.EngineMigration) error { diff --git a/models/migrations/v1_12/v136.go b/models/migrations/v1_12/v136.go index 7ab2dba978..66f7b2aea4 100644 --- a/models/migrations/v1_12/v136.go +++ b/models/migrations/v1_12/v136.go @@ -8,12 +8,12 @@ import ( "math" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/modules/gitrepo" + "gitea.dev/modules/graceful" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" ) func AddCommitDivergenceToPulls(x db.EngineMigration) error { diff --git a/models/migrations/v1_12/v137.go b/models/migrations/v1_12/v137.go index 0d80b1e575..c8ef8dbd43 100644 --- a/models/migrations/v1_12/v137.go +++ b/models/migrations/v1_12/v137.go @@ -3,7 +3,7 @@ package v1_12 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddBlockOnOutdatedBranch(x db.EngineMigration) error { type ProtectedBranch struct { diff --git a/models/migrations/v1_12/v138.go b/models/migrations/v1_12/v138.go index 33cb5851dc..fa418abc70 100644 --- a/models/migrations/v1_12/v138.go +++ b/models/migrations/v1_12/v138.go @@ -6,7 +6,7 @@ package v1_12 import ( "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) func AddResolveDoerIDCommentColumn(x db.EngineMigration) error { diff --git a/models/migrations/v1_12/v139.go b/models/migrations/v1_12/v139.go index d0f35dcc45..6c57fdef0b 100644 --- a/models/migrations/v1_12/v139.go +++ b/models/migrations/v1_12/v139.go @@ -4,8 +4,8 @@ package v1_12 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/modules/setting" ) func PrependRefsHeadsToIssueRefs(x db.EngineMigration) error { diff --git a/models/migrations/v1_13/v140.go b/models/migrations/v1_13/v140.go index 53057048ca..8c8e5d795a 100644 --- a/models/migrations/v1_13/v140.go +++ b/models/migrations/v1_13/v140.go @@ -6,9 +6,9 @@ package v1_13 import ( "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/models/migrations/base" + "gitea.dev/modules/setting" ) func FixLanguageStatsToSaveSize(x db.EngineMigration) error { diff --git a/models/migrations/v1_13/v141.go b/models/migrations/v1_13/v141.go index c1a935b16d..e6d56ffa5e 100644 --- a/models/migrations/v1_13/v141.go +++ b/models/migrations/v1_13/v141.go @@ -6,7 +6,7 @@ package v1_13 import ( "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) func AddKeepActivityPrivateUserColumn(x db.EngineMigration) error { diff --git a/models/migrations/v1_13/v142.go b/models/migrations/v1_13/v142.go index 5207960aec..189504772f 100644 --- a/models/migrations/v1_13/v142.go +++ b/models/migrations/v1_13/v142.go @@ -4,8 +4,8 @@ package v1_13 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" + "gitea.dev/models/db" + "gitea.dev/modules/log" "xorm.io/builder" ) diff --git a/models/migrations/v1_13/v143.go b/models/migrations/v1_13/v143.go index 84e68c304d..283611e764 100644 --- a/models/migrations/v1_13/v143.go +++ b/models/migrations/v1_13/v143.go @@ -4,8 +4,8 @@ package v1_13 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" + "gitea.dev/models/db" + "gitea.dev/modules/log" ) func RecalculateStars(x db.EngineMigration) (err error) { diff --git a/models/migrations/v1_13/v144.go b/models/migrations/v1_13/v144.go index 4e85694f6f..0e51ab9cb9 100644 --- a/models/migrations/v1_13/v144.go +++ b/models/migrations/v1_13/v144.go @@ -4,8 +4,8 @@ package v1_13 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" + "gitea.dev/models/db" + "gitea.dev/modules/log" "xorm.io/builder" ) diff --git a/models/migrations/v1_13/v145.go b/models/migrations/v1_13/v145.go index 0bca23fc76..b46b269650 100644 --- a/models/migrations/v1_13/v145.go +++ b/models/migrations/v1_13/v145.go @@ -6,8 +6,8 @@ package v1_13 import ( "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/modules/setting" ) func IncreaseLanguageField(x db.EngineMigration) error { diff --git a/models/migrations/v1_13/v146.go b/models/migrations/v1_13/v146.go index 29ee1025b3..dc0cb1a4e1 100644 --- a/models/migrations/v1_13/v146.go +++ b/models/migrations/v1_13/v146.go @@ -4,8 +4,8 @@ package v1_13 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func AddProjectsInfo(x db.EngineMigration) error { diff --git a/models/migrations/v1_13/v147.go b/models/migrations/v1_13/v147.go index af755c10a5..314b4578b6 100644 --- a/models/migrations/v1_13/v147.go +++ b/models/migrations/v1_13/v147.go @@ -4,8 +4,8 @@ package v1_13 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func CreateReviewsForCodeComments(x db.EngineMigration) error { diff --git a/models/migrations/v1_13/v148.go b/models/migrations/v1_13/v148.go index e54f5c4ba5..c1c27a49d4 100644 --- a/models/migrations/v1_13/v148.go +++ b/models/migrations/v1_13/v148.go @@ -3,7 +3,7 @@ package v1_13 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func PurgeInvalidDependenciesComments(x db.EngineMigration) error { _, err := x.Exec("DELETE FROM comment WHERE dependent_issue_id != 0 AND dependent_issue_id NOT IN (SELECT id FROM issue)") diff --git a/models/migrations/v1_13/v149.go b/models/migrations/v1_13/v149.go index c3fcf85b32..09f1e81851 100644 --- a/models/migrations/v1_13/v149.go +++ b/models/migrations/v1_13/v149.go @@ -6,8 +6,8 @@ package v1_13 import ( "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func AddCreatedAndUpdatedToMilestones(x db.EngineMigration) error { diff --git a/models/migrations/v1_13/v150.go b/models/migrations/v1_13/v150.go index 0714cae4db..a1e8236f7d 100644 --- a/models/migrations/v1_13/v150.go +++ b/models/migrations/v1_13/v150.go @@ -4,9 +4,9 @@ package v1_13 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/models/migrations/base" + "gitea.dev/modules/timeutil" ) func AddPrimaryKeyToRepoTopic(x db.EngineMigration) error { diff --git a/models/migrations/v1_13/v151.go b/models/migrations/v1_13/v151.go index cef17bc8d5..995d4b32fa 100644 --- a/models/migrations/v1_13/v151.go +++ b/models/migrations/v1_13/v151.go @@ -9,9 +9,9 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" "xorm.io/xorm/schemas" ) diff --git a/models/migrations/v1_13/v152.go b/models/migrations/v1_13/v152.go index 24d45b6c34..42055d0e78 100644 --- a/models/migrations/v1_13/v152.go +++ b/models/migrations/v1_13/v152.go @@ -3,7 +3,7 @@ package v1_13 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddTrustModelToRepository(x db.EngineMigration) error { type Repository struct { diff --git a/models/migrations/v1_13/v153.go b/models/migrations/v1_13/v153.go index 0c13b2cb89..c04d1b64a3 100644 --- a/models/migrations/v1_13/v153.go +++ b/models/migrations/v1_13/v153.go @@ -3,7 +3,7 @@ package v1_13 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddTeamReviewRequestSupport(x db.EngineMigration) error { type Review struct { diff --git a/models/migrations/v1_13/v154.go b/models/migrations/v1_13/v154.go index 63e415e7ce..1954a04692 100644 --- a/models/migrations/v1_13/v154.go +++ b/models/migrations/v1_13/v154.go @@ -4,8 +4,8 @@ package v1_13 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func AddTimeStamps(x db.EngineMigration) error { diff --git a/models/migrations/v1_14/main_test.go b/models/migrations/v1_14/main_test.go index 6ed240c407..31aacc5211 100644 --- a/models/migrations/v1_14/main_test.go +++ b/models/migrations/v1_14/main_test.go @@ -6,7 +6,7 @@ package v1_14 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_14/v155.go b/models/migrations/v1_14/v155.go index de93cb5d8c..f605c18d57 100644 --- a/models/migrations/v1_14/v155.go +++ b/models/migrations/v1_14/v155.go @@ -6,7 +6,7 @@ package v1_14 import ( "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) func AddChangedProtectedFilesPullRequestColumn(x db.EngineMigration) error { diff --git a/models/migrations/v1_14/v156.go b/models/migrations/v1_14/v156.go index c9b17306d0..e1078f4bd0 100644 --- a/models/migrations/v1_14/v156.go +++ b/models/migrations/v1_14/v156.go @@ -9,10 +9,10 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/modules/git" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" ) // Copy paste from models/repo.go because we cannot import models package diff --git a/models/migrations/v1_14/v157.go b/models/migrations/v1_14/v157.go index 8ce460a978..b6058a0303 100644 --- a/models/migrations/v1_14/v157.go +++ b/models/migrations/v1_14/v157.go @@ -3,7 +3,7 @@ package v1_14 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func FixRepoTopics(x db.EngineMigration) error { type Repository struct { diff --git a/models/migrations/v1_14/v158.go b/models/migrations/v1_14/v158.go index 2b1cde41b5..62f8036b35 100644 --- a/models/migrations/v1_14/v158.go +++ b/models/migrations/v1_14/v158.go @@ -7,9 +7,9 @@ import ( "errors" "strconv" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" ) func UpdateCodeCommentReplies(x db.EngineMigration) error { diff --git a/models/migrations/v1_14/v159.go b/models/migrations/v1_14/v159.go index 42da0bfef4..1dd2e1c639 100644 --- a/models/migrations/v1_14/v159.go +++ b/models/migrations/v1_14/v159.go @@ -4,9 +4,9 @@ package v1_14 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/models/migrations/base" + "gitea.dev/modules/timeutil" ) func UpdateReactionConstraint(x db.EngineMigration) error { diff --git a/models/migrations/v1_14/v160.go b/models/migrations/v1_14/v160.go index fcfd738e4c..b216929387 100644 --- a/models/migrations/v1_14/v160.go +++ b/models/migrations/v1_14/v160.go @@ -3,7 +3,7 @@ package v1_14 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddBlockOnOfficialReviewRequests(x db.EngineMigration) error { type ProtectedBranch struct { diff --git a/models/migrations/v1_14/v161.go b/models/migrations/v1_14/v161.go index 6cecf53113..78ef19c34d 100644 --- a/models/migrations/v1_14/v161.go +++ b/models/migrations/v1_14/v161.go @@ -6,8 +6,8 @@ package v1_14 import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/base" + "gitea.dev/models/db" + "gitea.dev/models/migrations/base" ) func ConvertTaskTypeToString(x db.EngineMigration) error { diff --git a/models/migrations/v1_14/v162.go b/models/migrations/v1_14/v162.go index 60c6bfee2c..02bc48938e 100644 --- a/models/migrations/v1_14/v162.go +++ b/models/migrations/v1_14/v162.go @@ -4,8 +4,8 @@ package v1_14 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/base" + "gitea.dev/models/db" + "gitea.dev/models/migrations/base" ) func ConvertWebhookTaskTypeToString(x db.EngineMigration) error { diff --git a/models/migrations/v1_14/v163.go b/models/migrations/v1_14/v163.go index d7e763ee5c..08819d2dc5 100644 --- a/models/migrations/v1_14/v163.go +++ b/models/migrations/v1_14/v163.go @@ -4,8 +4,8 @@ package v1_14 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/base" + "gitea.dev/models/db" + "gitea.dev/models/migrations/base" ) func ConvertTopicNameFrom25To50(x db.EngineMigration) error { diff --git a/models/migrations/v1_14/v164.go b/models/migrations/v1_14/v164.go index 17adc3f46a..58325ca404 100644 --- a/models/migrations/v1_14/v164.go +++ b/models/migrations/v1_14/v164.go @@ -6,7 +6,7 @@ package v1_14 import ( "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) // OAuth2Grant here is a snapshot of models.OAuth2Grant for this version diff --git a/models/migrations/v1_14/v165.go b/models/migrations/v1_14/v165.go index c528049e69..d5fa4d008d 100644 --- a/models/migrations/v1_14/v165.go +++ b/models/migrations/v1_14/v165.go @@ -4,8 +4,8 @@ package v1_14 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/base" + "gitea.dev/models/db" + "gitea.dev/models/migrations/base" "xorm.io/xorm/schemas" ) diff --git a/models/migrations/v1_14/v166.go b/models/migrations/v1_14/v166.go index e3f53475b1..ca03363d55 100644 --- a/models/migrations/v1_14/v166.go +++ b/models/migrations/v1_14/v166.go @@ -7,7 +7,7 @@ import ( "crypto/sha256" "encoding/hex" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "golang.org/x/crypto/argon2" "golang.org/x/crypto/bcrypt" diff --git a/models/migrations/v1_14/v167.go b/models/migrations/v1_14/v167.go index b38f26bd0f..ac1e6c0498 100644 --- a/models/migrations/v1_14/v167.go +++ b/models/migrations/v1_14/v167.go @@ -6,7 +6,7 @@ package v1_14 import ( "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) func AddUserRedirect(x db.EngineMigration) (err error) { diff --git a/models/migrations/v1_14/v168.go b/models/migrations/v1_14/v168.go index 15d57364a0..f8eda53fd8 100644 --- a/models/migrations/v1_14/v168.go +++ b/models/migrations/v1_14/v168.go @@ -3,7 +3,7 @@ package v1_14 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func RecreateUserTableToFixDefaultValues(_ db.EngineMigration) error { return nil diff --git a/models/migrations/v1_14/v169.go b/models/migrations/v1_14/v169.go index 5838348867..3bb542516b 100644 --- a/models/migrations/v1_14/v169.go +++ b/models/migrations/v1_14/v169.go @@ -3,7 +3,7 @@ package v1_14 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func CommentTypeDeleteBranchUseOldRef(x db.EngineMigration) error { _, err := x.Exec("UPDATE comment SET old_ref = commit_sha, commit_sha = '' WHERE type = 11") diff --git a/models/migrations/v1_14/v170.go b/models/migrations/v1_14/v170.go index 9e91e56b96..1626316a20 100644 --- a/models/migrations/v1_14/v170.go +++ b/models/migrations/v1_14/v170.go @@ -6,7 +6,7 @@ package v1_14 import ( "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) func AddDismissedReviewColumn(x db.EngineMigration) error { diff --git a/models/migrations/v1_14/v171.go b/models/migrations/v1_14/v171.go index 82d20c4369..4e6577592a 100644 --- a/models/migrations/v1_14/v171.go +++ b/models/migrations/v1_14/v171.go @@ -6,7 +6,7 @@ package v1_14 import ( "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) func AddSortingColToProjectBoard(x db.EngineMigration) error { diff --git a/models/migrations/v1_14/v172.go b/models/migrations/v1_14/v172.go index 3d2ea83647..d912ba3b78 100644 --- a/models/migrations/v1_14/v172.go +++ b/models/migrations/v1_14/v172.go @@ -4,8 +4,8 @@ package v1_14 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func AddSessionTable(x db.EngineMigration) error { diff --git a/models/migrations/v1_14/v173.go b/models/migrations/v1_14/v173.go index 2d11a16ad3..51278211b5 100644 --- a/models/migrations/v1_14/v173.go +++ b/models/migrations/v1_14/v173.go @@ -6,7 +6,7 @@ package v1_14 import ( "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) func AddTimeIDCommentColumn(x db.EngineMigration) error { diff --git a/models/migrations/v1_14/v174.go b/models/migrations/v1_14/v174.go index 2eca58b1ce..4e88e892c9 100644 --- a/models/migrations/v1_14/v174.go +++ b/models/migrations/v1_14/v174.go @@ -6,7 +6,7 @@ package v1_14 import ( "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) func AddRepoTransfer(x db.EngineMigration) error { diff --git a/models/migrations/v1_14/v175.go b/models/migrations/v1_14/v175.go index 8114c4bd5a..556996e972 100644 --- a/models/migrations/v1_14/v175.go +++ b/models/migrations/v1_14/v175.go @@ -7,9 +7,9 @@ import ( "fmt" "regexp" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" ) func FixPostgresIDSequences(x db.EngineMigration) error { diff --git a/models/migrations/v1_14/v176.go b/models/migrations/v1_14/v176.go index faad5f32f2..a464ed56ec 100644 --- a/models/migrations/v1_14/v176.go +++ b/models/migrations/v1_14/v176.go @@ -3,7 +3,7 @@ package v1_14 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" // RemoveInvalidLabels looks through the database to look for comments and issue_labels // that refer to labels do not belong to the repository or organization that repository diff --git a/models/migrations/v1_14/v176_test.go b/models/migrations/v1_14/v176_test.go index aa57b5ad1d..7a830d8d51 100644 --- a/models/migrations/v1_14/v176_test.go +++ b/models/migrations/v1_14/v176_test.go @@ -6,7 +6,7 @@ package v1_14 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_14/v177.go b/models/migrations/v1_14/v177.go index 625f2f387d..7230693909 100644 --- a/models/migrations/v1_14/v177.go +++ b/models/migrations/v1_14/v177.go @@ -6,7 +6,7 @@ package v1_14 import ( "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) // DeleteOrphanedIssueLabels looks through the database for issue_labels where the label no longer exists and deletes them. diff --git a/models/migrations/v1_14/v177_test.go b/models/migrations/v1_14/v177_test.go index a86fb98830..4b80dc7d6a 100644 --- a/models/migrations/v1_14/v177_test.go +++ b/models/migrations/v1_14/v177_test.go @@ -6,8 +6,8 @@ package v1_14 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/migrations/migrationtest" + "gitea.dev/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_15/main_test.go b/models/migrations/v1_15/main_test.go index 768bbd310b..87b10d3b76 100644 --- a/models/migrations/v1_15/main_test.go +++ b/models/migrations/v1_15/main_test.go @@ -6,7 +6,7 @@ package v1_15 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_15/v178.go b/models/migrations/v1_15/v178.go index 2a2a77c696..35bbf74f41 100644 --- a/models/migrations/v1_15/v178.go +++ b/models/migrations/v1_15/v178.go @@ -3,7 +3,7 @@ package v1_15 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddLFSMirrorColumns(x db.EngineMigration) error { type Mirror struct { diff --git a/models/migrations/v1_15/v179.go b/models/migrations/v1_15/v179.go index 1210f54ac9..4380bc560a 100644 --- a/models/migrations/v1_15/v179.go +++ b/models/migrations/v1_15/v179.go @@ -4,8 +4,8 @@ package v1_15 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/base" + "gitea.dev/models/db" + "gitea.dev/models/migrations/base" "xorm.io/xorm/schemas" ) diff --git a/models/migrations/v1_15/v180.go b/models/migrations/v1_15/v180.go index 7e6388a99c..b5247b1a33 100644 --- a/models/migrations/v1_15/v180.go +++ b/models/migrations/v1_15/v180.go @@ -4,9 +4,9 @@ package v1_15 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/json" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/migrations/v1_15/v181.go b/models/migrations/v1_15/v181.go index f4032ed19e..841a8a85e5 100644 --- a/models/migrations/v1_15/v181.go +++ b/models/migrations/v1_15/v181.go @@ -6,7 +6,7 @@ package v1_15 import ( "strings" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) func AddPrimaryEmail2EmailAddress(x db.EngineMigration) error { diff --git a/models/migrations/v1_15/v181_test.go b/models/migrations/v1_15/v181_test.go index e230c684ea..4e004abcb0 100644 --- a/models/migrations/v1_15/v181_test.go +++ b/models/migrations/v1_15/v181_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_15/v182.go b/models/migrations/v1_15/v182.go index 1b577ea359..2fc8f06225 100644 --- a/models/migrations/v1_15/v182.go +++ b/models/migrations/v1_15/v182.go @@ -3,7 +3,7 @@ package v1_15 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddIssueResourceIndexTable(x db.EngineMigration) error { type ResourceIndex struct { diff --git a/models/migrations/v1_15/v182_test.go b/models/migrations/v1_15/v182_test.go index c0a1378534..049f9a1785 100644 --- a/models/migrations/v1_15/v182_test.go +++ b/models/migrations/v1_15/v182_test.go @@ -6,7 +6,7 @@ package v1_15 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_15/v183.go b/models/migrations/v1_15/v183.go index 30835ea3b8..dee388a961 100644 --- a/models/migrations/v1_15/v183.go +++ b/models/migrations/v1_15/v183.go @@ -7,8 +7,8 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func CreatePushMirrorTable(x db.EngineMigration) error { diff --git a/models/migrations/v1_15/v184.go b/models/migrations/v1_15/v184.go index 9933b12a49..21ae339522 100644 --- a/models/migrations/v1_15/v184.go +++ b/models/migrations/v1_15/v184.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/models/migrations/base" + "gitea.dev/modules/setting" ) func RenameTaskErrorsToMessage(x db.EngineMigration) error { diff --git a/models/migrations/v1_15/v185.go b/models/migrations/v1_15/v185.go index e4750c6766..1a6d84afff 100644 --- a/models/migrations/v1_15/v185.go +++ b/models/migrations/v1_15/v185.go @@ -3,7 +3,7 @@ package v1_15 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddRepoArchiver(x db.EngineMigration) error { // RepoArchiver represents all archivers diff --git a/models/migrations/v1_15/v186.go b/models/migrations/v1_15/v186.go index da8ba69ca9..44e096fecb 100644 --- a/models/migrations/v1_15/v186.go +++ b/models/migrations/v1_15/v186.go @@ -4,8 +4,8 @@ package v1_15 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func CreateProtectedTagTable(x db.EngineMigration) error { diff --git a/models/migrations/v1_15/v187.go b/models/migrations/v1_15/v187.go index 2bb27edfac..e8c388554b 100644 --- a/models/migrations/v1_15/v187.go +++ b/models/migrations/v1_15/v187.go @@ -4,8 +4,8 @@ package v1_15 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/base" + "gitea.dev/models/db" + "gitea.dev/models/migrations/base" ) func DropWebhookColumns(x db.EngineMigration) error { diff --git a/models/migrations/v1_15/v188.go b/models/migrations/v1_15/v188.go index a29005abc7..d3f9de3361 100644 --- a/models/migrations/v1_15/v188.go +++ b/models/migrations/v1_15/v188.go @@ -3,7 +3,7 @@ package v1_15 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddKeyIsVerified(x db.EngineMigration) error { type GPGKey struct { diff --git a/models/migrations/v1_16/main_test.go b/models/migrations/v1_16/main_test.go index c54424788d..aac2609f0e 100644 --- a/models/migrations/v1_16/main_test.go +++ b/models/migrations/v1_16/main_test.go @@ -6,7 +6,7 @@ package v1_16 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_16/v189.go b/models/migrations/v1_16/v189.go index 1b39770f44..419135c881 100644 --- a/models/migrations/v1_16/v189.go +++ b/models/migrations/v1_16/v189.go @@ -7,9 +7,9 @@ import ( "encoding/binary" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/json" + "gitea.dev/models/db" + "gitea.dev/models/migrations/base" + "gitea.dev/modules/json" ) func UnwrapLDAPSourceCfg(x db.EngineMigration) error { diff --git a/models/migrations/v1_16/v189_test.go b/models/migrations/v1_16/v189_test.go index 44424dd369..382b497208 100644 --- a/models/migrations/v1_16/v189_test.go +++ b/models/migrations/v1_16/v189_test.go @@ -6,8 +6,8 @@ package v1_16 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" - "code.gitea.io/gitea/modules/json" + "gitea.dev/models/migrations/migrationtest" + "gitea.dev/modules/json" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_16/v190.go b/models/migrations/v1_16/v190.go index d6d5d885b5..8dcb09b657 100644 --- a/models/migrations/v1_16/v190.go +++ b/models/migrations/v1_16/v190.go @@ -6,7 +6,7 @@ package v1_16 import ( "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) func AddAgitFlowPullRequest(x db.EngineMigration) error { diff --git a/models/migrations/v1_16/v191.go b/models/migrations/v1_16/v191.go index 03f287c827..fc0ab2e08c 100644 --- a/models/migrations/v1_16/v191.go +++ b/models/migrations/v1_16/v191.go @@ -4,8 +4,8 @@ package v1_16 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/modules/setting" ) func AlterIssueAndCommentTextFieldsToLongText(x db.EngineMigration) error { diff --git a/models/migrations/v1_16/v192.go b/models/migrations/v1_16/v192.go index ce0a69a8ce..1daf229b27 100644 --- a/models/migrations/v1_16/v192.go +++ b/models/migrations/v1_16/v192.go @@ -4,8 +4,8 @@ package v1_16 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/base" + "gitea.dev/models/db" + "gitea.dev/models/migrations/base" ) func RecreateIssueResourceIndexTable(x db.EngineMigration) error { diff --git a/models/migrations/v1_16/v193.go b/models/migrations/v1_16/v193.go index 615f214018..b015f61e3a 100644 --- a/models/migrations/v1_16/v193.go +++ b/models/migrations/v1_16/v193.go @@ -3,7 +3,7 @@ package v1_16 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddRepoIDForAttachment(x db.EngineMigration) error { type Attachment struct { diff --git a/models/migrations/v1_16/v193_test.go b/models/migrations/v1_16/v193_test.go index f68dd6d92d..a8359acb8e 100644 --- a/models/migrations/v1_16/v193_test.go +++ b/models/migrations/v1_16/v193_test.go @@ -6,7 +6,7 @@ package v1_16 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_16/v194.go b/models/migrations/v1_16/v194.go index 00b4fccc21..baf19df95f 100644 --- a/models/migrations/v1_16/v194.go +++ b/models/migrations/v1_16/v194.go @@ -6,7 +6,7 @@ package v1_16 import ( "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) func AddBranchProtectionUnprotectedFilesColumn(x db.EngineMigration) error { diff --git a/models/migrations/v1_16/v195.go b/models/migrations/v1_16/v195.go index 6b1bc0b4fd..515e30eb8a 100644 --- a/models/migrations/v1_16/v195.go +++ b/models/migrations/v1_16/v195.go @@ -6,7 +6,7 @@ package v1_16 import ( "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) func AddTableCommitStatusIndex(x db.EngineMigration) error { diff --git a/models/migrations/v1_16/v195_test.go b/models/migrations/v1_16/v195_test.go index bbfa5e162a..4b4ffb5cb3 100644 --- a/models/migrations/v1_16/v195_test.go +++ b/models/migrations/v1_16/v195_test.go @@ -6,7 +6,7 @@ package v1_16 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_16/v196.go b/models/migrations/v1_16/v196.go index 64b80aa789..8eb13cd024 100644 --- a/models/migrations/v1_16/v196.go +++ b/models/migrations/v1_16/v196.go @@ -6,7 +6,7 @@ package v1_16 import ( "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) func AddColorColToProjectBoard(x db.EngineMigration) error { diff --git a/models/migrations/v1_16/v197.go b/models/migrations/v1_16/v197.go index 81abe84a27..5f89635a0a 100644 --- a/models/migrations/v1_16/v197.go +++ b/models/migrations/v1_16/v197.go @@ -3,7 +3,7 @@ package v1_16 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddRenamedBranchTable(x db.EngineMigration) error { type RenamedBranch struct { diff --git a/models/migrations/v1_16/v198.go b/models/migrations/v1_16/v198.go index c0bc0691a0..0cabb23988 100644 --- a/models/migrations/v1_16/v198.go +++ b/models/migrations/v1_16/v198.go @@ -6,8 +6,8 @@ package v1_16 import ( "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func AddTableIssueContentHistory(x db.EngineMigration) error { diff --git a/models/migrations/v1_16/v200.go b/models/migrations/v1_16/v200.go index 5e83711dad..b6f65fc5c0 100644 --- a/models/migrations/v1_16/v200.go +++ b/models/migrations/v1_16/v200.go @@ -6,7 +6,7 @@ package v1_16 import ( "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) func AddTableAppState(x db.EngineMigration) error { diff --git a/models/migrations/v1_16/v201.go b/models/migrations/v1_16/v201.go index c4708c4dde..f5e1422413 100644 --- a/models/migrations/v1_16/v201.go +++ b/models/migrations/v1_16/v201.go @@ -3,7 +3,7 @@ package v1_16 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func DropTableRemoteVersion(x db.EngineMigration) error { // drop the orphaned table introduced in `v199`, now the update checker also uses AppState, do not need this table diff --git a/models/migrations/v1_16/v202.go b/models/migrations/v1_16/v202.go index 2152e58f97..0f1647054b 100644 --- a/models/migrations/v1_16/v202.go +++ b/models/migrations/v1_16/v202.go @@ -6,7 +6,7 @@ package v1_16 import ( "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) func CreateUserSettingsTable(x db.EngineMigration) error { diff --git a/models/migrations/v1_16/v203.go b/models/migrations/v1_16/v203.go index 19d7397eb6..b91c4da656 100644 --- a/models/migrations/v1_16/v203.go +++ b/models/migrations/v1_16/v203.go @@ -3,7 +3,7 @@ package v1_16 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddProjectIssueSorting(x db.EngineMigration) error { // ProjectIssue saves relation from issue to a project diff --git a/models/migrations/v1_16/v204.go b/models/migrations/v1_16/v204.go index c0bfe9e7fb..3a882fd56f 100644 --- a/models/migrations/v1_16/v204.go +++ b/models/migrations/v1_16/v204.go @@ -3,7 +3,7 @@ package v1_16 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddSSHKeyIsVerified(x db.EngineMigration) error { type PublicKey struct { diff --git a/models/migrations/v1_16/v205.go b/models/migrations/v1_16/v205.go index 3e1b393b70..18dda1875f 100644 --- a/models/migrations/v1_16/v205.go +++ b/models/migrations/v1_16/v205.go @@ -4,8 +4,8 @@ package v1_16 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/base" + "gitea.dev/models/db" + "gitea.dev/models/migrations/base" "xorm.io/xorm/schemas" ) diff --git a/models/migrations/v1_16/v206.go b/models/migrations/v1_16/v206.go index b883b137be..b612fa106d 100644 --- a/models/migrations/v1_16/v206.go +++ b/models/migrations/v1_16/v206.go @@ -6,7 +6,7 @@ package v1_16 import ( "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) func AddAuthorizeColForTeamUnit(x db.EngineMigration) error { diff --git a/models/migrations/v1_16/v207.go b/models/migrations/v1_16/v207.go index 9608e1103e..da89c7b8bb 100644 --- a/models/migrations/v1_16/v207.go +++ b/models/migrations/v1_16/v207.go @@ -3,7 +3,7 @@ package v1_16 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddWebAuthnCred(x db.EngineMigration) error { // NO-OP Don't migrate here - let v210 do this. diff --git a/models/migrations/v1_16/v208.go b/models/migrations/v1_16/v208.go index 534de313fc..1f4752b34a 100644 --- a/models/migrations/v1_16/v208.go +++ b/models/migrations/v1_16/v208.go @@ -3,7 +3,7 @@ package v1_16 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func UseBase32HexForCredIDInWebAuthnCredential(x db.EngineMigration) error { // noop diff --git a/models/migrations/v1_16/v209.go b/models/migrations/v1_16/v209.go index c96415142f..bfa0a63d35 100644 --- a/models/migrations/v1_16/v209.go +++ b/models/migrations/v1_16/v209.go @@ -3,7 +3,7 @@ package v1_16 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func IncreaseCredentialIDTo410(x db.EngineMigration) error { // no-op diff --git a/models/migrations/v1_16/v210.go b/models/migrations/v1_16/v210.go index bbc3cc8e52..4eb6a4dacc 100644 --- a/models/migrations/v1_16/v210.go +++ b/models/migrations/v1_16/v210.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/models/migrations/base" + "gitea.dev/modules/timeutil" "github.com/tstranex/u2f" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_16/v210_test.go b/models/migrations/v1_16/v210_test.go index 7bff2572e1..ed90e62f5a 100644 --- a/models/migrations/v1_16/v210_test.go +++ b/models/migrations/v1_16/v210_test.go @@ -6,8 +6,8 @@ package v1_16 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/migrations/migrationtest" + "gitea.dev/modules/timeutil" "github.com/stretchr/testify/assert" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_17/main_test.go b/models/migrations/v1_17/main_test.go index 8652201871..4e5e83d8a8 100644 --- a/models/migrations/v1_17/main_test.go +++ b/models/migrations/v1_17/main_test.go @@ -6,7 +6,7 @@ package v1_17 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_17/v211.go b/models/migrations/v1_17/v211.go index 0070ae22c3..144e52c1d0 100644 --- a/models/migrations/v1_17/v211.go +++ b/models/migrations/v1_17/v211.go @@ -3,7 +3,7 @@ package v1_17 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func CreateForeignReferenceTable(_ db.EngineMigration) error { return nil // This table was dropped in v1_19/v237.go diff --git a/models/migrations/v1_17/v212.go b/models/migrations/v1_17/v212.go index 24de310546..8fd4036106 100644 --- a/models/migrations/v1_17/v212.go +++ b/models/migrations/v1_17/v212.go @@ -4,8 +4,8 @@ package v1_17 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func AddPackageTables(x db.EngineMigration) error { diff --git a/models/migrations/v1_17/v213.go b/models/migrations/v1_17/v213.go index c988999e6b..eddb7f538d 100644 --- a/models/migrations/v1_17/v213.go +++ b/models/migrations/v1_17/v213.go @@ -3,7 +3,7 @@ package v1_17 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddAllowMaintainerEdit(x db.EngineMigration) error { // PullRequest represents relation between pull request and repositories. diff --git a/models/migrations/v1_17/v214.go b/models/migrations/v1_17/v214.go index 9576e1a693..68194fca9b 100644 --- a/models/migrations/v1_17/v214.go +++ b/models/migrations/v1_17/v214.go @@ -3,7 +3,7 @@ package v1_17 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddAutoMergeTable(x db.EngineMigration) error { type MergeStyle string diff --git a/models/migrations/v1_17/v215.go b/models/migrations/v1_17/v215.go index 39310d2355..857d37f7d1 100644 --- a/models/migrations/v1_17/v215.go +++ b/models/migrations/v1_17/v215.go @@ -4,9 +4,9 @@ package v1_17 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/pull" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/models/pull" + "gitea.dev/modules/timeutil" ) func AddReviewViewedFiles(x db.EngineMigration) error { diff --git a/models/migrations/v1_17/v217.go b/models/migrations/v1_17/v217.go index 2a3cb3af78..fd9ec96d25 100644 --- a/models/migrations/v1_17/v217.go +++ b/models/migrations/v1_17/v217.go @@ -4,8 +4,8 @@ package v1_17 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/modules/setting" ) func AlterHookTaskTextFieldsToLongText(x db.EngineMigration) error { diff --git a/models/migrations/v1_17/v218.go b/models/migrations/v1_17/v218.go index fbaf1e4f7a..17c1091517 100644 --- a/models/migrations/v1_17/v218.go +++ b/models/migrations/v1_17/v218.go @@ -4,9 +4,9 @@ package v1_17 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/setting" + "gitea.dev/modules/timeutil" "xorm.io/xorm/schemas" ) diff --git a/models/migrations/v1_17/v219.go b/models/migrations/v1_17/v219.go index a87a1190a8..0605fd14fa 100644 --- a/models/migrations/v1_17/v219.go +++ b/models/migrations/v1_17/v219.go @@ -6,9 +6,9 @@ package v1_17 import ( "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/models/repo" + "gitea.dev/modules/timeutil" ) func AddSyncOnCommitColForPushMirror(x db.EngineMigration) error { diff --git a/models/migrations/v1_17/v220.go b/models/migrations/v1_17/v220.go index 39e6e1a150..2157bf24d3 100644 --- a/models/migrations/v1_17/v220.go +++ b/models/migrations/v1_17/v220.go @@ -4,9 +4,9 @@ package v1_17 import ( - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - container_module "code.gitea.io/gitea/modules/packages/container" + "gitea.dev/models/db" + packages_model "gitea.dev/models/packages" + container_module "gitea.dev/modules/packages/container" "xorm.io/xorm/schemas" ) diff --git a/models/migrations/v1_17/v221.go b/models/migrations/v1_17/v221.go index 31c41e17d3..a5d2dc9166 100644 --- a/models/migrations/v1_17/v221.go +++ b/models/migrations/v1_17/v221.go @@ -7,8 +7,8 @@ import ( "encoding/base32" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func StoreWebauthnCredentialIDAsBytes(x db.EngineMigration) error { diff --git a/models/migrations/v1_17/v221_test.go b/models/migrations/v1_17/v221_test.go index 6fda9b9980..2c217cf02e 100644 --- a/models/migrations/v1_17/v221_test.go +++ b/models/migrations/v1_17/v221_test.go @@ -7,7 +7,7 @@ import ( "encoding/base32" "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_17/v222.go b/models/migrations/v1_17/v222.go index 4c33dcdffb..97b36af5ca 100644 --- a/models/migrations/v1_17/v222.go +++ b/models/migrations/v1_17/v222.go @@ -8,9 +8,9 @@ import ( "errors" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/models/migrations/base" + "gitea.dev/modules/timeutil" ) func DropOldCredentialIDColumn(x db.EngineMigration) error { diff --git a/models/migrations/v1_17/v223.go b/models/migrations/v1_17/v223.go index b0eac197bf..a97a49566d 100644 --- a/models/migrations/v1_17/v223.go +++ b/models/migrations/v1_17/v223.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/models/migrations/base" + "gitea.dev/modules/setting" + "gitea.dev/modules/timeutil" ) func RenameCredentialIDBytes(x db.EngineMigration) error { diff --git a/models/migrations/v1_18/main_test.go b/models/migrations/v1_18/main_test.go index b8641526f3..720784d680 100644 --- a/models/migrations/v1_18/main_test.go +++ b/models/migrations/v1_18/main_test.go @@ -6,7 +6,7 @@ package v1_18 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_18/v224.go b/models/migrations/v1_18/v224.go index 4a43528b1a..7e796e40a7 100644 --- a/models/migrations/v1_18/v224.go +++ b/models/migrations/v1_18/v224.go @@ -3,7 +3,7 @@ package v1_18 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func CreateUserBadgesTable(x db.EngineMigration) error { type Badge struct { diff --git a/models/migrations/v1_18/v225.go b/models/migrations/v1_18/v225.go index fc6ceb91f3..3a0268e97d 100644 --- a/models/migrations/v1_18/v225.go +++ b/models/migrations/v1_18/v225.go @@ -4,8 +4,8 @@ package v1_18 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/modules/setting" ) func AlterPublicGPGKeyContentFieldsToMediumText(x db.EngineMigration) error { diff --git a/models/migrations/v1_18/v226.go b/models/migrations/v1_18/v226.go index 69c2bf0751..cd9e826bd0 100644 --- a/models/migrations/v1_18/v226.go +++ b/models/migrations/v1_18/v226.go @@ -4,7 +4,7 @@ package v1_18 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/builder" ) diff --git a/models/migrations/v1_18/v227.go b/models/migrations/v1_18/v227.go index c47727cb5e..058f633117 100644 --- a/models/migrations/v1_18/v227.go +++ b/models/migrations/v1_18/v227.go @@ -4,8 +4,8 @@ package v1_18 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) type SystemSetting struct { diff --git a/models/migrations/v1_18/v228.go b/models/migrations/v1_18/v228.go index e5c1041480..558411ef47 100644 --- a/models/migrations/v1_18/v228.go +++ b/models/migrations/v1_18/v228.go @@ -4,8 +4,8 @@ package v1_18 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func AddTeamInviteTable(x db.EngineMigration) error { diff --git a/models/migrations/v1_18/v229.go b/models/migrations/v1_18/v229.go index fe8798aa6d..be9bda66ec 100644 --- a/models/migrations/v1_18/v229.go +++ b/models/migrations/v1_18/v229.go @@ -6,8 +6,8 @@ package v1_18 import ( "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/issues" + "gitea.dev/models/db" + "gitea.dev/models/issues" "xorm.io/builder" ) diff --git a/models/migrations/v1_18/v229_test.go b/models/migrations/v1_18/v229_test.go index 638983ad0b..f1f3482bba 100644 --- a/models/migrations/v1_18/v229_test.go +++ b/models/migrations/v1_18/v229_test.go @@ -6,8 +6,8 @@ package v1_18 import ( "testing" - "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/issues" + "gitea.dev/models/migrations/migrationtest" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_18/v230.go b/models/migrations/v1_18/v230.go index 2a890e7a75..670b3227df 100644 --- a/models/migrations/v1_18/v230.go +++ b/models/migrations/v1_18/v230.go @@ -3,7 +3,7 @@ package v1_18 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" // AddConfidentialColumnToOAuth2ApplicationTable: add ConfidentialClient column, setting existing rows to true func AddConfidentialClientColumnToOAuth2ApplicationTable(x db.EngineMigration) error { diff --git a/models/migrations/v1_18/v230_test.go b/models/migrations/v1_18/v230_test.go index e5e28ea63f..e711a6cd59 100644 --- a/models/migrations/v1_18/v230_test.go +++ b/models/migrations/v1_18/v230_test.go @@ -6,7 +6,7 @@ package v1_18 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_19/main_test.go b/models/migrations/v1_19/main_test.go index 784ca0e46e..383ffb9388 100644 --- a/models/migrations/v1_19/main_test.go +++ b/models/migrations/v1_19/main_test.go @@ -6,7 +6,7 @@ package v1_19 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_19/v231.go b/models/migrations/v1_19/v231.go index 980a23d82c..d8fa52a1a7 100644 --- a/models/migrations/v1_19/v231.go +++ b/models/migrations/v1_19/v231.go @@ -3,7 +3,7 @@ package v1_19 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddIndexForHookTask(x db.EngineMigration) error { type HookTask struct { diff --git a/models/migrations/v1_19/v232.go b/models/migrations/v1_19/v232.go index d39b1527d9..4e4a8ae6f0 100644 --- a/models/migrations/v1_19/v232.go +++ b/models/migrations/v1_19/v232.go @@ -4,8 +4,8 @@ package v1_19 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/modules/setting" ) func AlterPackageVersionMetadataToLongText(x db.EngineMigration) error { diff --git a/models/migrations/v1_19/v233.go b/models/migrations/v1_19/v233.go index 576dfbe04d..6098e7882e 100644 --- a/models/migrations/v1_19/v233.go +++ b/models/migrations/v1_19/v233.go @@ -6,10 +6,10 @@ package v1_19 import ( "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/modules/json" + "gitea.dev/modules/secret" + "gitea.dev/modules/setting" "xorm.io/builder" ) diff --git a/models/migrations/v1_19/v233_test.go b/models/migrations/v1_19/v233_test.go index 3f7900c58f..add1944305 100644 --- a/models/migrations/v1_19/v233_test.go +++ b/models/migrations/v1_19/v233_test.go @@ -6,11 +6,11 @@ package v1_19 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" - webhook_module "code.gitea.io/gitea/modules/webhook" + "gitea.dev/models/migrations/migrationtest" + "gitea.dev/modules/json" + "gitea.dev/modules/secret" + "gitea.dev/modules/setting" + webhook_module "gitea.dev/modules/webhook" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_19/v234.go b/models/migrations/v1_19/v234.go index 45b1acd537..325d2c70fe 100644 --- a/models/migrations/v1_19/v234.go +++ b/models/migrations/v1_19/v234.go @@ -4,8 +4,8 @@ package v1_19 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func CreatePackageCleanupRuleTable(x db.EngineMigration) error { diff --git a/models/migrations/v1_19/v235.go b/models/migrations/v1_19/v235.go index e867c79453..5a49b3f31f 100644 --- a/models/migrations/v1_19/v235.go +++ b/models/migrations/v1_19/v235.go @@ -3,7 +3,7 @@ package v1_19 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddIndexForAccessToken(x db.EngineMigration) error { type AccessToken struct { diff --git a/models/migrations/v1_19/v236.go b/models/migrations/v1_19/v236.go index 5e0a8a7b41..9547a94923 100644 --- a/models/migrations/v1_19/v236.go +++ b/models/migrations/v1_19/v236.go @@ -4,8 +4,8 @@ package v1_19 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func CreateSecretsTable(x db.EngineMigration) error { diff --git a/models/migrations/v1_19/v237.go b/models/migrations/v1_19/v237.go index c763206044..f5ec09ff90 100644 --- a/models/migrations/v1_19/v237.go +++ b/models/migrations/v1_19/v237.go @@ -3,7 +3,7 @@ package v1_19 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func DropForeignReferenceTable(x db.EngineMigration) error { // Drop the table introduced in `v211`, it's considered badly designed and doesn't look like to be used. diff --git a/models/migrations/v1_19/v238.go b/models/migrations/v1_19/v238.go index 2566492fcd..5b2173e6a5 100644 --- a/models/migrations/v1_19/v238.go +++ b/models/migrations/v1_19/v238.go @@ -4,8 +4,8 @@ package v1_19 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) // AddUpdatedUnixToLFSMetaObject adds an updated column to the LFSMetaObject to allow for garbage collection diff --git a/models/migrations/v1_19/v239.go b/models/migrations/v1_19/v239.go index 3d3f0ac072..826150a723 100644 --- a/models/migrations/v1_19/v239.go +++ b/models/migrations/v1_19/v239.go @@ -3,7 +3,7 @@ package v1_19 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddScopeForAccessTokens(x db.EngineMigration) error { type AccessToken struct { diff --git a/models/migrations/v1_19/v240.go b/models/migrations/v1_19/v240.go index 01a17b3476..b23553cc4e 100644 --- a/models/migrations/v1_19/v240.go +++ b/models/migrations/v1_19/v240.go @@ -4,8 +4,8 @@ package v1_19 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func AddActionsTables(x db.EngineMigration) error { diff --git a/models/migrations/v1_19/v241.go b/models/migrations/v1_19/v241.go index 582993e81e..3237dc11de 100644 --- a/models/migrations/v1_19/v241.go +++ b/models/migrations/v1_19/v241.go @@ -3,7 +3,7 @@ package v1_19 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" // AddCardTypeToProjectTable: add CardType column, setting existing rows to CardTypeTextOnly func AddCardTypeToProjectTable(x db.EngineMigration) error { diff --git a/models/migrations/v1_19/v242.go b/models/migrations/v1_19/v242.go index 9922eadce8..4015d0e174 100644 --- a/models/migrations/v1_19/v242.go +++ b/models/migrations/v1_19/v242.go @@ -4,8 +4,8 @@ package v1_19 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/modules/setting" ) // AlterPublicGPGKeyImportContentFieldToMediumText: set GPGKeyImport Content field to MEDIUMTEXT diff --git a/models/migrations/v1_19/v243.go b/models/migrations/v1_19/v243.go index 99f7e97608..547b591596 100644 --- a/models/migrations/v1_19/v243.go +++ b/models/migrations/v1_19/v243.go @@ -3,7 +3,7 @@ package v1_19 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddExclusiveLabel(x db.EngineMigration) error { type Label struct { diff --git a/models/migrations/v1_20/main_test.go b/models/migrations/v1_20/main_test.go index 3ceb9a3c66..17437be0f9 100644 --- a/models/migrations/v1_20/main_test.go +++ b/models/migrations/v1_20/main_test.go @@ -6,7 +6,7 @@ package v1_20 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_20/v244.go b/models/migrations/v1_20/v244.go index e90c411938..722677f019 100644 --- a/models/migrations/v1_20/v244.go +++ b/models/migrations/v1_20/v244.go @@ -3,7 +3,7 @@ package v1_20 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddNeedApprovalToActionRun(x db.EngineMigration) error { /* diff --git a/models/migrations/v1_20/v245.go b/models/migrations/v1_20/v245.go index 213038316a..52c6fa0486 100644 --- a/models/migrations/v1_20/v245.go +++ b/models/migrations/v1_20/v245.go @@ -6,9 +6,9 @@ package v1_20 import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/models/migrations/base" + "gitea.dev/modules/setting" ) func RenameWebhookOrgToOwner(x db.EngineMigration) error { diff --git a/models/migrations/v1_20/v246.go b/models/migrations/v1_20/v246.go index a8f88ac04c..8232d21f93 100644 --- a/models/migrations/v1_20/v246.go +++ b/models/migrations/v1_20/v246.go @@ -3,7 +3,7 @@ package v1_20 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddNewColumnForProject(x db.EngineMigration) error { type Project struct { diff --git a/models/migrations/v1_20/v247.go b/models/migrations/v1_20/v247.go index f8402b405c..46daa73203 100644 --- a/models/migrations/v1_20/v247.go +++ b/models/migrations/v1_20/v247.go @@ -4,8 +4,8 @@ package v1_20 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" + "gitea.dev/models/db" + "gitea.dev/modules/log" ) // FixIncorrectProjectType: set individual project's type from 3(TypeOrganization) to 1(TypeIndividual) diff --git a/models/migrations/v1_20/v248.go b/models/migrations/v1_20/v248.go index 5b76b5fb55..7dd7f46470 100644 --- a/models/migrations/v1_20/v248.go +++ b/models/migrations/v1_20/v248.go @@ -3,7 +3,7 @@ package v1_20 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddVersionToActionRunner(x db.EngineMigration) error { type ActionRunner struct { diff --git a/models/migrations/v1_20/v249.go b/models/migrations/v1_20/v249.go index 53bd2c40c9..7db38b73e9 100644 --- a/models/migrations/v1_20/v249.go +++ b/models/migrations/v1_20/v249.go @@ -4,8 +4,8 @@ package v1_20 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" "xorm.io/xorm/schemas" ) diff --git a/models/migrations/v1_20/v250.go b/models/migrations/v1_20/v250.go index b011c5b051..07662c86b2 100644 --- a/models/migrations/v1_20/v250.go +++ b/models/migrations/v1_20/v250.go @@ -6,8 +6,8 @@ package v1_20 import ( "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/json" + "gitea.dev/models/db" + "gitea.dev/modules/json" ) func ChangeContainerMetadataMultiArch(x db.EngineMigration) error { diff --git a/models/migrations/v1_20/v251.go b/models/migrations/v1_20/v251.go index 98676a572f..609417d105 100644 --- a/models/migrations/v1_20/v251.go +++ b/models/migrations/v1_20/v251.go @@ -4,8 +4,8 @@ package v1_20 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" + "gitea.dev/models/db" + "gitea.dev/modules/log" ) func FixIncorrectOwnerTeamUnitAccessMode(x db.EngineMigration) error { diff --git a/models/migrations/v1_20/v252.go b/models/migrations/v1_20/v252.go index 2c86663b91..2ee06ea2d2 100644 --- a/models/migrations/v1_20/v252.go +++ b/models/migrations/v1_20/v252.go @@ -4,8 +4,8 @@ package v1_20 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" + "gitea.dev/models/db" + "gitea.dev/modules/log" ) func FixIncorrectAdminTeamUnitAccessMode(x db.EngineMigration) error { diff --git a/models/migrations/v1_20/v253.go b/models/migrations/v1_20/v253.go index 74d8c69333..99480ce67a 100644 --- a/models/migrations/v1_20/v253.go +++ b/models/migrations/v1_20/v253.go @@ -4,8 +4,8 @@ package v1_20 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" + "gitea.dev/models/db" + "gitea.dev/modules/log" ) func FixExternalTrackerAndExternalWikiAccessModeInOwnerAndAdminTeam(x db.EngineMigration) error { diff --git a/models/migrations/v1_20/v254.go b/models/migrations/v1_20/v254.go index 912ad36b4a..50fcf267af 100644 --- a/models/migrations/v1_20/v254.go +++ b/models/migrations/v1_20/v254.go @@ -3,7 +3,7 @@ package v1_20 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddActionTaskOutputTable(x db.EngineMigration) error { type ActionTaskOutput struct { diff --git a/models/migrations/v1_20/v255.go b/models/migrations/v1_20/v255.go index 3ec64d43c4..7e3305ac05 100644 --- a/models/migrations/v1_20/v255.go +++ b/models/migrations/v1_20/v255.go @@ -4,8 +4,8 @@ package v1_20 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func AddArchivedUnixToRepository(x db.EngineMigration) error { diff --git a/models/migrations/v1_20/v256.go b/models/migrations/v1_20/v256.go index 126b1e6f19..28130f8905 100644 --- a/models/migrations/v1_20/v256.go +++ b/models/migrations/v1_20/v256.go @@ -3,7 +3,7 @@ package v1_20 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddIsInternalColumnToPackage(x db.EngineMigration) error { type Package struct { diff --git a/models/migrations/v1_20/v257.go b/models/migrations/v1_20/v257.go index 6e47d1387a..96169c94d2 100644 --- a/models/migrations/v1_20/v257.go +++ b/models/migrations/v1_20/v257.go @@ -4,8 +4,8 @@ package v1_20 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func CreateActionArtifactTable(x db.EngineMigration) error { diff --git a/models/migrations/v1_20/v258.go b/models/migrations/v1_20/v258.go index 4d0ec565cf..a8773d0638 100644 --- a/models/migrations/v1_20/v258.go +++ b/models/migrations/v1_20/v258.go @@ -3,7 +3,7 @@ package v1_20 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddPinOrderToIssue(x db.EngineMigration) error { type Issue struct { diff --git a/models/migrations/v1_20/v259.go b/models/migrations/v1_20/v259.go index e356e97582..d6200a6950 100644 --- a/models/migrations/v1_20/v259.go +++ b/models/migrations/v1_20/v259.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" + "gitea.dev/models/db" + "gitea.dev/modules/log" ) // unknownAccessTokenScope represents the scope for an access token that isn't diff --git a/models/migrations/v1_20/v259_test.go b/models/migrations/v1_20/v259_test.go index 3864eecb78..7c596579e5 100644 --- a/models/migrations/v1_20/v259_test.go +++ b/models/migrations/v1_20/v259_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_21/main_test.go b/models/migrations/v1_21/main_test.go index daf98d40f4..058e7af59f 100644 --- a/models/migrations/v1_21/main_test.go +++ b/models/migrations/v1_21/main_test.go @@ -6,7 +6,7 @@ package v1_21 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_21/v260.go b/models/migrations/v1_21/v260.go index a146ee68f9..320c38fde0 100644 --- a/models/migrations/v1_21/v260.go +++ b/models/migrations/v1_21/v260.go @@ -4,8 +4,8 @@ package v1_21 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/base" + "gitea.dev/models/db" + "gitea.dev/models/migrations/base" ) func DropCustomLabelsColumnOfActionRunner(x db.EngineMigration) error { diff --git a/models/migrations/v1_21/v261.go b/models/migrations/v1_21/v261.go index 54026cf2f6..5f98e8b427 100644 --- a/models/migrations/v1_21/v261.go +++ b/models/migrations/v1_21/v261.go @@ -4,8 +4,8 @@ package v1_21 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func CreateVariableTable(x db.EngineMigration) error { diff --git a/models/migrations/v1_21/v262.go b/models/migrations/v1_21/v262.go index aea7dadce7..ab05784208 100644 --- a/models/migrations/v1_21/v262.go +++ b/models/migrations/v1_21/v262.go @@ -3,7 +3,7 @@ package v1_21 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddTriggerEventToActionRun(x db.EngineMigration) error { type ActionRun struct { diff --git a/models/migrations/v1_21/v263.go b/models/migrations/v1_21/v263.go index 5b57c3cfb2..18af1caed4 100644 --- a/models/migrations/v1_21/v263.go +++ b/models/migrations/v1_21/v263.go @@ -6,7 +6,7 @@ package v1_21 import ( "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) // AddGitSizeAndLFSSizeToRepositoryTable: add GitSize and LFSSize columns to Repository diff --git a/models/migrations/v1_21/v264.go b/models/migrations/v1_21/v264.go index 4c64c3f686..0353f474d4 100644 --- a/models/migrations/v1_21/v264.go +++ b/models/migrations/v1_21/v264.go @@ -7,8 +7,8 @@ import ( "context" "errors" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func AddBranchTable(x db.EngineMigration) error { diff --git a/models/migrations/v1_21/v265.go b/models/migrations/v1_21/v265.go index 8c58989c47..cd991b535d 100644 --- a/models/migrations/v1_21/v265.go +++ b/models/migrations/v1_21/v265.go @@ -3,7 +3,7 @@ package v1_21 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AlterActionArtifactTable(x db.EngineMigration) error { // ActionArtifact is a file that is stored in the artifact storage. diff --git a/models/migrations/v1_21/v266.go b/models/migrations/v1_21/v266.go index c9d8a2d099..d7ab34e57e 100644 --- a/models/migrations/v1_21/v266.go +++ b/models/migrations/v1_21/v266.go @@ -3,7 +3,7 @@ package v1_21 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func ReduceCommitStatus(x db.EngineMigration) error { sess := x.NewSession() diff --git a/models/migrations/v1_21/v267.go b/models/migrations/v1_21/v267.go index 62eff40c1d..b6a93cf181 100644 --- a/models/migrations/v1_21/v267.go +++ b/models/migrations/v1_21/v267.go @@ -4,8 +4,8 @@ package v1_21 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func CreateActionTasksVersionTable(x db.EngineMigration) error { diff --git a/models/migrations/v1_21/v268.go b/models/migrations/v1_21/v268.go index c3809c125f..e9f697645f 100644 --- a/models/migrations/v1_21/v268.go +++ b/models/migrations/v1_21/v268.go @@ -3,7 +3,7 @@ package v1_21 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" // UpdateActionsRefIndex updates the index of actions ref field func UpdateActionsRefIndex(x db.EngineMigration) error { diff --git a/models/migrations/v1_21/v269.go b/models/migrations/v1_21/v269.go index 6d4fd2f775..8ea5b3fd41 100644 --- a/models/migrations/v1_21/v269.go +++ b/models/migrations/v1_21/v269.go @@ -3,7 +3,7 @@ package v1_21 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func DropDeletedBranchTable(x db.EngineMigration) error { return x.DropTables("deleted_branch") diff --git a/models/migrations/v1_21/v270.go b/models/migrations/v1_21/v270.go index dec8a263f5..5e1482b320 100644 --- a/models/migrations/v1_21/v270.go +++ b/models/migrations/v1_21/v270.go @@ -3,7 +3,7 @@ package v1_21 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func FixPackagePropertyTypo(x db.EngineMigration) error { sess := x.NewSession() diff --git a/models/migrations/v1_21/v271.go b/models/migrations/v1_21/v271.go index 06db190e1a..e24f484332 100644 --- a/models/migrations/v1_21/v271.go +++ b/models/migrations/v1_21/v271.go @@ -4,8 +4,8 @@ package v1_21 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func AddArchivedUnixColumInLabelTable(x db.EngineMigration) error { diff --git a/models/migrations/v1_21/v272.go b/models/migrations/v1_21/v272.go index b9ac2c9132..60335e8b46 100644 --- a/models/migrations/v1_21/v272.go +++ b/models/migrations/v1_21/v272.go @@ -3,7 +3,7 @@ package v1_21 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddVersionToActionRunTable(x db.EngineMigration) error { type ActionRun struct { diff --git a/models/migrations/v1_21/v273.go b/models/migrations/v1_21/v273.go index a647a85b09..74c3c8f9eb 100644 --- a/models/migrations/v1_21/v273.go +++ b/models/migrations/v1_21/v273.go @@ -4,8 +4,8 @@ package v1_21 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func AddActionScheduleTable(x db.EngineMigration) error { diff --git a/models/migrations/v1_21/v274.go b/models/migrations/v1_21/v274.go index e10ef7adbc..4644154c63 100644 --- a/models/migrations/v1_21/v274.go +++ b/models/migrations/v1_21/v274.go @@ -6,8 +6,8 @@ package v1_21 import ( "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func AddExpiredUnixColumnInActionArtifactTable(x db.EngineMigration) error { diff --git a/models/migrations/v1_21/v275.go b/models/migrations/v1_21/v275.go index 7e435f902d..7d999495b6 100644 --- a/models/migrations/v1_21/v275.go +++ b/models/migrations/v1_21/v275.go @@ -3,7 +3,7 @@ package v1_21 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddScheduleIDForActionRun(x db.EngineMigration) error { type ActionRun struct { diff --git a/models/migrations/v1_21/v276.go b/models/migrations/v1_21/v276.go index b5494ae46f..1bd0157156 100644 --- a/models/migrations/v1_21/v276.go +++ b/models/migrations/v1_21/v276.go @@ -6,10 +6,10 @@ package v1_21 import ( "context" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/modules/gitrepo" + "gitea.dev/modules/setting" ) func AddRemoteAddressToMirrors(x db.EngineMigration) error { diff --git a/models/migrations/v1_21/v277.go b/models/migrations/v1_21/v277.go index 46b6325671..74bc4c86db 100644 --- a/models/migrations/v1_21/v277.go +++ b/models/migrations/v1_21/v277.go @@ -3,7 +3,7 @@ package v1_21 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddIndexToIssueUserIssueID(x db.EngineMigration) error { type IssueUser struct { diff --git a/models/migrations/v1_21/v278.go b/models/migrations/v1_21/v278.go index 1d53d10e84..1fd5ec7aa0 100644 --- a/models/migrations/v1_21/v278.go +++ b/models/migrations/v1_21/v278.go @@ -3,7 +3,7 @@ package v1_21 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddIndexToCommentDependentIssueID(x db.EngineMigration) error { type Comment struct { diff --git a/models/migrations/v1_21/v279.go b/models/migrations/v1_21/v279.go index 5961ac5776..8cfa6bb090 100644 --- a/models/migrations/v1_21/v279.go +++ b/models/migrations/v1_21/v279.go @@ -4,7 +4,7 @@ package v1_21 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/main_test.go b/models/migrations/v1_22/main_test.go index e02c8a5328..f7f9442f21 100644 --- a/models/migrations/v1_22/main_test.go +++ b/models/migrations/v1_22/main_test.go @@ -6,7 +6,7 @@ package v1_22 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_22/v280.go b/models/migrations/v1_22/v280.go index aab89dfd33..5dbab16917 100644 --- a/models/migrations/v1_22/v280.go +++ b/models/migrations/v1_22/v280.go @@ -3,7 +3,7 @@ package v1_22 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func RenameUserThemes(x db.EngineMigration) error { sess := x.NewSession() diff --git a/models/migrations/v1_22/v281.go b/models/migrations/v1_22/v281.go index 7678a5b057..295d6b4aa9 100644 --- a/models/migrations/v1_22/v281.go +++ b/models/migrations/v1_22/v281.go @@ -4,8 +4,8 @@ package v1_22 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func CreateAuthTokenTable(x db.EngineMigration) error { diff --git a/models/migrations/v1_22/v282.go b/models/migrations/v1_22/v282.go index 0ae350e4eb..fca5e1d5c2 100644 --- a/models/migrations/v1_22/v282.go +++ b/models/migrations/v1_22/v282.go @@ -3,7 +3,7 @@ package v1_22 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddIndexToPullAutoMergeDoerID(x db.EngineMigration) error { type PullAutoMerge struct { diff --git a/models/migrations/v1_22/v283.go b/models/migrations/v1_22/v283.go index e984b7113b..4aca890a85 100644 --- a/models/migrations/v1_22/v283.go +++ b/models/migrations/v1_22/v283.go @@ -6,7 +6,7 @@ package v1_22 import ( "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm/schemas" ) diff --git a/models/migrations/v1_22/v283_test.go b/models/migrations/v1_22/v283_test.go index 8e4c9410bd..9705c3ee2f 100644 --- a/models/migrations/v1_22/v283_test.go +++ b/models/migrations/v1_22/v283_test.go @@ -6,7 +6,7 @@ package v1_22 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_22/v284.go b/models/migrations/v1_22/v284.go index 5d44529388..55a1646973 100644 --- a/models/migrations/v1_22/v284.go +++ b/models/migrations/v1_22/v284.go @@ -4,7 +4,7 @@ package v1_22 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/v285.go b/models/migrations/v1_22/v285.go index 54d5ca6bc5..6cd24a2148 100644 --- a/models/migrations/v1_22/v285.go +++ b/models/migrations/v1_22/v285.go @@ -6,7 +6,7 @@ package v1_22 import ( "time" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/v286.go b/models/migrations/v1_22/v286.go index b0804c82eb..3f49400c2b 100644 --- a/models/migrations/v1_22/v286.go +++ b/models/migrations/v1_22/v286.go @@ -6,9 +6,9 @@ import ( "errors" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/v286_test.go b/models/migrations/v1_22/v286_test.go index 11d1026277..1874cbe884 100644 --- a/models/migrations/v1_22/v286_test.go +++ b/models/migrations/v1_22/v286_test.go @@ -6,8 +6,8 @@ package v1_22 import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/db" + "gitea.dev/models/migrations/migrationtest" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_22/v287.go b/models/migrations/v1_22/v287.go index 715f70a596..7b3de53b77 100644 --- a/models/migrations/v1_22/v287.go +++ b/models/migrations/v1_22/v287.go @@ -3,7 +3,7 @@ package v1_22 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" type BadgeUnique struct { ID int64 `xorm:"pk autoincr"` diff --git a/models/migrations/v1_22/v287_test.go b/models/migrations/v1_22/v287_test.go index 21946a662a..7ac86d5d0f 100644 --- a/models/migrations/v1_22/v287_test.go +++ b/models/migrations/v1_22/v287_test.go @@ -7,7 +7,7 @@ import ( "strconv" "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_22/v288.go b/models/migrations/v1_22/v288.go index a2b6f6a607..cb133631c3 100644 --- a/models/migrations/v1_22/v288.go +++ b/models/migrations/v1_22/v288.go @@ -4,8 +4,8 @@ package v1_22 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) type Blocking struct { diff --git a/models/migrations/v1_22/v289.go b/models/migrations/v1_22/v289.go index 11499b6869..e32e5b2a7f 100644 --- a/models/migrations/v1_22/v289.go +++ b/models/migrations/v1_22/v289.go @@ -4,7 +4,7 @@ package v1_22 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/v290.go b/models/migrations/v1_22/v290.go index ec43cefcd9..55d1c192a7 100644 --- a/models/migrations/v1_22/v290.go +++ b/models/migrations/v1_22/v290.go @@ -4,7 +4,7 @@ package v1_22 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/v291.go b/models/migrations/v1_22/v291.go index 67d928dd4d..316fc1675f 100644 --- a/models/migrations/v1_22/v291.go +++ b/models/migrations/v1_22/v291.go @@ -4,7 +4,7 @@ package v1_22 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/v293.go b/models/migrations/v1_22/v293.go index 54016bc43d..8c082cea3b 100644 --- a/models/migrations/v1_22/v293.go +++ b/models/migrations/v1_22/v293.go @@ -4,9 +4,9 @@ package v1_22 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/setting" + "gitea.dev/modules/timeutil" ) // CheckProjectColumnsConsistency ensures there is exactly one default board per project present diff --git a/models/migrations/v1_22/v293_test.go b/models/migrations/v1_22/v293_test.go index bc3a33055c..c19d0a4aa5 100644 --- a/models/migrations/v1_22/v293_test.go +++ b/models/migrations/v1_22/v293_test.go @@ -6,8 +6,8 @@ package v1_22 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" - "code.gitea.io/gitea/models/project" + "gitea.dev/models/migrations/migrationtest" + "gitea.dev/models/project" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_22/v294.go b/models/migrations/v1_22/v294.go index a839bd7b3b..2c8f174493 100644 --- a/models/migrations/v1_22/v294.go +++ b/models/migrations/v1_22/v294.go @@ -6,7 +6,7 @@ package v1_22 import ( "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm/schemas" ) diff --git a/models/migrations/v1_22/v294_test.go b/models/migrations/v1_22/v294_test.go index a711b5ec5f..6a21b0adc5 100644 --- a/models/migrations/v1_22/v294_test.go +++ b/models/migrations/v1_22/v294_test.go @@ -6,7 +6,7 @@ package v1_22 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" "github.com/stretchr/testify/assert" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_22/v295.go b/models/migrations/v1_22/v295.go index 86655d9e0d..7595460281 100644 --- a/models/migrations/v1_22/v295.go +++ b/models/migrations/v1_22/v295.go @@ -3,7 +3,7 @@ package v1_22 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddCommitStatusSummary(x db.EngineMigration) error { type CommitStatusSummary struct { diff --git a/models/migrations/v1_22/v296.go b/models/migrations/v1_22/v296.go index 17981d18b6..79134dea01 100644 --- a/models/migrations/v1_22/v296.go +++ b/models/migrations/v1_22/v296.go @@ -3,7 +3,7 @@ package v1_22 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddCommitStatusSummary2(x db.EngineMigration) error { type CommitStatusSummary struct { diff --git a/models/migrations/v1_22/v297.go b/models/migrations/v1_22/v297.go index aea13a1e2a..9912434e44 100644 --- a/models/migrations/v1_22/v297.go +++ b/models/migrations/v1_22/v297.go @@ -4,8 +4,8 @@ package v1_22 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" + "gitea.dev/models/db" + "gitea.dev/models/perm" ) func AddRepoUnitEveryoneAccessMode(x db.EngineMigration) error { diff --git a/models/migrations/v1_22/v298.go b/models/migrations/v1_22/v298.go index bf6ebb3bd9..d334ff4142 100644 --- a/models/migrations/v1_22/v298.go +++ b/models/migrations/v1_22/v298.go @@ -3,7 +3,7 @@ package v1_22 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func DropWronglyCreatedTable(x db.EngineMigration) error { return x.DropTables("o_auth2_application") diff --git a/models/migrations/v1_23/main_test.go b/models/migrations/v1_23/main_test.go index ffccac0fd3..03a2a2d048 100644 --- a/models/migrations/v1_23/main_test.go +++ b/models/migrations/v1_23/main_test.go @@ -6,7 +6,7 @@ package v1_23 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_23/v299.go b/models/migrations/v1_23/v299.go index 50f8e8c0d0..cb6fd97c92 100644 --- a/models/migrations/v1_23/v299.go +++ b/models/migrations/v1_23/v299.go @@ -4,7 +4,7 @@ package v1_23 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm" ) diff --git a/models/migrations/v1_23/v300.go b/models/migrations/v1_23/v300.go index 5ed11b68f7..06c6c161b6 100644 --- a/models/migrations/v1_23/v300.go +++ b/models/migrations/v1_23/v300.go @@ -4,7 +4,7 @@ package v1_23 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm" ) diff --git a/models/migrations/v1_23/v301.go b/models/migrations/v1_23/v301.go index cd7c90a69c..03f6f2012a 100644 --- a/models/migrations/v1_23/v301.go +++ b/models/migrations/v1_23/v301.go @@ -4,7 +4,7 @@ package v1_23 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm" ) diff --git a/models/migrations/v1_23/v302.go b/models/migrations/v1_23/v302.go index 804782332f..c347a0a068 100644 --- a/models/migrations/v1_23/v302.go +++ b/models/migrations/v1_23/v302.go @@ -4,8 +4,8 @@ package v1_23 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_23/v302_test.go b/models/migrations/v1_23/v302_test.go index 1832adf39a..c0af662fc9 100644 --- a/models/migrations/v1_23/v302_test.go +++ b/models/migrations/v1_23/v302_test.go @@ -6,8 +6,8 @@ package v1_23 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/migrations/migrationtest" + "gitea.dev/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_23/v303.go b/models/migrations/v1_23/v303.go index 80a7ecf43f..c11e23b2f3 100644 --- a/models/migrations/v1_23/v303.go +++ b/models/migrations/v1_23/v303.go @@ -4,7 +4,7 @@ package v1_23 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm" ) diff --git a/models/migrations/v1_23/v304.go b/models/migrations/v1_23/v304.go index 915ba8707f..2920c712a8 100644 --- a/models/migrations/v1_23/v304.go +++ b/models/migrations/v1_23/v304.go @@ -4,7 +4,7 @@ package v1_23 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm" ) diff --git a/models/migrations/v1_23/v304_test.go b/models/migrations/v1_23/v304_test.go index 9af84cd257..2cd550d395 100644 --- a/models/migrations/v1_23/v304_test.go +++ b/models/migrations/v1_23/v304_test.go @@ -6,8 +6,8 @@ package v1_23 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/migrations/migrationtest" + "gitea.dev/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_23/v305.go b/models/migrations/v1_23/v305.go index e4c7fdb9e0..9832fd17b6 100644 --- a/models/migrations/v1_23/v305.go +++ b/models/migrations/v1_23/v305.go @@ -4,8 +4,8 @@ package v1_23 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func AddRepositoryLicenses(x db.EngineMigration) error { diff --git a/models/migrations/v1_23/v306.go b/models/migrations/v1_23/v306.go index eb1a2a1bda..7da7b548f3 100644 --- a/models/migrations/v1_23/v306.go +++ b/models/migrations/v1_23/v306.go @@ -4,7 +4,7 @@ package v1_23 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm" ) diff --git a/models/migrations/v1_23/v307.go b/models/migrations/v1_23/v307.go index 618d7ee277..f87257b21e 100644 --- a/models/migrations/v1_23/v307.go +++ b/models/migrations/v1_23/v307.go @@ -4,8 +4,8 @@ package v1_23 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func FixMilestoneNoDueDate(x db.EngineMigration) error { diff --git a/models/migrations/v1_23/v308.go b/models/migrations/v1_23/v308.go index 137cf61874..8a511aae77 100644 --- a/models/migrations/v1_23/v308.go +++ b/models/migrations/v1_23/v308.go @@ -4,8 +4,8 @@ package v1_23 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" "xorm.io/xorm/schemas" ) diff --git a/models/migrations/v1_23/v309.go b/models/migrations/v1_23/v309.go index a622c9f10d..432ae62e3c 100644 --- a/models/migrations/v1_23/v309.go +++ b/models/migrations/v1_23/v309.go @@ -4,8 +4,8 @@ package v1_23 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" "xorm.io/xorm/schemas" ) diff --git a/models/migrations/v1_23/v310.go b/models/migrations/v1_23/v310.go index 5f009bab4a..845eaf19ba 100644 --- a/models/migrations/v1_23/v310.go +++ b/models/migrations/v1_23/v310.go @@ -4,7 +4,7 @@ package v1_23 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm" ) diff --git a/models/migrations/v1_23/v311.go b/models/migrations/v1_23/v311.go index e229a8b98a..8b9c0e78a3 100644 --- a/models/migrations/v1_23/v311.go +++ b/models/migrations/v1_23/v311.go @@ -4,7 +4,7 @@ package v1_23 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm" ) diff --git a/models/migrations/v1_24/v312.go b/models/migrations/v1_24/v312.go index 4c8fbbb453..c3f0c5635d 100644 --- a/models/migrations/v1_24/v312.go +++ b/models/migrations/v1_24/v312.go @@ -4,7 +4,7 @@ package v1_24 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm" ) diff --git a/models/migrations/v1_24/v313.go b/models/migrations/v1_24/v313.go index 3f12488def..69bfda106e 100644 --- a/models/migrations/v1_24/v313.go +++ b/models/migrations/v1_24/v313.go @@ -4,8 +4,8 @@ package v1_24 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/base" + "gitea.dev/models/db" + "gitea.dev/models/migrations/base" ) func MovePinOrderToTableIssuePin(x db.EngineMigration) error { diff --git a/models/migrations/v1_24/v314.go b/models/migrations/v1_24/v314.go index 19d26d42da..502dce9c2a 100644 --- a/models/migrations/v1_24/v314.go +++ b/models/migrations/v1_24/v314.go @@ -3,7 +3,7 @@ package v1_24 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func UpdateOwnerIDOfRepoLevelActionsTables(x db.EngineMigration) error { if _, err := x.Exec("UPDATE `action_runner` SET `owner_id` = 0 WHERE `repo_id` > 0 AND `owner_id` > 0"); err != nil { diff --git a/models/migrations/v1_24/v315.go b/models/migrations/v1_24/v315.go index efac5b3ddb..168b9efb32 100644 --- a/models/migrations/v1_24/v315.go +++ b/models/migrations/v1_24/v315.go @@ -4,7 +4,7 @@ package v1_24 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm" ) diff --git a/models/migrations/v1_24/v316.go b/models/migrations/v1_24/v316.go index 0cdbb89c59..9539ee8a99 100644 --- a/models/migrations/v1_24/v316.go +++ b/models/migrations/v1_24/v316.go @@ -4,7 +4,7 @@ package v1_24 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm" ) diff --git a/models/migrations/v1_24/v317.go b/models/migrations/v1_24/v317.go index 7e40bdb9a1..622f9e03dd 100644 --- a/models/migrations/v1_24/v317.go +++ b/models/migrations/v1_24/v317.go @@ -4,8 +4,8 @@ package v1_24 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" "xorm.io/xorm/schemas" ) diff --git a/models/migrations/v1_24/v318.go b/models/migrations/v1_24/v318.go index 3b2f342a66..cad0ca397d 100644 --- a/models/migrations/v1_24/v318.go +++ b/models/migrations/v1_24/v318.go @@ -4,8 +4,8 @@ package v1_24 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" + "gitea.dev/models/db" + "gitea.dev/models/perm" "xorm.io/xorm" ) diff --git a/models/migrations/v1_24/v319.go b/models/migrations/v1_24/v319.go index e57ce84653..a26ac0ce71 100644 --- a/models/migrations/v1_24/v319.go +++ b/models/migrations/v1_24/v319.go @@ -4,7 +4,7 @@ package v1_24 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm" ) diff --git a/models/migrations/v1_24/v320.go b/models/migrations/v1_24/v320.go index 07d085ccb9..7ff7a78033 100644 --- a/models/migrations/v1_24/v320.go +++ b/models/migrations/v1_24/v320.go @@ -4,8 +4,8 @@ package v1_24 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/json" + "gitea.dev/models/db" + "gitea.dev/modules/json" "xorm.io/xorm" ) diff --git a/models/migrations/v1_25/main_test.go b/models/migrations/v1_25/main_test.go index 33c981edb9..a4fbc0e6ab 100644 --- a/models/migrations/v1_25/main_test.go +++ b/models/migrations/v1_25/main_test.go @@ -6,7 +6,7 @@ package v1_25 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_25/v321.go b/models/migrations/v1_25/v321.go index 0282e743a7..dfea8f0d44 100644 --- a/models/migrations/v1_25/v321.go +++ b/models/migrations/v1_25/v321.go @@ -4,9 +4,9 @@ package v1_25 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/models/migrations/base" + "gitea.dev/modules/setting" "xorm.io/xorm/schemas" ) diff --git a/models/migrations/v1_25/v321_test.go b/models/migrations/v1_25/v321_test.go index 0749a20e20..a20b4c916d 100644 --- a/models/migrations/v1_25/v321_test.go +++ b/models/migrations/v1_25/v321_test.go @@ -6,9 +6,9 @@ package v1_25 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/migrations/migrationtest" + "gitea.dev/modules/setting" + "gitea.dev/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_25/v322.go b/models/migrations/v1_25/v322.go index 51312cafb3..16eabace32 100644 --- a/models/migrations/v1_25/v322.go +++ b/models/migrations/v1_25/v322.go @@ -4,8 +4,8 @@ package v1_25 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/base" + "gitea.dev/models/db" + "gitea.dev/models/migrations/base" "xorm.io/xorm/schemas" ) diff --git a/models/migrations/v1_25/v322_test.go b/models/migrations/v1_25/v322_test.go index 1964614035..2e5f9a87d9 100644 --- a/models/migrations/v1_25/v322_test.go +++ b/models/migrations/v1_25/v322_test.go @@ -6,8 +6,8 @@ package v1_25 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/migrations/migrationtest" + "gitea.dev/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_26/main_test.go b/models/migrations/v1_26/main_test.go index 0b271b9bbc..9befeee38f 100644 --- a/models/migrations/v1_26/main_test.go +++ b/models/migrations/v1_26/main_test.go @@ -6,7 +6,7 @@ package v1_26 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_26/v323.go b/models/migrations/v1_26/v323.go index 1fadd8b16f..f2a701cb8f 100644 --- a/models/migrations/v1_26/v323.go +++ b/models/migrations/v1_26/v323.go @@ -4,7 +4,7 @@ package v1_26 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm" ) diff --git a/models/migrations/v1_26/v324.go b/models/migrations/v1_26/v324.go index 288295a90c..cca28e1241 100644 --- a/models/migrations/v1_26/v324.go +++ b/models/migrations/v1_26/v324.go @@ -6,7 +6,7 @@ package v1_26 import ( "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) func FixClosedMilestoneCompleteness(x db.EngineMigration) error { diff --git a/models/migrations/v1_26/v325.go b/models/migrations/v1_26/v325.go index 8f753554c1..e7bac3e02d 100644 --- a/models/migrations/v1_26/v325.go +++ b/models/migrations/v1_26/v325.go @@ -3,7 +3,7 @@ package v1_26 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func FixMissedRepoIDWhenMigrateAttachments(x db.EngineMigration) error { _, err := x.Exec("UPDATE `attachment` SET `repo_id` = (SELECT `repo_id` FROM `issue` WHERE `issue`.`id` = `attachment`.`issue_id`) WHERE `issue_id` > 0 AND (`repo_id` IS NULL OR `repo_id` = 0);") diff --git a/models/migrations/v1_26/v325_test.go b/models/migrations/v1_26/v325_test.go index 3fd658e01b..b18b954469 100644 --- a/models/migrations/v1_26/v325_test.go +++ b/models/migrations/v1_26/v325_test.go @@ -6,8 +6,8 @@ package v1_26 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/migrations/migrationtest" + "gitea.dev/modules/timeutil" "github.com/stretchr/testify/require" ) diff --git a/models/migrations/v1_26/v326.go b/models/migrations/v1_26/v326.go index 1b0462862c..b2c28f06d9 100644 --- a/models/migrations/v1_26/v326.go +++ b/models/migrations/v1_26/v326.go @@ -10,11 +10,11 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - webhook_module "code.gitea.io/gitea/modules/webhook" + "gitea.dev/models/db" + "gitea.dev/modules/json" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + webhook_module "gitea.dev/modules/webhook" ) const ( diff --git a/models/migrations/v1_26/v326_test.go b/models/migrations/v1_26/v326_test.go index 5246b7c7fc..09f3c3ab5c 100644 --- a/models/migrations/v1_26/v326_test.go +++ b/models/migrations/v1_26/v326_test.go @@ -6,14 +6,14 @@ package v1_26 import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/migrationtest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "gitea.dev/models/db" + "gitea.dev/models/migrations/migrationtest" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/git" - _ "code.gitea.io/gitea/models/repo" + _ "gitea.dev/models/actions" + _ "gitea.dev/models/git" + _ "gitea.dev/models/repo" "github.com/stretchr/testify/require" ) diff --git a/models/migrations/v1_26/v327.go b/models/migrations/v1_26/v327.go index e0afdb958e..19c1eae725 100644 --- a/models/migrations/v1_26/v327.go +++ b/models/migrations/v1_26/v327.go @@ -4,7 +4,7 @@ package v1_26 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm" ) diff --git a/models/migrations/v1_26/v327_test.go b/models/migrations/v1_26/v327_test.go index 98e948cf05..f93c2cbc20 100644 --- a/models/migrations/v1_26/v327_test.go +++ b/models/migrations/v1_26/v327_test.go @@ -6,7 +6,7 @@ package v1_26 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" "github.com/stretchr/testify/require" ) diff --git a/models/migrations/v1_26/v328.go b/models/migrations/v1_26/v328.go index 2d9d77cd31..b7ca993049 100644 --- a/models/migrations/v1_26/v328.go +++ b/models/migrations/v1_26/v328.go @@ -4,7 +4,7 @@ package v1_26 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm" ) diff --git a/models/migrations/v1_26/v329.go b/models/migrations/v1_26/v329.go index 74baf074a3..15754e2866 100644 --- a/models/migrations/v1_26/v329.go +++ b/models/migrations/v1_26/v329.go @@ -6,7 +6,7 @@ package v1_26 import ( "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm/schemas" ) diff --git a/models/migrations/v1_26/v329_test.go b/models/migrations/v1_26/v329_test.go index e4bebfb71d..4b20273e7b 100644 --- a/models/migrations/v1_26/v329_test.go +++ b/models/migrations/v1_26/v329_test.go @@ -6,7 +6,7 @@ package v1_26 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_26/v330.go b/models/migrations/v1_26/v330.go index 4d083d7abf..341da864bd 100644 --- a/models/migrations/v1_26/v330.go +++ b/models/migrations/v1_26/v330.go @@ -4,7 +4,7 @@ package v1_26 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm" ) diff --git a/models/migrations/v1_27/main_test.go b/models/migrations/v1_27/main_test.go index 0c6a6a2440..949c88c23f 100644 --- a/models/migrations/v1_27/main_test.go +++ b/models/migrations/v1_27/main_test.go @@ -6,7 +6,7 @@ package v1_27 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_27/v331.go b/models/migrations/v1_27/v331.go index 413fb8bd87..09d94929d0 100644 --- a/models/migrations/v1_27/v331.go +++ b/models/migrations/v1_27/v331.go @@ -7,9 +7,9 @@ import ( "context" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/models/migrations/base" + "gitea.dev/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_27/v331_test.go b/models/migrations/v1_27/v331_test.go index 2302fee024..d86f9d943f 100644 --- a/models/migrations/v1_27/v331_test.go +++ b/models/migrations/v1_27/v331_test.go @@ -8,7 +8,7 @@ import ( "slices" "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_27/v332.go b/models/migrations/v1_27/v332.go index 5c7ef465eb..e0fc6a6c0f 100644 --- a/models/migrations/v1_27/v332.go +++ b/models/migrations/v1_27/v332.go @@ -4,7 +4,7 @@ package v1_27 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm" ) diff --git a/models/migrations/v1_27/v333.go b/models/migrations/v1_27/v333.go index d492de40b5..e019313d1e 100644 --- a/models/migrations/v1_27/v333.go +++ b/models/migrations/v1_27/v333.go @@ -4,7 +4,7 @@ package v1_27 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm" ) diff --git a/models/migrations/v1_27/v333_test.go b/models/migrations/v1_27/v333_test.go index 768fa10261..901831fb1e 100644 --- a/models/migrations/v1_27/v333_test.go +++ b/models/migrations/v1_27/v333_test.go @@ -6,7 +6,7 @@ package v1_27 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" "github.com/stretchr/testify/require" ) diff --git a/models/migrations/v1_27/v334.go b/models/migrations/v1_27/v334.go index c6b13740ec..a39a3ecf84 100644 --- a/models/migrations/v1_27/v334.go +++ b/models/migrations/v1_27/v334.go @@ -4,7 +4,7 @@ package v1_27 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm" ) diff --git a/models/migrations/v1_27/v334_test.go b/models/migrations/v1_27/v334_test.go index 29369d5332..8bcb82e475 100644 --- a/models/migrations/v1_27/v334_test.go +++ b/models/migrations/v1_27/v334_test.go @@ -6,7 +6,7 @@ package v1_27 import ( "testing" - "code.gitea.io/gitea/models/migrations/migrationtest" + "gitea.dev/models/migrations/migrationtest" "github.com/stretchr/testify/require" ) diff --git a/models/migrations/v1_27/v335.go b/models/migrations/v1_27/v335.go new file mode 100644 index 0000000000..c14488e343 --- /dev/null +++ b/models/migrations/v1_27/v335.go @@ -0,0 +1,33 @@ +// Copyright 2026 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package v1_27 + +import ( + "gitea.dev/models/db" + + "xorm.io/xorm" +) + +// AddReusableWorkflowFieldsToActionRunJob adds the ActionRunJob columns that describe the reusable workflow caller hierarchy, +// and the ActionRunAttemptJobIDIndex table backing run-wide AttemptJobID allocation. +func AddReusableWorkflowFieldsToActionRunJob(x db.EngineMigration) error { + type ActionRunJob struct { + WorkflowSourceRepoID int64 `xorm:"NOT NULL DEFAULT 0"` + WorkflowSourceCommitSHA string `xorm:"VARCHAR(64) NOT NULL DEFAULT ''"` + IsReusableCaller bool `xorm:"index NOT NULL DEFAULT FALSE"` + ParentJobID int64 `xorm:"index NOT NULL DEFAULT 0"` + CallUses string `xorm:"VARCHAR(512) NOT NULL DEFAULT ''"` + CallSecrets string `xorm:"LONGTEXT"` + CallPayload string `xorm:"LONGTEXT"` + IsExpanded bool `xorm:"NOT NULL DEFAULT FALSE"` + ReusableWorkflowContent []byte `xorm:"LONGBLOB"` + } + + type ActionRunAttemptJobIDIndex db.ResourceIndex + + if _, err := x.SyncWithOptions(xorm.SyncOptions{IgnoreDropIndices: true}, new(ActionRunJob)); err != nil { + return err + } + return x.Sync(new(ActionRunAttemptJobIDIndex)) +} diff --git a/models/migrations/v1_6/v70.go b/models/migrations/v1_6/v70.go index 6b20715c70..947d27d3dd 100644 --- a/models/migrations/v1_6/v70.go +++ b/models/migrations/v1_6/v70.go @@ -7,8 +7,8 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/modules/setting" ) func AddIssueDependencies(x db.EngineMigration) (err error) { diff --git a/models/migrations/v1_6/v71.go b/models/migrations/v1_6/v71.go index 011dc5511d..ba2fbb6f17 100644 --- a/models/migrations/v1_6/v71.go +++ b/models/migrations/v1_6/v71.go @@ -6,10 +6,10 @@ package v1_6 import ( "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/models/migrations/base" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" ) func AddScratchHash(x db.EngineMigration) error { diff --git a/models/migrations/v1_6/v72.go b/models/migrations/v1_6/v72.go index 5668570f2c..5aa74402f5 100644 --- a/models/migrations/v1_6/v72.go +++ b/models/migrations/v1_6/v72.go @@ -6,8 +6,8 @@ package v1_6 import ( "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func AddReview(x db.EngineMigration) error { diff --git a/models/migrations/v1_7/v73.go b/models/migrations/v1_7/v73.go index 44a035663a..6f068cc9d9 100644 --- a/models/migrations/v1_7/v73.go +++ b/models/migrations/v1_7/v73.go @@ -3,7 +3,7 @@ package v1_7 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddMustChangePassword(x db.EngineMigration) error { // User see models/user.go diff --git a/models/migrations/v1_7/v74.go b/models/migrations/v1_7/v74.go index 447606997e..774602317e 100644 --- a/models/migrations/v1_7/v74.go +++ b/models/migrations/v1_7/v74.go @@ -3,7 +3,7 @@ package v1_7 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddApprovalWhitelistsToProtectedBranches(x db.EngineMigration) error { type ProtectedBranch struct { diff --git a/models/migrations/v1_7/v75.go b/models/migrations/v1_7/v75.go index c80edc0c14..2da93264c3 100644 --- a/models/migrations/v1_7/v75.go +++ b/models/migrations/v1_7/v75.go @@ -4,7 +4,7 @@ package v1_7 import ( - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/builder" ) diff --git a/models/migrations/v1_8/v76.go b/models/migrations/v1_8/v76.go index f3e5c4aadb..d2afd23ffe 100644 --- a/models/migrations/v1_8/v76.go +++ b/models/migrations/v1_8/v76.go @@ -6,8 +6,8 @@ package v1_8 import ( "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func AddPullRequestRebaseWithMerge(x db.EngineMigration) error { diff --git a/models/migrations/v1_8/v77.go b/models/migrations/v1_8/v77.go index 6350c486d7..8f91891cfe 100644 --- a/models/migrations/v1_8/v77.go +++ b/models/migrations/v1_8/v77.go @@ -3,7 +3,7 @@ package v1_8 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddUserDefaultTheme(x db.EngineMigration) error { type User struct { diff --git a/models/migrations/v1_8/v78.go b/models/migrations/v1_8/v78.go index 1c2afb712f..b41bbbed7e 100644 --- a/models/migrations/v1_8/v78.go +++ b/models/migrations/v1_8/v78.go @@ -4,8 +4,8 @@ package v1_8 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/base" + "gitea.dev/models/db" + "gitea.dev/models/migrations/base" ) func RenameRepoIsBareToIsEmpty(x db.EngineMigration) error { diff --git a/models/migrations/v1_8/v79.go b/models/migrations/v1_8/v79.go index 35d16bcd04..b29f973c87 100644 --- a/models/migrations/v1_8/v79.go +++ b/models/migrations/v1_8/v79.go @@ -4,8 +4,8 @@ package v1_8 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/modules/setting" ) func AddCanCloseIssuesViaCommitInAnyBranch(x db.EngineMigration) error { diff --git a/models/migrations/v1_8/v80.go b/models/migrations/v1_8/v80.go index 2518a8b1e4..7e8855cb22 100644 --- a/models/migrations/v1_8/v80.go +++ b/models/migrations/v1_8/v80.go @@ -3,7 +3,7 @@ package v1_8 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddIsLockedToIssues(x db.EngineMigration) error { // Issue see models/issue.go diff --git a/models/migrations/v1_8/v81.go b/models/migrations/v1_8/v81.go index eac4eb3378..406ea973bc 100644 --- a/models/migrations/v1_8/v81.go +++ b/models/migrations/v1_8/v81.go @@ -6,7 +6,7 @@ package v1_8 import ( "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/xorm/schemas" ) diff --git a/models/migrations/v1_9/v82.go b/models/migrations/v1_9/v82.go index 9fbe06267f..9e8b47e882 100644 --- a/models/migrations/v1_9/v82.go +++ b/models/migrations/v1_9/v82.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/modules/git" + "gitea.dev/modules/gitrepo" ) func FixReleaseSha1OnReleaseTable(ctx context.Context, x db.EngineMigration) error { diff --git a/models/migrations/v1_9/v83.go b/models/migrations/v1_9/v83.go index 8646386951..84da3f5a5c 100644 --- a/models/migrations/v1_9/v83.go +++ b/models/migrations/v1_9/v83.go @@ -4,8 +4,8 @@ package v1_9 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func AddUploaderIDForAttachment(x db.EngineMigration) error { diff --git a/models/migrations/v1_9/v84.go b/models/migrations/v1_9/v84.go index 95861f07f0..9e7347b3a3 100644 --- a/models/migrations/v1_9/v84.go +++ b/models/migrations/v1_9/v84.go @@ -3,7 +3,7 @@ package v1_9 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddGPGKeyImport(x db.EngineMigration) error { type GPGKeyImport struct { diff --git a/models/migrations/v1_9/v85.go b/models/migrations/v1_9/v85.go index 010ed5f784..6d7c05cb0d 100644 --- a/models/migrations/v1_9/v85.go +++ b/models/migrations/v1_9/v85.go @@ -6,11 +6,11 @@ package v1_9 import ( "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/models/migrations/base" + "gitea.dev/modules/log" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" ) func HashAppToken(x db.EngineMigration) error { diff --git a/models/migrations/v1_9/v86.go b/models/migrations/v1_9/v86.go index c031c784b9..08bf2795e0 100644 --- a/models/migrations/v1_9/v86.go +++ b/models/migrations/v1_9/v86.go @@ -3,7 +3,7 @@ package v1_9 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddHTTPMethodToWebhook(x db.EngineMigration) error { type Webhook struct { diff --git a/models/migrations/v1_9/v87.go b/models/migrations/v1_9/v87.go index 03982d1cf7..478d549641 100644 --- a/models/migrations/v1_9/v87.go +++ b/models/migrations/v1_9/v87.go @@ -3,7 +3,7 @@ package v1_9 -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" func AddAvatarFieldToRepository(x db.EngineMigration) error { type Repository struct { diff --git a/models/organization/main_test.go b/models/organization/main_test.go index c35898a465..f06678cd03 100644 --- a/models/organization/main_test.go +++ b/models/organization/main_test.go @@ -6,14 +6,14 @@ package organization_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/organization" - _ "code.gitea.io/gitea/models/repo" - _ "code.gitea.io/gitea/models/user" + _ "gitea.dev/models" + _ "gitea.dev/models/actions" + _ "gitea.dev/models/activities" + _ "gitea.dev/models/organization" + _ "gitea.dev/models/repo" + _ "gitea.dev/models/user" ) func TestMain(m *testing.M) { diff --git a/models/organization/org.go b/models/organization/org.go index 278f086100..d9390fc147 100644 --- a/models/organization/org.go +++ b/models/organization/org.go @@ -9,16 +9,17 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/models/perm" + "gitea.dev/models/unit" + user_model "gitea.dev/models/user" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/modules/structs" + "gitea.dev/modules/util" "xorm.io/builder" + "xorm.io/xorm" ) // ErrOrgNotExist represents a "OrgNotExist" kind of error. @@ -180,15 +181,47 @@ func (org *Organization) HomeLink() string { // FindOrgMembersOpts represents find org members conditions type FindOrgMembersOpts struct { db.ListOptions - Doer *user_model.User - IsDoerMember bool - OrgID int64 + Doer *user_model.User + IsDoerMember bool + OrgID int64 + Keyword string + SearchByEmail bool } func (opts FindOrgMembersOpts) PublicOnly() bool { return opts.Doer == nil || !(opts.IsDoerMember || opts.Doer.IsAdmin) } +func (opts FindOrgMembersOpts) applyKeywordFilter(sess *xorm.Session) (*xorm.Session, bool) { + if opts.Keyword == "" { + return sess, false + } + + lowerKeyword := strings.ToLower(opts.Keyword) + keywordCond := builder.Or( + builder.Like{"`user`.lower_name", lowerKeyword}, + builder.Like{"LOWER(`user`.full_name)", lowerKeyword}, + ) + if opts.SearchByEmail { + var emailCond builder.Cond = builder.Like{"LOWER(`user`.email)", lowerKeyword} + switch { + case opts.Doer == nil: + emailCond = emailCond.And(builder.Eq{"`user`.keep_email_private": false}) + case !opts.Doer.IsAdmin: + emailCond = emailCond.And( + builder.Or( + builder.Eq{"`user`.keep_email_private": false}, + builder.Eq{"`user`.id": opts.Doer.ID}, + ), + ) + } + keywordCond = keywordCond.Or(emailCond) + } + + sess = sess.Join("INNER", "`user`", "org_user.uid = `user`.id").And(keywordCond) + return sess, true +} + // applyTeamMatesOnlyFilter make sure restricted users only see public team members and there own team mates func (opts FindOrgMembersOpts) applyTeamMatesOnlyFilter(sess db.Session) { if opts.Doer != nil && opts.IsDoerMember && opts.Doer.IsRestricted { @@ -212,6 +245,7 @@ func CountOrgMembers(ctx context.Context, opts *FindOrgMembersOpts) (int64, erro } else { opts.applyTeamMatesOnlyFilter(sess) } + sess, _ = opts.applyKeywordFilter(sess) return sess.Count(new(OrgUser)) } @@ -460,7 +494,11 @@ func GetOrgUsersByOrgID(ctx context.Context, opts *FindOrgMembersOpts) ([]*OrgUs } else { opts.applyTeamMatesOnlyFilter(sess) } + if keywordSess, hasKeyword := opts.applyKeywordFilter(sess); hasKeyword { + sess = keywordSess.Select("org_user.*") + } + sess = sess.OrderBy("org_user.uid ASC") if opts.ListOptions.PageSize > 0 { db.SetSessionPagination(sess, opts) diff --git a/models/organization/org_list.go b/models/organization/org_list.go index 136417d932..73de7db824 100644 --- a/models/organization/org_list.go +++ b/models/organization/org_list.go @@ -8,10 +8,10 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/structs" + "gitea.dev/models/db" + "gitea.dev/models/perm" + user_model "gitea.dev/models/user" + "gitea.dev/modules/structs" "xorm.io/builder" ) diff --git a/models/organization/org_list_test.go b/models/organization/org_list_test.go index b2a1044422..a3a8b1e2b0 100644 --- a/models/organization/org_list_test.go +++ b/models/organization/org_list_test.go @@ -6,11 +6,11 @@ package organization_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/structs" + "gitea.dev/models/db" + "gitea.dev/models/organization" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/models/organization/org_test.go b/models/organization/org_test.go index be27dbb96c..8fe4b79297 100644 --- a/models/organization/org_test.go +++ b/models/organization/org_test.go @@ -8,14 +8,14 @@ import ( "sort" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" + "gitea.dev/models/db" + "gitea.dev/models/organization" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + "gitea.dev/modules/structs" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -288,6 +288,80 @@ func TestGetOrgUsersByOrgID(t *testing.T) { assert.Empty(t, orgUsers) } +func TestOrgMembersSearch(t *testing.T) { + assert.NoError(t, unittest.PrepareTestDatabase()) + + member := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4}) + admin := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) + + testCases := []struct { + name string + opts *organization.FindOrgMembersOpts + expectedUIDs []int64 + }{ + { + name: "match by username", + opts: &organization.FindOrgMembersOpts{ + OrgID: 3, + Doer: member, + IsDoerMember: true, + Keyword: "user4", + SearchByEmail: true, + }, + expectedUIDs: []int64{4}, + }, + { + name: "match by full name", + opts: &organization.FindOrgMembersOpts{ + OrgID: 3, + Doer: member, + IsDoerMember: true, + Keyword: "user27", + SearchByEmail: true, + }, + expectedUIDs: []int64{28}, + }, + { + name: "private email hidden", + opts: &organization.FindOrgMembersOpts{ + OrgID: 3, + Doer: member, + IsDoerMember: true, + Keyword: "user2@example.com", + SearchByEmail: true, + }, + expectedUIDs: []int64{}, + }, + { + name: "admin can search private email", + opts: &organization.FindOrgMembersOpts{ + OrgID: 3, + Doer: admin, + Keyword: "user2@example.com", + SearchByEmail: true, + }, + expectedUIDs: []int64{2}, + }, + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + count, err := organization.CountOrgMembers(t.Context(), tc.opts) + assert.NoError(t, err) + assert.EqualValues(t, len(tc.expectedUIDs), count) + + members, err := organization.GetOrgUsersByOrgID(t.Context(), tc.opts) + assert.NoError(t, err) + memberUIDs := make([]int64, 0, len(members)) + for _, member := range members { + memberUIDs = append(memberUIDs, member.UID) + } + slices.Sort(memberUIDs) + assert.Equal(t, tc.expectedUIDs, memberUIDs) + }) + } +} + func TestChangeOrgUserStatus(t *testing.T) { assert.NoError(t, unittest.PrepareTestDatabase()) diff --git a/models/organization/org_user.go b/models/organization/org_user.go index 7d0476606c..61102501af 100644 --- a/models/organization/org_user.go +++ b/models/organization/org_user.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" + "gitea.dev/models/db" + "gitea.dev/models/perm" + user_model "gitea.dev/models/user" + "gitea.dev/modules/log" "xorm.io/builder" ) diff --git a/models/organization/org_user_test.go b/models/organization/org_user_test.go index d21df4b474..c16def2dbb 100644 --- a/models/organization/org_user_test.go +++ b/models/organization/org_user_test.go @@ -7,10 +7,10 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/organization" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/models/organization/org_worktime.go b/models/organization/org_worktime.go index 3ef3e512ad..f80b741c5d 100644 --- a/models/organization/org_worktime.go +++ b/models/organization/org_worktime.go @@ -7,7 +7,7 @@ import ( "context" "sort" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/builder" ) diff --git a/models/organization/team.go b/models/organization/team.go index 7f3a9b3829..fd6365e731 100644 --- a/models/organization/team.go +++ b/models/organization/team.go @@ -9,12 +9,12 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/models/perm" + "gitea.dev/models/unit" + user_model "gitea.dev/models/user" + "gitea.dev/modules/log" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/organization/team_invite.go b/models/organization/team_invite.go index 186ae5f6e8..409ca7529b 100644 --- a/models/organization/team_invite.go +++ b/models/organization/team_invite.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + user_model "gitea.dev/models/user" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/organization/team_invite_test.go b/models/organization/team_invite_test.go index e9fabed1db..200e80e499 100644 --- a/models/organization/team_invite_test.go +++ b/models/organization/team_invite_test.go @@ -6,9 +6,9 @@ package organization_test import ( "testing" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "gitea.dev/models/organization" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/organization/team_list.go b/models/organization/team_list.go index 4d98e3148c..64b084eaaa 100644 --- a/models/organization/team_list.go +++ b/models/organization/team_list.go @@ -7,9 +7,9 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" + "gitea.dev/models/db" + "gitea.dev/models/perm" + "gitea.dev/models/unit" "xorm.io/builder" ) diff --git a/models/organization/team_list_test.go b/models/organization/team_list_test.go index df73f95898..553f1f1c91 100644 --- a/models/organization/team_list_test.go +++ b/models/organization/team_list_test.go @@ -6,8 +6,8 @@ package organization_test import ( "testing" - org_model "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" + org_model "gitea.dev/models/organization" + "gitea.dev/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/organization/team_repo.go b/models/organization/team_repo.go index 2652b34c6f..b497419979 100644 --- a/models/organization/team_repo.go +++ b/models/organization/team_repo.go @@ -6,9 +6,9 @@ package organization import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" + "gitea.dev/models/db" + "gitea.dev/models/perm" + "gitea.dev/models/unit" "xorm.io/builder" ) diff --git a/models/organization/team_repo_test.go b/models/organization/team_repo_test.go index af959f4658..91d5e6f569 100644 --- a/models/organization/team_repo_test.go +++ b/models/organization/team_repo_test.go @@ -6,11 +6,11 @@ package organization_test import ( "testing" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/organization" + "gitea.dev/models/perm" + "gitea.dev/models/repo" + "gitea.dev/models/unit" + "gitea.dev/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/organization/team_test.go b/models/organization/team_test.go index fea5e8990a..aa1cc90caa 100644 --- a/models/organization/team_test.go +++ b/models/organization/team_test.go @@ -6,10 +6,10 @@ package organization_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/db" + "gitea.dev/models/organization" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/organization/team_unit.go b/models/organization/team_unit.go index b5237c2c58..0741d28ff1 100644 --- a/models/organization/team_unit.go +++ b/models/organization/team_unit.go @@ -6,9 +6,9 @@ package organization import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" + "gitea.dev/models/db" + "gitea.dev/models/perm" + "gitea.dev/models/unit" ) // TeamUnit describes all units of a repository diff --git a/models/organization/team_user.go b/models/organization/team_user.go index d24a4c5126..069f85c0dc 100644 --- a/models/organization/team_user.go +++ b/models/organization/team_user.go @@ -6,8 +6,8 @@ package organization import ( "context" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" + "gitea.dev/models/db" + user_model "gitea.dev/models/user" "xorm.io/builder" ) diff --git a/models/packages/alpine/search.go b/models/packages/alpine/search.go index 77eccb90ed..c196c6eff6 100644 --- a/models/packages/alpine/search.go +++ b/models/packages/alpine/search.go @@ -6,8 +6,8 @@ package alpine import ( "context" - packages_model "code.gitea.io/gitea/models/packages" - alpine_module "code.gitea.io/gitea/modules/packages/alpine" + packages_model "gitea.dev/models/packages" + alpine_module "gitea.dev/modules/packages/alpine" ) // GetBranches gets all available branches diff --git a/models/packages/arch/search.go b/models/packages/arch/search.go index f35c037b23..fd4e8d1563 100644 --- a/models/packages/arch/search.go +++ b/models/packages/arch/search.go @@ -6,8 +6,8 @@ package arch import ( "context" - packages_model "code.gitea.io/gitea/models/packages" - arch_module "code.gitea.io/gitea/modules/packages/arch" + packages_model "gitea.dev/models/packages" + arch_module "gitea.dev/modules/packages/arch" ) // GetRepositories gets all available repositories diff --git a/models/packages/conan/references.go b/models/packages/conan/references.go index 0d888a1ec8..0a040bdb3f 100644 --- a/models/packages/conan/references.go +++ b/models/packages/conan/references.go @@ -8,11 +8,11 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - conan_module "code.gitea.io/gitea/modules/packages/conan" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/models/packages" + conan_module "gitea.dev/modules/packages/conan" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/packages/conan/search.go b/models/packages/conan/search.go index ab0bff5968..b40d0537b8 100644 --- a/models/packages/conan/search.go +++ b/models/packages/conan/search.go @@ -9,10 +9,10 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/container" - conan_module "code.gitea.io/gitea/modules/packages/conan" + "gitea.dev/models/db" + "gitea.dev/models/packages" + "gitea.dev/modules/container" + conan_module "gitea.dev/modules/packages/conan" "xorm.io/builder" ) diff --git a/models/packages/conda/search.go b/models/packages/conda/search.go index 887441e3b2..5b4973fa74 100644 --- a/models/packages/conda/search.go +++ b/models/packages/conda/search.go @@ -7,9 +7,9 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - conda_module "code.gitea.io/gitea/modules/packages/conda" + "gitea.dev/models/db" + "gitea.dev/models/packages" + conda_module "gitea.dev/modules/packages/conda" "xorm.io/builder" ) diff --git a/models/packages/container/search.go b/models/packages/container/search.go index ac6a6d7fce..df9a2d5537 100644 --- a/models/packages/container/search.go +++ b/models/packages/container/search.go @@ -8,11 +8,11 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - user_model "code.gitea.io/gitea/models/user" - container_module "code.gitea.io/gitea/modules/packages/container" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/models/packages" + user_model "gitea.dev/models/user" + container_module "gitea.dev/modules/packages/container" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/packages/cran/search.go b/models/packages/cran/search.go index 8a8b52a35e..0ff1c31ede 100644 --- a/models/packages/cran/search.go +++ b/models/packages/cran/search.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - cran_module "code.gitea.io/gitea/modules/packages/cran" + "gitea.dev/models/db" + "gitea.dev/models/packages" + cran_module "gitea.dev/modules/packages/cran" "xorm.io/builder" ) diff --git a/models/packages/debian/search.go b/models/packages/debian/search.go index 5333d0c6e4..165e8b8a02 100644 --- a/models/packages/debian/search.go +++ b/models/packages/debian/search.go @@ -7,9 +7,9 @@ import ( "context" "strconv" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - debian_module "code.gitea.io/gitea/modules/packages/debian" + "gitea.dev/models/db" + "gitea.dev/models/packages" + debian_module "gitea.dev/modules/packages/debian" "xorm.io/builder" ) diff --git a/models/packages/descriptor.go b/models/packages/descriptor.go index 2ef27051ee..b5b8634846 100644 --- a/models/packages/descriptor.go +++ b/models/packages/descriptor.go @@ -9,32 +9,32 @@ import ( "fmt" "net/url" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/packages/alpine" - "code.gitea.io/gitea/modules/packages/arch" - "code.gitea.io/gitea/modules/packages/cargo" - "code.gitea.io/gitea/modules/packages/chef" - "code.gitea.io/gitea/modules/packages/composer" - "code.gitea.io/gitea/modules/packages/conan" - "code.gitea.io/gitea/modules/packages/conda" - "code.gitea.io/gitea/modules/packages/container" - "code.gitea.io/gitea/modules/packages/cran" - "code.gitea.io/gitea/modules/packages/debian" - "code.gitea.io/gitea/modules/packages/helm" - "code.gitea.io/gitea/modules/packages/maven" - "code.gitea.io/gitea/modules/packages/npm" - "code.gitea.io/gitea/modules/packages/nuget" - "code.gitea.io/gitea/modules/packages/pub" - "code.gitea.io/gitea/modules/packages/pypi" - "code.gitea.io/gitea/modules/packages/rpm" - "code.gitea.io/gitea/modules/packages/rubygems" - "code.gitea.io/gitea/modules/packages/swift" - "code.gitea.io/gitea/modules/packages/vagrant" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/modules/cache" + "gitea.dev/modules/json" + "gitea.dev/modules/packages/alpine" + "gitea.dev/modules/packages/arch" + "gitea.dev/modules/packages/cargo" + "gitea.dev/modules/packages/chef" + "gitea.dev/modules/packages/composer" + "gitea.dev/modules/packages/conan" + "gitea.dev/modules/packages/conda" + "gitea.dev/modules/packages/container" + "gitea.dev/modules/packages/cran" + "gitea.dev/modules/packages/debian" + "gitea.dev/modules/packages/helm" + "gitea.dev/modules/packages/maven" + "gitea.dev/modules/packages/npm" + "gitea.dev/modules/packages/nuget" + "gitea.dev/modules/packages/pub" + "gitea.dev/modules/packages/pypi" + "gitea.dev/modules/packages/rpm" + "gitea.dev/modules/packages/rubygems" + "gitea.dev/modules/packages/swift" + "gitea.dev/modules/packages/vagrant" + "gitea.dev/modules/util" "github.com/hashicorp/go-version" ) diff --git a/models/packages/nuget/search.go b/models/packages/nuget/search.go index a4b23f31d5..1ec0cece68 100644 --- a/models/packages/nuget/search.go +++ b/models/packages/nuget/search.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" + "gitea.dev/models/db" + packages_model "gitea.dev/models/packages" "xorm.io/builder" ) diff --git a/models/packages/package.go b/models/packages/package.go index 17e5d4eee3..c4cfcdd39c 100644 --- a/models/packages/package.go +++ b/models/packages/package.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/packages/package_blob.go b/models/packages/package_blob.go index e765bbf0c2..db3288a4be 100644 --- a/models/packages/package_blob.go +++ b/models/packages/package_blob.go @@ -8,13 +8,13 @@ import ( "strconv" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/models/perm" + "gitea.dev/models/unit" + user_model "gitea.dev/models/user" + "gitea.dev/modules/structs" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/packages/package_blob_test.go b/models/packages/package_blob_test.go index 8b636b4ee0..b73328d26b 100644 --- a/models/packages/package_blob_test.go +++ b/models/packages/package_blob_test.go @@ -6,7 +6,7 @@ package packages import ( "testing" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/packages/package_blob_upload.go b/models/packages/package_blob_upload.go index 60a55805a8..07afd0591b 100644 --- a/models/packages/package_blob_upload.go +++ b/models/packages/package_blob_upload.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" ) // ErrPackageBlobUploadNotExist indicates a package blob upload not exist error diff --git a/models/packages/package_cleanup_rule.go b/models/packages/package_cleanup_rule.go index fa12dec406..6aca806051 100644 --- a/models/packages/package_cleanup_rule.go +++ b/models/packages/package_cleanup_rule.go @@ -8,9 +8,9 @@ import ( "fmt" "regexp" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/packages/package_file.go b/models/packages/package_file.go index 8715aa5339..d4e6e82d05 100644 --- a/models/packages/package_file.go +++ b/models/packages/package_file.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/packages/package_property.go b/models/packages/package_property.go index 30794ad73c..52815a9e43 100644 --- a/models/packages/package_property.go +++ b/models/packages/package_property.go @@ -7,7 +7,7 @@ import ( "context" "errors" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/builder" ) diff --git a/models/packages/package_test.go b/models/packages/package_test.go index 9c71f2980d..f6eb5b1184 100644 --- a/models/packages/package_test.go +++ b/models/packages/package_test.go @@ -6,13 +6,13 @@ package packages_test import ( "testing" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + packages_model "gitea.dev/models/packages" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" + _ "gitea.dev/models" + _ "gitea.dev/models/actions" + _ "gitea.dev/models/activities" "github.com/stretchr/testify/assert" ) diff --git a/models/packages/package_version.go b/models/packages/package_version.go index 8d26c24130..77b1da43de 100644 --- a/models/packages/package_version.go +++ b/models/packages/package_version.go @@ -8,10 +8,10 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/optional" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/packages/rpm/search.go b/models/packages/rpm/search.go index e697421b49..3c37443ead 100644 --- a/models/packages/rpm/search.go +++ b/models/packages/rpm/search.go @@ -6,8 +6,8 @@ package rpm import ( "context" - packages_model "code.gitea.io/gitea/models/packages" - rpm_module "code.gitea.io/gitea/modules/packages/rpm" + packages_model "gitea.dev/models/packages" + rpm_module "gitea.dev/modules/packages/rpm" ) // GetGroups gets all available groups diff --git a/models/perm/access/access.go b/models/perm/access/access.go index acc34c434e..53d14fca1b 100644 --- a/models/perm/access/access.go +++ b/models/perm/access/access.go @@ -8,13 +8,13 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" + "gitea.dev/models/db" + "gitea.dev/models/organization" + "gitea.dev/models/perm" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + "gitea.dev/modules/structs" "xorm.io/builder" ) diff --git a/models/perm/access/access_test.go b/models/perm/access/access_test.go index 148a02efa3..eb2c58caf5 100644 --- a/models/perm/access/access_test.go +++ b/models/perm/access/access_test.go @@ -6,13 +6,13 @@ package access_test import ( "testing" - "code.gitea.io/gitea/models/db" - perm_model "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + perm_model "gitea.dev/models/perm" + access_model "gitea.dev/models/perm/access" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/perm/access/actions_repo_permission_test.go b/models/perm/access/actions_repo_permission_test.go index 442f6cf2fc..aee097cf93 100644 --- a/models/perm/access/actions_repo_permission_test.go +++ b/models/perm/access/actions_repo_permission_test.go @@ -6,13 +6,13 @@ package access import ( "testing" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - perm_model "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + actions_model "gitea.dev/models/actions" + "gitea.dev/models/db" + perm_model "gitea.dev/models/perm" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unit" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/perm/access/main_test.go b/models/perm/access/main_test.go index 0a350dc41e..e4804124e8 100644 --- a/models/perm/access/main_test.go +++ b/models/perm/access/main_test.go @@ -6,13 +6,13 @@ package access_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/repo" - _ "code.gitea.io/gitea/models/user" + _ "gitea.dev/models" + _ "gitea.dev/models/actions" + _ "gitea.dev/models/activities" + _ "gitea.dev/models/repo" + _ "gitea.dev/models/user" ) func TestMain(m *testing.M) { diff --git a/models/perm/access/repo_permission.go b/models/perm/access/repo_permission.go index 21821f1746..6e52177f0a 100644 --- a/models/perm/access/repo_permission.go +++ b/models/perm/access/repo_permission.go @@ -11,17 +11,17 @@ import ( "slices" "strings" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - perm_model "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + actions_model "gitea.dev/models/actions" + "gitea.dev/models/db" + "gitea.dev/models/organization" + perm_model "gitea.dev/models/perm" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unit" + user_model "gitea.dev/models/user" + "gitea.dev/modules/container" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" ) // Permission contains all the permissions related variables to a repository for a user @@ -655,3 +655,37 @@ func CheckRepoUnitUser(ctx context.Context, repo *repo_model.Repository, user *u func PermissionNoAccess() Permission { return Permission{AccessMode: perm_model.AccessModeNone} } + +// CanReadWorkflowCrossRepo checks whether the run can read workflow files from targetRepo. +func CanReadWorkflowCrossRepo(ctx context.Context, targetRepo *repo_model.Repository, run *actions_model.ActionRun) (bool, error) { + if err := run.LoadRepo(ctx); err != nil { + return false, err + } + + // (1) Same owner: always allowed (fork-PR scrubbing handled inside). + if checkSameOwnerCrossRepoAccess(ctx, run.Repo, targetRepo, run.IsForkPullRequest) { + return true, nil + } + + // (2) Cross-owner: respect the target repo's collaborative-owner allowlist on its Actions unit. + // The caller (run.Repo) must itself be private. The collaborative-owner grant is owner-level, so without this + // guard a public caller owned by a grantee could pull a private reusable workflow and expose its definition and + // logs in a publicly visible run; requiring a private caller keeps private content flowing private -> private. + // This is intentionally stricter than GitHub, which gates on the target repo's access setting (introduced in #32562): + // https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository#allowing-access-to-components-in-a-private-repository + if run.Repo.IsPrivate { + if actionsUnit, err := targetRepo.GetUnit(ctx, unit.TypeActions); err == nil { + if actionsUnit.ActionsConfig().IsCollaborativeOwner(run.Repo.OwnerID) { + return true, nil + } + } + } + + // (3) Public target: the Actions user's individual permission gives read on any public repo, so `uses:` to a public reusable-workflow library is permitted by default. + // Matches GitHub's behavior: public reusable workflows are universally readable. + botPerm, err := GetIndividualUserRepoPermission(ctx, targetRepo, user_model.NewActionsUser()) + if err != nil { + return false, err + } + return botPerm.AccessMode >= perm_model.AccessModeRead, nil +} diff --git a/models/perm/access/repo_permission_test.go b/models/perm/access/repo_permission_test.go index 29a8dac71d..b5c82afb29 100644 --- a/models/perm/access/repo_permission_test.go +++ b/models/perm/access/repo_permission_test.go @@ -6,14 +6,14 @@ package access import ( "testing" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - perm_model "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + actions_model "gitea.dev/models/actions" + "gitea.dev/models/db" + "gitea.dev/models/organization" + perm_model "gitea.dev/models/perm" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unit" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/perm/access_mode.go b/models/perm/access_mode.go index 6baeb5531a..3be195b48d 100644 --- a/models/perm/access_mode.go +++ b/models/perm/access_mode.go @@ -7,7 +7,7 @@ import ( "fmt" "slices" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/util" ) // AccessMode specifies the users access mode diff --git a/models/project/column.go b/models/project/column.go index 9c9abb4599..06b59897f8 100644 --- a/models/project/column.go +++ b/models/project/column.go @@ -9,10 +9,10 @@ import ( "fmt" "regexp" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/setting" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/project/column_test.go b/models/project/column_test.go index 6437a764ed..ef6016a50d 100644 --- a/models/project/column_test.go +++ b/models/project/column_test.go @@ -7,7 +7,7 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/project/issue.go b/models/project/issue.go index c89f524305..cf1619a773 100644 --- a/models/project/issue.go +++ b/models/project/issue.go @@ -7,8 +7,8 @@ import ( "context" "errors" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/util" ) // ProjectIssue saves relation from issue to a project diff --git a/models/project/main_test.go b/models/project/main_test.go index f4b2d6feda..f52242c98a 100644 --- a/models/project/main_test.go +++ b/models/project/main_test.go @@ -6,9 +6,9 @@ package project import ( "testing" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/unittest" - _ "code.gitea.io/gitea/models/repo" + _ "gitea.dev/models/repo" ) func TestMain(m *testing.M) { diff --git a/models/project/project.go b/models/project/project.go index 7fcef430f2..546409c5d5 100644 --- a/models/project/project.go +++ b/models/project/project.go @@ -8,14 +8,14 @@ import ( "fmt" "html/template" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/modules/log" + "gitea.dev/modules/optional" + "gitea.dev/modules/setting" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/project/project_test.go b/models/project/project_test.go index 4b24615979..b28bca9256 100644 --- a/models/project/project_test.go +++ b/models/project/project_test.go @@ -6,9 +6,9 @@ package project import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/models/unittest" + "gitea.dev/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/pull/automerge.go b/models/pull/automerge.go index d32dc847d2..5415009fde 100644 --- a/models/pull/automerge.go +++ b/models/pull/automerge.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + "gitea.dev/modules/timeutil" ) // AutoMerge represents a pull request scheduled for merging when checks succeed diff --git a/models/pull/review_state.go b/models/pull/review_state.go index a0f5548dd4..241a79d1df 100644 --- a/models/pull/review_state.go +++ b/models/pull/review_state.go @@ -8,9 +8,9 @@ import ( "fmt" "maps" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/log" + "gitea.dev/modules/timeutil" ) // ViewedState stores for a file in which state it is currently viewed diff --git a/models/renderhelper/commit_checker.go b/models/renderhelper/commit_checker.go index 407e45fb54..faf2d94eb0 100644 --- a/models/renderhelper/commit_checker.go +++ b/models/renderhelper/commit_checker.go @@ -7,9 +7,9 @@ import ( "context" "io" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/git" + "gitea.dev/modules/gitrepo" + "gitea.dev/modules/log" ) type commitChecker struct { diff --git a/models/renderhelper/main_test.go b/models/renderhelper/main_test.go index 311207e855..ebca113219 100644 --- a/models/renderhelper/main_test.go +++ b/models/renderhelper/main_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/markup" + "gitea.dev/models/unittest" + "gitea.dev/modules/markup" ) func testRenderString(ctx *markup.RenderContext, content string) (string, error) { diff --git a/models/renderhelper/repo_comment.go b/models/renderhelper/repo_comment.go index d1c587671b..16e130a776 100644 --- a/models/renderhelper/repo_comment.go +++ b/models/renderhelper/repo_comment.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/util" + repo_model "gitea.dev/models/repo" + "gitea.dev/modules/markup" + "gitea.dev/modules/util" ) type RepoComment struct { diff --git a/models/renderhelper/repo_comment_test.go b/models/renderhelper/repo_comment_test.go index e181a5bdb5..03b3fcfae6 100644 --- a/models/renderhelper/repo_comment_test.go +++ b/models/renderhelper/repo_comment_test.go @@ -6,9 +6,9 @@ package renderhelper import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/markup/markdown" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + "gitea.dev/modules/markup/markdown" "github.com/stretchr/testify/assert" ) diff --git a/models/renderhelper/repo_file.go b/models/renderhelper/repo_file.go index d9aa71b727..0251de8da3 100644 --- a/models/renderhelper/repo_file.go +++ b/models/renderhelper/repo_file.go @@ -8,9 +8,9 @@ import ( "fmt" "path" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/util" + repo_model "gitea.dev/models/repo" + "gitea.dev/modules/markup" + "gitea.dev/modules/util" ) type RepoFile struct { diff --git a/models/renderhelper/repo_file_test.go b/models/renderhelper/repo_file_test.go index cb2852b3e3..bb95501bec 100644 --- a/models/renderhelper/repo_file_test.go +++ b/models/renderhelper/repo_file_test.go @@ -6,11 +6,11 @@ package renderhelper import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/markup/markdown" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + "gitea.dev/modules/markup/markdown" - _ "code.gitea.io/gitea/modules/markup/orgmode" + _ "gitea.dev/modules/markup/orgmode" "github.com/stretchr/testify/assert" ) diff --git a/models/renderhelper/repo_wiki.go b/models/renderhelper/repo_wiki.go index 61e2b570e5..9ebd54cfb2 100644 --- a/models/renderhelper/repo_wiki.go +++ b/models/renderhelper/repo_wiki.go @@ -8,10 +8,10 @@ import ( "fmt" "path" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/util" + repo_model "gitea.dev/models/repo" + "gitea.dev/modules/markup" + "gitea.dev/modules/markup/markdown" + "gitea.dev/modules/util" ) type RepoWiki struct { diff --git a/models/renderhelper/repo_wiki_test.go b/models/renderhelper/repo_wiki_test.go index 880fe3961d..2061bcc8f1 100644 --- a/models/renderhelper/repo_wiki_test.go +++ b/models/renderhelper/repo_wiki_test.go @@ -6,9 +6,9 @@ package renderhelper import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/markup/markdown" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + "gitea.dev/modules/markup/markdown" "github.com/stretchr/testify/assert" ) diff --git a/models/renderhelper/simple_document.go b/models/renderhelper/simple_document.go index 9b3dacaea3..4dacc34b23 100644 --- a/models/renderhelper/simple_document.go +++ b/models/renderhelper/simple_document.go @@ -6,7 +6,7 @@ package renderhelper import ( "context" - "code.gitea.io/gitea/modules/markup" + "gitea.dev/modules/markup" ) type SimpleDocument struct { diff --git a/models/renderhelper/simple_document_test.go b/models/renderhelper/simple_document_test.go index 217891398c..b07c75a259 100644 --- a/models/renderhelper/simple_document_test.go +++ b/models/renderhelper/simple_document_test.go @@ -6,8 +6,8 @@ package renderhelper import ( "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/markup/markdown" + "gitea.dev/models/unittest" + "gitea.dev/modules/markup/markdown" "github.com/stretchr/testify/assert" ) diff --git a/models/repo.go b/models/repo.go index 34e7b10803..c0f59e3bda 100644 --- a/models/repo.go +++ b/models/repo.go @@ -9,12 +9,12 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" + "gitea.dev/models/db" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unit" + user_model "gitea.dev/models/user" + "gitea.dev/modules/log" _ "image/jpeg" // Needed for jpeg support diff --git a/models/repo/archiver.go b/models/repo/archiver.go index ca981a178c..751fbf4b9c 100644 --- a/models/repo/archiver.go +++ b/models/repo/archiver.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/repo/attachment.go b/models/repo/attachment.go index 27856f2d2e..b7136b657b 100644 --- a/models/repo/attachment.go +++ b/models/repo/attachment.go @@ -11,12 +11,12 @@ import ( "os" "path" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/modules/storage" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" ) // Attachment represent a attachment of issue/comment/release. diff --git a/models/repo/attachment_test.go b/models/repo/attachment_test.go index 07f4c587a7..a9d7631856 100644 --- a/models/repo/attachment_test.go +++ b/models/repo/attachment_test.go @@ -6,8 +6,8 @@ package repo_test import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/avatar.go b/models/repo/avatar.go index bfb08d9982..3dde6a8e03 100644 --- a/models/repo/avatar.go +++ b/models/repo/avatar.go @@ -11,12 +11,12 @@ import ( "net/url" "strconv" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/avatar" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" + "gitea.dev/models/db" + "gitea.dev/modules/avatar" + "gitea.dev/modules/httplib" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/modules/storage" ) // CustomAvatarRelativePath returns repository custom avatar file path. diff --git a/models/repo/avatar_test.go b/models/repo/avatar_test.go index f683a13e84..9d895912d7 100644 --- a/models/repo/avatar_test.go +++ b/models/repo/avatar_test.go @@ -6,8 +6,8 @@ package repo import ( "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/collaboration.go b/models/repo/collaboration.go index 272c6ac05b..5748265f96 100644 --- a/models/repo/collaboration.go +++ b/models/repo/collaboration.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/models/perm" + "gitea.dev/models/unit" + user_model "gitea.dev/models/user" + "gitea.dev/modules/timeutil" "xorm.io/builder" ) diff --git a/models/repo/collaboration_test.go b/models/repo/collaboration_test.go index 7e06bffb72..602cf650b4 100644 --- a/models/repo/collaboration_test.go +++ b/models/repo/collaboration_test.go @@ -6,11 +6,11 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/db" + "gitea.dev/models/perm" + access_model "gitea.dev/models/perm/access" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/fork.go b/models/repo/fork.go index 80b3e5634e..84f648e870 100644 --- a/models/repo/fork.go +++ b/models/repo/fork.go @@ -6,8 +6,8 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" + "gitea.dev/models/db" + user_model "gitea.dev/models/user" "xorm.io/builder" ) diff --git a/models/repo/fork_test.go b/models/repo/fork_test.go index e33b6f2f0a..ddeeb42942 100644 --- a/models/repo/fork_test.go +++ b/models/repo/fork_test.go @@ -6,8 +6,8 @@ package repo_test import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/git.go b/models/repo/git.go index b2e434a076..8da93e393e 100644 --- a/models/repo/git.go +++ b/models/repo/git.go @@ -6,7 +6,7 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) // MergeStyle represents the approach to merge commits into base branch. diff --git a/models/repo/issue.go b/models/repo/issue.go index 0dd4fd5ed4..4995971859 100644 --- a/models/repo/issue.go +++ b/models/repo/issue.go @@ -6,9 +6,9 @@ package repo import ( "context" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/unit" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" ) // ___________.__ ___________ __ diff --git a/models/repo/language_stats.go b/models/repo/language_stats.go index 1cddd25f1d..daa2ab80e4 100644 --- a/models/repo/language_stats.go +++ b/models/repo/language_stats.go @@ -9,8 +9,8 @@ import ( "sort" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" "github.com/go-enry/go-enry/v2" ) diff --git a/models/repo/license.go b/models/repo/license.go index 9bcf0f7bc9..3ab721a9de 100644 --- a/models/repo/license.go +++ b/models/repo/license.go @@ -6,8 +6,8 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) func init() { diff --git a/models/repo/main_test.go b/models/repo/main_test.go index b49855f2c8..277d42343b 100644 --- a/models/repo/main_test.go +++ b/models/repo/main_test.go @@ -6,14 +6,14 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/unittest" - _ "code.gitea.io/gitea/models" // register table model - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/perm/access" // register table model - _ "code.gitea.io/gitea/models/repo" // register table model - _ "code.gitea.io/gitea/models/user" // register table model + _ "gitea.dev/models" // register table model + _ "gitea.dev/models/actions" + _ "gitea.dev/models/activities" + _ "gitea.dev/models/perm/access" // register table model + _ "gitea.dev/models/repo" // register table model + _ "gitea.dev/models/user" // register table model ) func TestMain(m *testing.M) { diff --git a/models/repo/mirror.go b/models/repo/mirror.go index f2c9db1843..8c4c9471dc 100644 --- a/models/repo/mirror.go +++ b/models/repo/mirror.go @@ -8,11 +8,11 @@ import ( "context" "time" - "code.gitea.io/gitea/models/db" - giturl "code.gitea.io/gitea/modules/git/url" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + giturl "gitea.dev/modules/git/url" + "gitea.dev/modules/log" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" ) // ErrMirrorNotExist mirror does not exist error diff --git a/models/repo/mirror_ssh_keypair.go b/models/repo/mirror_ssh_keypair.go index 6ac6c170f5..2c902bc0a7 100644 --- a/models/repo/mirror_ssh_keypair.go +++ b/models/repo/mirror_ssh_keypair.go @@ -10,11 +10,11 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + user_model "gitea.dev/models/user" + "gitea.dev/modules/secret" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" "golang.org/x/crypto/ssh" ) diff --git a/models/repo/mirror_ssh_keypair_test.go b/models/repo/mirror_ssh_keypair_test.go index ca3f1b8329..b89321f06e 100644 --- a/models/repo/mirror_ssh_keypair_test.go +++ b/models/repo/mirror_ssh_keypair_test.go @@ -7,10 +7,10 @@ import ( "crypto/ed25519" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/org_repo.go b/models/repo/org_repo.go index d8c2c91fec..ef4d9a4a62 100644 --- a/models/repo/org_repo.go +++ b/models/repo/org_repo.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - org_model "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" + "gitea.dev/models/db" + org_model "gitea.dev/models/organization" + user_model "gitea.dev/models/user" "xorm.io/builder" ) diff --git a/models/repo/pull_request_default.go b/models/repo/pull_request_default.go index 89f8eb6a2c..ba5d5f7535 100644 --- a/models/repo/pull_request_default.go +++ b/models/repo/pull_request_default.go @@ -6,8 +6,8 @@ package repo import ( "context" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/unit" + "gitea.dev/modules/util" ) func (repo *Repository) GetPullRequestTargetBranch(ctx context.Context) string { diff --git a/models/repo/pull_request_default_test.go b/models/repo/pull_request_default_test.go index 9fad9eaad3..40be8d6573 100644 --- a/models/repo/pull_request_default_test.go +++ b/models/repo/pull_request_default_test.go @@ -6,9 +6,9 @@ package repo import ( "testing" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/unit" + "gitea.dev/models/unittest" + "gitea.dev/modules/util" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/pushmirror.go b/models/repo/pushmirror.go index 55e8f3a068..fc2b1b9e1a 100644 --- a/models/repo/pushmirror.go +++ b/models/repo/pushmirror.go @@ -7,11 +7,11 @@ import ( "context" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/log" + "gitea.dev/modules/optional" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/repo/pushmirror_test.go b/models/repo/pushmirror_test.go index 777cc5982f..f4e25e67e5 100644 --- a/models/repo/pushmirror_test.go +++ b/models/repo/pushmirror_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + "gitea.dev/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/redirect.go b/models/repo/redirect.go index 61789ebefa..405feb5782 100644 --- a/models/repo/redirect.go +++ b/models/repo/redirect.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/util" ) // ErrRedirectNotExist represents a "RedirectNotExist" kind of error. diff --git a/models/repo/redirect_test.go b/models/repo/redirect_test.go index aa5e5b7c6b..bceaf86921 100644 --- a/models/repo/redirect_test.go +++ b/models/repo/redirect_test.go @@ -6,8 +6,8 @@ package repo_test import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/release.go b/models/repo/release.go index e2010c8a38..2c3ee18757 100644 --- a/models/repo/release.go +++ b/models/repo/release.go @@ -13,13 +13,13 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + user_model "gitea.dev/models/user" + "gitea.dev/modules/container" + "gitea.dev/modules/optional" + "gitea.dev/modules/structs" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/repo/release_test.go b/models/repo/release_test.go index 2a09ffb36d..932775ae94 100644 --- a/models/repo/release_test.go +++ b/models/repo/release_test.go @@ -6,9 +6,9 @@ package repo import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/models/unittest" + "gitea.dev/modules/util" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/repo.go b/models/repo/repo.go index 7814bb4876..7f8507722f 100644 --- a/models/repo/repo.go +++ b/models/repo/repo.go @@ -17,20 +17,20 @@ import ( "strings" "sync" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - giturl "code.gitea.io/gitea/modules/git/url" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/models/unit" + user_model "gitea.dev/models/user" + "gitea.dev/modules/base" + "gitea.dev/modules/git" + giturl "gitea.dev/modules/git/url" + "gitea.dev/modules/httplib" + "gitea.dev/modules/log" + "gitea.dev/modules/markup" + "gitea.dev/modules/optional" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/repo/repo_indexer.go b/models/repo/repo_indexer.go index 6e19d8f937..2f8ca777cf 100644 --- a/models/repo/repo_indexer.go +++ b/models/repo/repo_indexer.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "xorm.io/builder" ) diff --git a/models/repo/repo_list.go b/models/repo/repo_list.go index 25dee1bf0e..d0e5dd8f60 100644 --- a/models/repo/repo_list.go +++ b/models/repo/repo_list.go @@ -8,15 +8,15 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/models/perm" + "gitea.dev/models/unit" + user_model "gitea.dev/models/user" + "gitea.dev/modules/container" + "gitea.dev/modules/optional" + "gitea.dev/modules/setting" + "gitea.dev/modules/structs" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/repo/repo_list_test.go b/models/repo/repo_list_test.go index 943e0c5025..78ede84150 100644 --- a/models/repo/repo_list_test.go +++ b/models/repo/repo_list_test.go @@ -7,14 +7,14 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/optional" + "gitea.dev/modules/setting" + "gitea.dev/modules/structs" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/repo_test.go b/models/repo/repo_test.go index ce17789a3b..f23e4c6468 100644 --- a/models/repo/repo_test.go +++ b/models/repo/repo_test.go @@ -6,13 +6,13 @@ package repo import ( "testing" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "gitea.dev/models/unit" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/markup" + "gitea.dev/modules/optional" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/repo_unit.go b/models/repo/repo_unit.go index e7204923a2..5de5b6e4f3 100644 --- a/models/repo/repo_unit.go +++ b/models/repo/repo_unit.go @@ -6,13 +6,13 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/models/perm" + "gitea.dev/models/unit" + "gitea.dev/modules/json" + "gitea.dev/modules/setting" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/xorm" "xorm.io/xorm/convert" diff --git a/models/repo/repo_unit_actions.go b/models/repo/repo_unit_actions.go index 50e2925792..da162027b4 100644 --- a/models/repo/repo_unit_actions.go +++ b/models/repo/repo_unit_actions.go @@ -6,10 +6,10 @@ package repo import ( "slices" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/perm" + "gitea.dev/models/unit" + "gitea.dev/modules/json" + "gitea.dev/modules/util" ) // ActionsTokenPermissionMode defines the default permission mode for Actions tokens diff --git a/models/repo/repo_unit_test.go b/models/repo/repo_unit_test.go index 08f9ac2cd4..d0a6caaf1a 100644 --- a/models/repo/repo_unit_test.go +++ b/models/repo/repo_unit_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" + "gitea.dev/models/perm" + "gitea.dev/models/unit" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/search.go b/models/repo/search.go index ffb8e26745..e91241e849 100644 --- a/models/repo/search.go +++ b/models/repo/search.go @@ -3,7 +3,7 @@ package repo -import "code.gitea.io/gitea/models/db" +import "gitea.dev/models/db" // OrderByMap represents all possible search order var OrderByMap = map[string]map[string]db.SearchOrderBy{ diff --git a/models/repo/star.go b/models/repo/star.go index dec80f51db..c3f1203fec 100644 --- a/models/repo/star.go +++ b/models/repo/star.go @@ -6,9 +6,9 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + user_model "gitea.dev/models/user" + "gitea.dev/modules/timeutil" ) // Star represents a starred repo by a user. diff --git a/models/repo/star_test.go b/models/repo/star_test.go index 4fd256cd08..d81c3a1685 100644 --- a/models/repo/star_test.go +++ b/models/repo/star_test.go @@ -6,10 +6,10 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/topic.go b/models/repo/topic.go index 14017da2d0..8656d33418 100644 --- a/models/repo/topic.go +++ b/models/repo/topic.go @@ -9,10 +9,10 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/container" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/repo/topic_test.go b/models/repo/topic_test.go index 903b9ad3fa..09b75e5c60 100644 --- a/models/repo/topic_test.go +++ b/models/repo/topic_test.go @@ -6,9 +6,9 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/transfer.go b/models/repo/transfer.go index 3fb8cb69ab..90916e0ddb 100644 --- a/models/repo/transfer.go +++ b/models/repo/transfer.go @@ -8,12 +8,12 @@ import ( "errors" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/models/organization" + user_model "gitea.dev/models/user" + "gitea.dev/modules/log" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/repo/update.go b/models/repo/update.go index bf560cf695..5f5e8eb7e5 100644 --- a/models/repo/update.go +++ b/models/repo/update.go @@ -8,8 +8,8 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/util" ) // UpdateRepositoryOwnerNames updates repository owner_names (this should only be used when the ownerName has changed case) diff --git a/models/repo/upload.go b/models/repo/upload.go index b9bda8fdbf..d850d34bf1 100644 --- a/models/repo/upload.go +++ b/models/repo/upload.go @@ -12,10 +12,10 @@ import ( "os" "path/filepath" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" gouuid "github.com/google/uuid" ) diff --git a/models/repo/user_repo.go b/models/repo/user_repo.go index e4b0a1b067..94425c0a1d 100644 --- a/models/repo/user_repo.go +++ b/models/repo/user_repo.go @@ -7,12 +7,12 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" + "gitea.dev/models/db" + "gitea.dev/models/organization" + "gitea.dev/models/perm" + "gitea.dev/models/unit" + user_model "gitea.dev/models/user" + "gitea.dev/modules/container" "xorm.io/builder" ) diff --git a/models/repo/user_repo_test.go b/models/repo/user_repo_test.go index cd45db61d0..d21c77aa0a 100644 --- a/models/repo/user_repo_test.go +++ b/models/repo/user_repo_test.go @@ -6,14 +6,14 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - perm_model "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "gitea.dev/models/db" + "gitea.dev/models/organization" + perm_model "gitea.dev/models/perm" + access_model "gitea.dev/models/perm/access" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unit" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/watch.go b/models/repo/watch.go index 610077816f..3d349dde3e 100644 --- a/models/repo/watch.go +++ b/models/repo/watch.go @@ -6,10 +6,10 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + "gitea.dev/modules/timeutil" ) // WatchMode specifies what kind of watch the user has on a repository diff --git a/models/repo/watch_test.go b/models/repo/watch_test.go index 97576fb787..a0603e38d8 100644 --- a/models/repo/watch_test.go +++ b/models/repo/watch_test.go @@ -6,11 +6,11 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/wiki.go b/models/repo/wiki.go index 47c8fa43ab..cbc1229c9f 100644 --- a/models/repo/wiki.go +++ b/models/repo/wiki.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/util" + user_model "gitea.dev/models/user" + "gitea.dev/modules/util" ) // ErrWikiAlreadyExist represents a "WikiAlreadyExist" kind of error. diff --git a/models/repo/wiki_test.go b/models/repo/wiki_test.go index 636c78009b..62a881f6f8 100644 --- a/models/repo/wiki_test.go +++ b/models/repo/wiki_test.go @@ -6,8 +6,8 @@ package repo_test import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/repo_test.go b/models/repo_test.go index 5273b9d838..059ceab709 100644 --- a/models/repo_test.go +++ b/models/repo_test.go @@ -6,8 +6,8 @@ package models import ( "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" + issues_model "gitea.dev/models/issues" + "gitea.dev/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/secret/main_test.go b/models/secret/main_test.go new file mode 100644 index 0000000000..bd74c3f5c9 --- /dev/null +++ b/models/secret/main_test.go @@ -0,0 +1,14 @@ +// Copyright 2026 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package secret + +import ( + "testing" + + "gitea.dev/models/unittest" +) + +func TestMain(m *testing.M) { + unittest.MainTest(m) +} diff --git a/models/secret/secret.go b/models/secret/secret.go index a82a924c39..8d4cfd3e64 100644 --- a/models/secret/secret.go +++ b/models/secret/secret.go @@ -8,14 +8,16 @@ import ( "fmt" "strings" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - actions_module "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/log" - secret_module "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + actions_model "gitea.dev/models/actions" + "gitea.dev/models/db" + actions_module "gitea.dev/modules/actions" + "gitea.dev/modules/actions/jobparser" + "gitea.dev/modules/json" + "gitea.dev/modules/log" + secret_module "gitea.dev/modules/secret" + "gitea.dev/modules/setting" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) @@ -152,16 +154,16 @@ func UpdateSecret(ctx context.Context, secretID int64, data, description string) } func GetSecretsOfTask(ctx context.Context, task *actions_model.ActionTask) (map[string]string, error) { - secrets := map[string]string{} + baseSecrets := map[string]string{} - secrets["GITHUB_TOKEN"] = task.Token - secrets["GITEA_TOKEN"] = task.Token + baseSecrets["GITHUB_TOKEN"] = task.Token + baseSecrets["GITEA_TOKEN"] = task.Token if task.Job.Run.IsForkPullRequest && task.Job.Run.TriggerEvent != actions_module.GithubEventPullRequestTarget { // ignore secrets for fork pull request, except GITHUB_TOKEN and GITEA_TOKEN which are automatically generated. // for the tasks triggered by pull_request_target event, they could access the secrets because they will run in the context of the base branch // see the documentation: https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target - return secrets, nil + return baseSecrets, nil } ownerSecrets, err := db.Find[Secret](ctx, FindSecretsOptions{OwnerID: task.Job.Run.Repo.OwnerID}) @@ -181,10 +183,60 @@ func GetSecretsOfTask(ctx context.Context, task *actions_model.ActionTask) (map[ log.Error("Unable to decrypt Actions secret %v %q, maybe SECRET_KEY is wrong: %v", secret.ID, secret.Name, err) continue } - secrets[secret.Name] = v + baseSecrets[secret.Name] = v } - return secrets, nil + return getScopedSecretsForJob(ctx, task.Job, baseSecrets) +} + +// getScopedSecretsForJob walks up the caller chain (ParentJobID) and applies +// each caller's secrets policy: +// - "secrets: inherit" passes the parent scope's secrets through unchanged. +// - explicit mapping {alias: SOURCE} only forwards the named secrets, plus the auto-generated tokens. +// +// For top-level jobs (ParentJobID == 0) the base secrets are returned as-is. +func getScopedSecretsForJob(ctx context.Context, job *actions_model.ActionRunJob, baseSecrets map[string]string) (map[string]string, error) { + if job.ParentJobID == 0 { + return baseSecrets, nil + } + + caller, err := actions_model.GetRunJobByRunAndID(ctx, job.RunID, job.ParentJobID) + if err != nil { + return nil, fmt.Errorf("load caller job %d: %w", job.ParentJobID, err) + } + + parentScope, err := getScopedSecretsForJob(ctx, caller, baseSecrets) + if err != nil { + return nil, err + } + + if caller.CallSecrets == jobparser.SecretsInherit { + return parentScope, nil + } + + // Empty or explicit-mapping path: only auto-tokens + (any) mapped aliases are exposed. + scoped := map[string]string{ + "GITHUB_TOKEN": baseSecrets["GITHUB_TOKEN"], + "GITEA_TOKEN": baseSecrets["GITEA_TOKEN"], + } + if caller.CallSecrets == "" { + return scoped, nil + } + var mapping map[string]string + if err := json.Unmarshal([]byte(caller.CallSecrets), &mapping); err != nil { + return nil, fmt.Errorf("decode caller %d secret map: %w", caller.ID, err) + } + for alias, source := range mapping { + if v, ok := parentScope[source]; ok { + scoped[alias] = v + continue + } + // Secret names are case-insensitive in storage (uppercased). + if v, ok := parentScope[strings.ToUpper(source)]; ok { + scoped[alias] = v + } + } + return scoped, nil } func CountWrongRepoLevelSecrets(ctx context.Context) (int64, error) { diff --git a/models/secret/secret_test.go b/models/secret/secret_test.go new file mode 100644 index 0000000000..11dd0f750c --- /dev/null +++ b/models/secret/secret_test.go @@ -0,0 +1,174 @@ +// Copyright 2026 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package secret + +import ( + "testing" + + actions_model "gitea.dev/models/actions" + "gitea.dev/models/db" + "gitea.dev/models/unittest" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestGetScopedSecretsForJob(t *testing.T) { + require.NoError(t, unittest.PrepareTestDatabase()) + ctx := t.Context() + + base := map[string]string{ + "GITHUB_TOKEN": "tok", + "GITEA_TOKEN": "tok", + "PROD_API_KEY": "prod-secret", + "DEV_API_KEY": "dev-secret", + } + + // insertCaller create an ActionRunJob caller row with the given CallSecrets policy + insertCaller := func(t *testing.T, runID, parentJobID int64, callSecrets string) *actions_model.ActionRunJob { + t.Helper() + job := &actions_model.ActionRunJob{ + RunID: runID, + RepoID: 1, + IsReusableCaller: true, + ParentJobID: parentJobID, + CallSecrets: callSecrets, + Status: actions_model.StatusBlocked, + } + require.NoError(t, db.Insert(t.Context(), job)) + return job + } + + t.Run("TopLevelJob_ReturnsBaseUnchanged", func(t *testing.T) { + const runID = 9001 + leaf := &actions_model.ActionRunJob{RunID: runID, ParentJobID: 0} + + got, err := getScopedSecretsForJob(ctx, leaf, base) + require.NoError(t, err) + assert.Equal(t, base, got, "top-level jobs should see the full base scope") + }) + + t.Run("CallerInherit_PassesParentScopeThrough", func(t *testing.T) { + const runID = 9002 + caller := insertCaller(t, runID, 0, "inherit") + leaf := &actions_model.ActionRunJob{RunID: runID, ParentJobID: caller.ID} + + got, err := getScopedSecretsForJob(ctx, leaf, base) + require.NoError(t, err) + assert.Equal(t, base, got, "secrets: inherit forwards everything from parent scope") + }) + + t.Run("CallerEmptySecrets_ExposesOnlyAutoTokens", func(t *testing.T) { + const runID = 9003 + caller := insertCaller(t, runID, 0, "") + leaf := &actions_model.ActionRunJob{RunID: runID, ParentJobID: caller.ID} + + got, err := getScopedSecretsForJob(ctx, leaf, base) + require.NoError(t, err) + assert.Equal(t, map[string]string{ + "GITHUB_TOKEN": "tok", + "GITEA_TOKEN": "tok", + }, got) + }) + + t.Run("CallerMapping_OnlyMappedAliasesPlusTokens", func(t *testing.T) { + const runID = 9004 + // {alias: source} - the called workflow sees `secrets.MY_KEY` resolved to PROD_API_KEY's value. + caller := insertCaller(t, runID, 0, `{"MY_KEY":"PROD_API_KEY"}`) + leaf := &actions_model.ActionRunJob{RunID: runID, ParentJobID: caller.ID} + + got, err := getScopedSecretsForJob(ctx, leaf, base) + require.NoError(t, err) + assert.Equal(t, map[string]string{ + "GITHUB_TOKEN": "tok", + "GITEA_TOKEN": "tok", + "MY_KEY": "prod-secret", + // no "dev-secret" + }, got) + }) + + t.Run("CallerMapping_CaseInsensitiveSource", func(t *testing.T) { + const runID = 9005 + caller := insertCaller(t, runID, 0, `{"alias":"prod_api_key"}`) + leaf := &actions_model.ActionRunJob{RunID: runID, ParentJobID: caller.ID} + + got, err := getScopedSecretsForJob(ctx, leaf, base) + require.NoError(t, err) + assert.Equal(t, "prod-secret", got["alias"]) + }) + + t.Run("CallerMapping_UnknownSourceDropsAlias", func(t *testing.T) { + const runID = 9006 + // alias points at a non-existent secret name, so it must be dropped. + caller := insertCaller(t, runID, 0, `{"MAPPED_ALIAS":"DOES_NOT_EXIST"}`) + leaf := &actions_model.ActionRunJob{RunID: runID, ParentJobID: caller.ID} + + got, err := getScopedSecretsForJob(ctx, leaf, base) + require.NoError(t, err) + _, present := got["MAPPED_ALIAS"] + assert.False(t, present) + }) + + t.Run("Nested_InheritThenInherit_FullScope", func(t *testing.T) { + const runID = 9007 + outer := insertCaller(t, runID, 0, "inherit") + inner := insertCaller(t, runID, outer.ID, "inherit") + leaf := &actions_model.ActionRunJob{RunID: runID, ParentJobID: inner.ID} + + got, err := getScopedSecretsForJob(ctx, leaf, base) + require.NoError(t, err) + assert.Equal(t, base, got, "inherit-then-inherit should pass the full base scope through") + }) + + t.Run("Nested_InheritThenMapping_InnerNarrows", func(t *testing.T) { + const runID = 9008 + // inner mapping narrows the full scope it inherited from outer. + outer := insertCaller(t, runID, 0, "inherit") + inner := insertCaller(t, runID, outer.ID, `{"ALIAS_OUT":"PROD_API_KEY"}`) + leaf := &actions_model.ActionRunJob{RunID: runID, ParentJobID: inner.ID} + + got, err := getScopedSecretsForJob(ctx, leaf, base) + require.NoError(t, err) + assert.Equal(t, map[string]string{ + "GITHUB_TOKEN": "tok", + "GITEA_TOKEN": "tok", + "ALIAS_OUT": "prod-secret", + // no "dev-secret" + }, got) + }) + + t.Run("Nested_MappingThenInherit_OuterNarrows", func(t *testing.T) { + const runID = 9009 + // inner inherits outer's already-narrowed scope, so leaf sees only auto-tokens + OUTER_ALIAS. + outer := insertCaller(t, runID, 0, `{"OUTER_ALIAS":"PROD_API_KEY"}`) + inner := insertCaller(t, runID, outer.ID, "inherit") + leaf := &actions_model.ActionRunJob{RunID: runID, ParentJobID: inner.ID} + + got, err := getScopedSecretsForJob(ctx, leaf, base) + require.NoError(t, err) + assert.Equal(t, map[string]string{ + "GITHUB_TOKEN": "tok", + "GITEA_TOKEN": "tok", + "OUTER_ALIAS": "prod-secret", + // no "dev-secret" + }, got) + }) + + t.Run("Nested_MappingThenMapping_InnerSourceMustExistInOuterScope", func(t *testing.T) { + const runID = 9010 + // inner can rename ALIAS_A (in outer's scope) to ALIAS_C, but cannot forward DEV_API_KEY, which outer dropped. + outer := insertCaller(t, runID, 0, `{"ALIAS_A":"PROD_API_KEY"}`) + inner := insertCaller(t, runID, outer.ID, `{"ALIAS_B":"DEV_API_KEY","ALIAS_C":"ALIAS_A"}`) + leaf := &actions_model.ActionRunJob{RunID: runID, ParentJobID: inner.ID} + + got, err := getScopedSecretsForJob(ctx, leaf, base) + require.NoError(t, err) + assert.Equal(t, map[string]string{ + "GITHUB_TOKEN": "tok", + "GITEA_TOKEN": "tok", + "ALIAS_C": "prod-secret", + // no "dev-secret" + }, got) + }) +} diff --git a/models/shared/types/ownertype.go b/models/shared/types/ownertype.go index a1d46c986f..98a59c7008 100644 --- a/models/shared/types/ownertype.go +++ b/models/shared/types/ownertype.go @@ -3,7 +3,7 @@ package types -import "code.gitea.io/gitea/modules/translation" +import "gitea.dev/modules/translation" type OwnerType string diff --git a/models/system/appstate.go b/models/system/appstate.go index 01faa1a5be..34a136e3bd 100644 --- a/models/system/appstate.go +++ b/models/system/appstate.go @@ -6,7 +6,7 @@ package system import ( "context" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) // AppState represents a state record in database diff --git a/models/system/main_test.go b/models/system/main_test.go index 6bc27a7cff..f52b1e9f04 100644 --- a/models/system/main_test.go +++ b/models/system/main_test.go @@ -6,12 +6,12 @@ package system_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/unittest" - _ "code.gitea.io/gitea/models" // register models - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/system" // register models of system + _ "gitea.dev/models" // register models + _ "gitea.dev/models/actions" + _ "gitea.dev/models/activities" + _ "gitea.dev/models/system" // register models of system ) func TestMain(m *testing.M) { diff --git a/models/system/notice.go b/models/system/notice.go index 4b919dffc9..6225dcf40c 100644 --- a/models/system/notice.go +++ b/models/system/notice.go @@ -8,11 +8,11 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/graceful" + "gitea.dev/modules/log" + "gitea.dev/modules/storage" + "gitea.dev/modules/timeutil" ) // NoticeType describes the notice type diff --git a/models/system/notice_test.go b/models/system/notice_test.go index 802bcf41b1..3d0a70a8c7 100644 --- a/models/system/notice_test.go +++ b/models/system/notice_test.go @@ -6,9 +6,9 @@ package system_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/db" + "gitea.dev/models/system" + "gitea.dev/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/system/setting.go b/models/system/setting.go index 4472b4c228..5c3d5a0324 100644 --- a/models/system/setting.go +++ b/models/system/setting.go @@ -9,10 +9,10 @@ import ( "sync" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting/config" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/log" + "gitea.dev/modules/setting/config" + "gitea.dev/modules/timeutil" "xorm.io/builder" ) diff --git a/models/system/setting_test.go b/models/system/setting_test.go index 780a323fe1..c319e2b54d 100644 --- a/models/system/setting_test.go +++ b/models/system/setting_test.go @@ -6,9 +6,9 @@ package system_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/db" + "gitea.dev/models/system" + "gitea.dev/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/unit/unit.go b/models/unit/unit.go index c0560678ca..9e34fe354e 100644 --- a/models/unit/unit.go +++ b/models/unit/unit.go @@ -10,10 +10,10 @@ import ( "strings" "sync/atomic" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/perm" + "gitea.dev/modules/container" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" ) // Type is Unit's Type diff --git a/models/unit/unit_test.go b/models/unit/unit_test.go index 7bf6326145..3964d0b74e 100644 --- a/models/unit/unit_test.go +++ b/models/unit/unit_test.go @@ -6,7 +6,7 @@ package unit import ( "testing" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/models/unittest/consistency.go b/models/unittest/consistency.go index 8447bd93ba..b689a7d2f6 100644 --- a/models/unittest/consistency.go +++ b/models/unittest/consistency.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/unittest/fixtures.go b/models/unittest/fixtures.go index 872bdffc6d..19882de96e 100644 --- a/models/unittest/fixtures.go +++ b/models/unittest/fixtures.go @@ -9,10 +9,10 @@ import ( "strings" "unicode" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/auth/password/hash" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/auth/password/hash" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" "xorm.io/xorm" "xorm.io/xorm/contexts" diff --git a/models/unittest/fixtures_loader.go b/models/unittest/fixtures_loader.go index e2f2f5846f..7ad3bc9058 100644 --- a/models/unittest/fixtures_loader.go +++ b/models/unittest/fixtures_loader.go @@ -14,9 +14,9 @@ import ( "strings" "sync" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" "xorm.io/xorm" "xorm.io/xorm/schemas" ) diff --git a/models/unittest/fixtures_test.go b/models/unittest/fixtures_test.go index d45ef33847..8d81a367dd 100644 --- a/models/unittest/fixtures_test.go +++ b/models/unittest/fixtures_test.go @@ -8,9 +8,9 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" "github.com/stretchr/testify/require" "xorm.io/xorm" diff --git a/models/unittest/fscopy.go b/models/unittest/fscopy.go index cddb7a3f77..62743b6aca 100644 --- a/models/unittest/fscopy.go +++ b/models/unittest/fscopy.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" ) // SyncFile synchronizes the two files. This is skipped if both files diff --git a/models/unittest/mock_http.go b/models/unittest/mock_http.go index dd05b263ed..cc1e389d77 100644 --- a/models/unittest/mock_http.go +++ b/models/unittest/mock_http.go @@ -15,7 +15,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/log" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/unittest/testdb.go b/models/unittest/testdb.go index 2a87a02fcd..740df0e2ab 100644 --- a/models/unittest/testdb.go +++ b/models/unittest/testdb.go @@ -13,16 +13,16 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/setting/config" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/tempdir" - "code.gitea.io/gitea/modules/testlogger" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/models/system" + "gitea.dev/modules/cache" + "gitea.dev/modules/git" + "gitea.dev/modules/setting" + "gitea.dev/modules/setting/config" + "gitea.dev/modules/storage" + "gitea.dev/modules/tempdir" + "gitea.dev/modules/testlogger" + "gitea.dev/modules/util" "github.com/stretchr/testify/assert" "xorm.io/xorm" @@ -207,7 +207,7 @@ type FixturesOptions struct { // CreateTestEngine creates a test database and loads the fixture data from fixturesDir func CreateTestEngine(testSQLiteFile string, opts FixturesOptions) error { - driver, connStr, err := db.ConnStr(db.ConnOptions{Type: setting.DatabaseTypeSQLite3, SQLitePath: testSQLiteFile, SQLiteBusyTimeout: 5000}) + driver, connStr, err := db.ConnStr(db.ConnOptions{Type: setting.DatabaseTypeSQLite3, SQLitePath: testSQLiteFile, SQLiteBusyTimeout: setting.DefaultSQLiteBusyTimeout}) if err != nil { return err } diff --git a/models/unittest/unit_tests.go b/models/unittest/unit_tests.go index c49b26fea4..45ea0d175e 100644 --- a/models/unittest/unit_tests.go +++ b/models/unittest/unit_tests.go @@ -10,7 +10,7 @@ import ( "os" "strings" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/avatar.go b/models/user/avatar.go index 5811d85911..13f001e3ba 100644 --- a/models/user/avatar.go +++ b/models/user/avatar.go @@ -9,13 +9,13 @@ import ( "image/png" "io" - "code.gitea.io/gitea/models/avatars" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/avatar" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" + "gitea.dev/models/avatars" + "gitea.dev/models/db" + "gitea.dev/modules/avatar" + "gitea.dev/modules/httplib" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/modules/storage" ) // CustomAvatarRelativePath returns user custom avatar relative path. diff --git a/models/user/avatar_test.go b/models/user/avatar_test.go index 9ebf00de49..f090dc467c 100644 --- a/models/user/avatar_test.go +++ b/models/user/avatar_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/test" + "gitea.dev/models/unittest" + "gitea.dev/modules/setting" + "gitea.dev/modules/storage" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/badge.go b/models/user/badge.go index f17a6f5cc5..0858fd6765 100644 --- a/models/user/badge.go +++ b/models/user/badge.go @@ -6,8 +6,8 @@ package user import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/util" "xorm.io/builder" "xorm.io/xorm/schemas" diff --git a/models/user/badge_test.go b/models/user/badge_test.go index 04979a9caf..72d2aedc1e 100644 --- a/models/user/badge_test.go +++ b/models/user/badge_test.go @@ -6,10 +6,10 @@ package user_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/util" "github.com/stretchr/testify/assert" ) diff --git a/models/user/block.go b/models/user/block.go index 03f984a8fd..6331b754a3 100644 --- a/models/user/block.go +++ b/models/user/block.go @@ -6,10 +6,10 @@ package user import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/container" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/user/email_address.go b/models/user/email_address.go index 670d417f9e..5a259b8e2b 100644 --- a/models/user/email_address.go +++ b/models/user/email_address.go @@ -11,13 +11,13 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "gitea.dev/models/db" + "gitea.dev/modules/base" + "gitea.dev/modules/log" + "gitea.dev/modules/optional" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" + "gitea.dev/modules/validation" "xorm.io/builder" ) diff --git a/models/user/email_address_test.go b/models/user/email_address_test.go index 4167aaac0d..06ab883779 100644 --- a/models/user/email_address_test.go +++ b/models/user/email_address_test.go @@ -7,10 +7,10 @@ import ( "slices" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" + "gitea.dev/models/db" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/optional" "github.com/stretchr/testify/assert" ) diff --git a/models/user/error.go b/models/user/error.go index 5a956a2afe..28ea4f21c1 100644 --- a/models/user/error.go +++ b/models/user/error.go @@ -6,7 +6,7 @@ package user import ( "fmt" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/util" ) // ErrUserAlreadyExist represents a "user already exists" error. diff --git a/models/user/external_login_user.go b/models/user/external_login_user.go index 636a2007ee..1069b0f283 100644 --- a/models/user/external_login_user.go +++ b/models/user/external_login_user.go @@ -8,8 +8,8 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/util" "xorm.io/builder" ) @@ -80,8 +80,11 @@ func init() { } // GetExternalLogin checks if a externalID in loginSourceID scope already exists -func GetExternalLogin(ctx context.Context, externalLoginUser *ExternalLoginUser) (bool, error) { - return db.GetEngine(ctx).Get(externalLoginUser) +func GetExternalLogin(ctx context.Context, loginSourceID int64, externalID string) (*ExternalLoginUser, bool, error) { + return db.Get[ExternalLoginUser](ctx, builder.Eq{ + "external_id": externalID, + "login_source_id": loginSourceID, + }) } // LinkExternalToUser link the external user to the user @@ -118,6 +121,12 @@ func RemoveAllAccountLinks(ctx context.Context, user *User) error { return err } +// RemoveExternalLoginByExternalID removes a specific external login link by its provider-side identifier. +func RemoveExternalLoginByExternalID(ctx context.Context, loginSourceID int64, externalID string) error { + _, err := db.GetEngine(ctx).Where("external_id=? AND login_source_id=?", externalID, loginSourceID).Delete(new(ExternalLoginUser)) + return err +} + // GetUserIDByExternalUserID get user id according to provider and userID func GetUserIDByExternalUserID(ctx context.Context, provider, userID string) (int64, error) { var id int64 diff --git a/models/user/follow.go b/models/user/follow.go index e098caab5b..617211886e 100644 --- a/models/user/follow.go +++ b/models/user/follow.go @@ -6,8 +6,8 @@ package user import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/timeutil" ) // Follow represents relations of user and their followers. diff --git a/models/user/follow_test.go b/models/user/follow_test.go index 1d5f144164..b24682d0f2 100644 --- a/models/user/follow_test.go +++ b/models/user/follow_test.go @@ -6,8 +6,8 @@ package user_test import ( "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/user/list.go b/models/user/list.go index aaaa7965c8..7a737935f9 100644 --- a/models/user/list.go +++ b/models/user/list.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/auth" + "gitea.dev/models/db" ) // UserList is a list of user. diff --git a/models/user/main_test.go b/models/user/main_test.go index a626d323a7..1a8cd4af59 100644 --- a/models/user/main_test.go +++ b/models/user/main_test.go @@ -6,12 +6,12 @@ package user_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/user" + _ "gitea.dev/models" + _ "gitea.dev/models/actions" + _ "gitea.dev/models/activities" + _ "gitea.dev/models/user" ) func TestMain(m *testing.M) { diff --git a/models/user/must_change_password.go b/models/user/must_change_password.go index 686847c7d7..5603b0f65b 100644 --- a/models/user/must_change_password.go +++ b/models/user/must_change_password.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/models/user/openid.go b/models/user/openid.go index 5baa48c824..84ec5a5cd8 100644 --- a/models/user/openid.go +++ b/models/user/openid.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/util" ) // UserOpenID is the list of all OpenID identities of a user. diff --git a/models/user/openid_test.go b/models/user/openid_test.go index 6d2260324f..b9a2572adb 100644 --- a/models/user/openid_test.go +++ b/models/user/openid_test.go @@ -6,9 +6,9 @@ package user_test import ( "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/redirect.go b/models/user/redirect.go index 5a40d4df3b..325a643eb6 100644 --- a/models/user/redirect.go +++ b/models/user/redirect.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/util" ) // ErrUserRedirectNotExist represents a "UserRedirectNotExist" kind of error. diff --git a/models/user/redirect_test.go b/models/user/redirect_test.go index 015eac0668..492c908581 100644 --- a/models/user/redirect_test.go +++ b/models/user/redirect_test.go @@ -6,8 +6,8 @@ package user_test import ( "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/user/search.go b/models/user/search.go index ac9cb8ff99..536b15527e 100644 --- a/models/user/search.go +++ b/models/user/search.go @@ -9,10 +9,10 @@ import ( "slices" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/structs" + "gitea.dev/models/db" + "gitea.dev/modules/container" + "gitea.dev/modules/optional" + "gitea.dev/modules/structs" "xorm.io/builder" ) diff --git a/models/user/setting.go b/models/user/setting.go index 67b45208fc..a3903d5915 100644 --- a/models/user/setting.go +++ b/models/user/setting.go @@ -9,11 +9,11 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/json" - setting_module "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/modules/cache" + "gitea.dev/modules/json" + setting_module "gitea.dev/modules/setting" + "gitea.dev/modules/util" "xorm.io/builder" "xorm.io/xorm/convert" diff --git a/models/user/setting_test.go b/models/user/setting_test.go index 7332e442b4..482c6843d8 100644 --- a/models/user/setting_test.go +++ b/models/user/setting_test.go @@ -6,8 +6,8 @@ package user_test import ( "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/user/user.go b/models/user/user.go index ba02a9949b..66e8d49b42 100644 --- a/models/user/user.go +++ b/models/user/user.go @@ -21,22 +21,22 @@ import ( "time" "unicode" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/auth/openid" - "code.gitea.io/gitea/modules/auth/password/hash" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/htmlutil" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "gitea.dev/models/auth" + "gitea.dev/models/db" + "gitea.dev/modules/auth/openid" + "gitea.dev/modules/auth/password/hash" + "gitea.dev/modules/base" + "gitea.dev/modules/container" + "gitea.dev/modules/git" + "gitea.dev/modules/htmlutil" + "gitea.dev/modules/httplib" + "gitea.dev/modules/log" + "gitea.dev/modules/optional" + "gitea.dev/modules/setting" + "gitea.dev/modules/structs" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" + "gitea.dev/modules/validation" _ "image/jpeg" // Needed for jpeg support @@ -244,12 +244,15 @@ func (u *User) IsOAuth2() bool { return u.LoginType == auth.OAuth2 } -// MaxCreationLimit returns the number of repositories a user is allowed to create +// MaxCreationLimit returns the number of repositories a user or an organization is allowed to create func (u *User) MaxCreationLimit() int { - if u.MaxRepoCreation <= -1 { - return setting.Repository.MaxCreationLimit + if u.MaxRepoCreation > -1 { + return u.MaxRepoCreation } - return u.MaxRepoCreation + if u.IsOrganization() { + return setting.Repository.OrgMaxCreationLimit + } + return setting.Repository.UserMaxCreationLimit } // CanCreateRepoIn checks whether the doer(u) can create a repository in the owner @@ -264,13 +267,11 @@ func (u *User) CanCreateRepoIn(owner *User) bool { return true } const noLimit = -1 - if owner.MaxRepoCreation == noLimit { - if setting.Repository.MaxCreationLimit == noLimit { - return true - } - return owner.NumRepos < setting.Repository.MaxCreationLimit + limit := owner.MaxCreationLimit() + if limit == noLimit { + return true } - return owner.NumRepos < owner.MaxRepoCreation + return owner.NumRepos < limit } // CanCreateOrganization returns true if user can create organisation. diff --git a/models/user/user_list.go b/models/user/user_list.go index 1b6a27dd86..c080286059 100644 --- a/models/user/user_list.go +++ b/models/user/user_list.go @@ -6,7 +6,7 @@ package user import ( "context" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) func GetUsersMapByIDs(ctx context.Context, userIDs []int64) (map[int64]*User, error) { diff --git a/models/user/user_system.go b/models/user/user_system.go index cf4306df25..5a71553e9e 100644 --- a/models/user/user_system.go +++ b/models/user/user_system.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/structs" + "gitea.dev/modules/structs" ) const ( diff --git a/models/user/user_test.go b/models/user/user_test.go index 956eaeafb4..2bf32a5038 100644 --- a/models/user/user_test.go +++ b/models/user/user_test.go @@ -10,17 +10,17 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/password/hash" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/auth" + "gitea.dev/models/db" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/auth/password/hash" + "gitea.dev/modules/container" + "gitea.dev/modules/optional" + "gitea.dev/modules/setting" + "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -674,12 +674,18 @@ func TestGetInactiveUsers(t *testing.T) { func TestCanCreateRepo(t *testing.T) { defer test.MockVariableValue(&setting.Repository.MaxCreationLimit)() + defer test.MockVariableValue(&setting.Repository.UserMaxCreationLimit)() + defer test.MockVariableValue(&setting.Repository.OrgMaxCreationLimit)() const noLimit = -1 doerActions := user_model.NewActionsUser() doerNormal := &user_model.User{ID: 2} doerAdmin := &user_model.User{ID: 1, IsAdmin: true} + orgOwner := func(numRepos, maxRepoCreation int) *user_model.User { + return &user_model.User{ID: 3, Type: user_model.UserTypeOrganization, NumRepos: numRepos, MaxRepoCreation: maxRepoCreation} + } t.Run("NoGlobalLimit", func(t *testing.T) { - setting.Repository.MaxCreationLimit = noLimit + setting.Repository.UserMaxCreationLimit = noLimit + setting.Repository.OrgMaxCreationLimit = noLimit assert.False(t, doerNormal.CanCreateRepoIn(&user_model.User{ID: 2, NumRepos: 10, MaxRepoCreation: 0})) assert.True(t, doerNormal.CanCreateRepoIn(&user_model.User{ID: 2, NumRepos: 10, MaxRepoCreation: 100})) @@ -693,7 +699,8 @@ func TestCanCreateRepo(t *testing.T) { }) t.Run("GlobalLimit50", func(t *testing.T) { - setting.Repository.MaxCreationLimit = 50 + setting.Repository.UserMaxCreationLimit = 50 + setting.Repository.OrgMaxCreationLimit = 50 assert.True(t, doerNormal.CanCreateRepoIn(&user_model.User{ID: 2, NumRepos: 10, MaxRepoCreation: noLimit})) assert.False(t, doerNormal.CanCreateRepoIn(&user_model.User{ID: 2, NumRepos: 60, MaxRepoCreation: noLimit})) // limited by global limit @@ -707,4 +714,33 @@ func TestCanCreateRepo(t *testing.T) { assert.True(t, doerAdmin.CanCreateRepoIn(&user_model.User{ID: 2, NumRepos: 10, MaxRepoCreation: 100})) assert.True(t, doerAdmin.CanCreateRepoIn(&user_model.User{ID: 2, NumRepos: 60, MaxRepoCreation: 100})) }) + + t.Run("UserBlockedOrgsUnlimited", func(t *testing.T) { + // User and org limits are independent: a deployment can block personal repos while leaving orgs unrestricted. + setting.Repository.UserMaxCreationLimit = 0 + setting.Repository.OrgMaxCreationLimit = noLimit + + // regular user is blocked + assert.False(t, doerNormal.CanCreateRepoIn(&user_model.User{ID: 2, NumRepos: 0, MaxRepoCreation: noLimit})) + // per-user override grants individual exceptions even when the global user limit is 0 + assert.True(t, doerNormal.CanCreateRepoIn(&user_model.User{ID: 2, NumRepos: 3, MaxRepoCreation: 5})) + assert.False(t, doerNormal.CanCreateRepoIn(&user_model.User{ID: 2, NumRepos: 5, MaxRepoCreation: 5})) + + // organization can create unlimited repos + assert.True(t, doerNormal.CanCreateRepoIn(orgOwner(10, noLimit))) + assert.True(t, doerNormal.CanCreateRepoIn(orgOwner(999, noLimit))) + // per-org override still wins over the global org limit + assert.False(t, doerNormal.CanCreateRepoIn(orgOwner(5, 5))) + }) + + t.Run("OrgGlobalLimitWithPerOrgOverride", func(t *testing.T) { + setting.Repository.UserMaxCreationLimit = noLimit + setting.Repository.OrgMaxCreationLimit = 10 + + assert.True(t, doerNormal.CanCreateRepoIn(orgOwner(5, noLimit))) + assert.False(t, doerNormal.CanCreateRepoIn(orgOwner(10, noLimit))) + + // per-org override bypasses the global org limit + assert.True(t, doerNormal.CanCreateRepoIn(orgOwner(10, 100))) + }) } diff --git a/models/user/user_update.go b/models/user/user_update.go index 66702e2a14..b29a501ee2 100644 --- a/models/user/user_update.go +++ b/models/user/user_update.go @@ -6,7 +6,7 @@ package user import ( "context" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) func IncrUserRepoNum(ctx context.Context, userID int64) error { diff --git a/models/webhook/hooktask.go b/models/webhook/hooktask.go index 96ec11e43f..a0a6eef60f 100644 --- a/models/webhook/hooktask.go +++ b/models/webhook/hooktask.go @@ -8,12 +8,12 @@ import ( "errors" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - webhook_module "code.gitea.io/gitea/modules/webhook" + "gitea.dev/models/db" + "gitea.dev/modules/json" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/modules/timeutil" + webhook_module "gitea.dev/modules/webhook" gouuid "github.com/google/uuid" "xorm.io/builder" diff --git a/models/webhook/main_test.go b/models/webhook/main_test.go index 5f2d5081a1..28626f7111 100644 --- a/models/webhook/main_test.go +++ b/models/webhook/main_test.go @@ -6,7 +6,7 @@ package webhook import ( "testing" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/unittest" ) func TestMain(m *testing.M) { diff --git a/models/webhook/webhook.go b/models/webhook/webhook.go index 5144c0eca6..893ec15927 100644 --- a/models/webhook/webhook.go +++ b/models/webhook/webhook.go @@ -9,15 +9,15 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" + "gitea.dev/models/db" + "gitea.dev/modules/json" + "gitea.dev/modules/log" + "gitea.dev/modules/optional" + "gitea.dev/modules/secret" + "gitea.dev/modules/setting" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" + webhook_module "gitea.dev/modules/webhook" "xorm.io/builder" ) diff --git a/models/webhook/webhook_system.go b/models/webhook/webhook_system.go index e8b5040c96..49e21bbf08 100644 --- a/models/webhook/webhook_system.go +++ b/models/webhook/webhook_system.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/optional" + "gitea.dev/models/db" + "gitea.dev/modules/optional" "xorm.io/builder" ) diff --git a/models/webhook/webhook_system_test.go b/models/webhook/webhook_system_test.go index 9e954d1e37..69f9dfb7fb 100644 --- a/models/webhook/webhook_system_test.go +++ b/models/webhook/webhook_system_test.go @@ -6,8 +6,8 @@ package webhook import ( "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/optional" + "gitea.dev/models/unittest" + "gitea.dev/modules/optional" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/webhook/webhook_test.go b/models/webhook/webhook_test.go index 073af91de2..cd527d1159 100644 --- a/models/webhook/webhook_test.go +++ b/models/webhook/webhook_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" - webhook_module "code.gitea.io/gitea/modules/webhook" + "gitea.dev/models/db" + "gitea.dev/models/unittest" + "gitea.dev/modules/json" + "gitea.dev/modules/optional" + "gitea.dev/modules/timeutil" + webhook_module "gitea.dev/modules/webhook" "github.com/google/uuid" "github.com/stretchr/testify/assert" diff --git a/modules/actions/artifacts.go b/modules/actions/artifacts.go index 743e2f00fe..ba1f9acc01 100644 --- a/modules/actions/artifacts.go +++ b/modules/actions/artifacts.go @@ -9,7 +9,7 @@ import ( "encoding/binary" "io" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/setting" ) type tagType string diff --git a/modules/actions/commit_status_info.go b/modules/actions/commit_status_info.go index af06d35a2a..e7e3369544 100644 --- a/modules/actions/commit_status_info.go +++ b/modules/actions/commit_status_info.go @@ -8,11 +8,11 @@ import ( "maps" "slices" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" + actions_model "gitea.dev/models/actions" + "gitea.dev/models/db" + git_model "gitea.dev/models/git" + repo_model "gitea.dev/models/repo" + "gitea.dev/modules/log" ) // CommitActionsStatusMap maps CommitStatus.ID to the live ActionRunJob status diff --git a/modules/actions/github.go b/modules/actions/github.go index b7f475aa91..0789419b4a 100644 --- a/modules/actions/github.go +++ b/modules/actions/github.go @@ -4,7 +4,7 @@ package actions import ( - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_module "gitea.dev/modules/webhook" ) const ( diff --git a/modules/actions/github_test.go b/modules/actions/github_test.go index 6652ff6eac..26d05b8560 100644 --- a/modules/actions/github_test.go +++ b/modules/actions/github_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_module "gitea.dev/modules/webhook" "github.com/stretchr/testify/assert" ) diff --git a/modules/actions/jobparser/model.go b/modules/actions/jobparser/model.go index 2c4bd1f93a..c80626e4c0 100644 --- a/modules/actions/jobparser/model.go +++ b/modules/actions/jobparser/model.go @@ -8,6 +8,7 @@ import ( "errors" "fmt" + "gitea.com/gitea/runner/act/exprparser" "gitea.com/gitea/runner/act/model" "go.yaml.in/yaml/v4" ) @@ -298,6 +299,9 @@ func toGitContext(input map[string]any) *model.GithubContext { return gitContext } +// workflowCallEvent is only fired by another workflow's `uses:`, so it is excluded from trigger detection. +const workflowCallEvent = "workflow_call" + func ParseRawOn(rawOn *yaml.Node) ([]*Event, error) { switch rawOn.Kind { case yaml.ScalarNode: @@ -306,6 +310,9 @@ func ParseRawOn(rawOn *yaml.Node) ([]*Event, error) { if err != nil { return nil, err } + if val == workflowCallEvent { + return []*Event{}, nil + } return []*Event{ {Name: val}, }, nil @@ -319,6 +326,9 @@ func ParseRawOn(rawOn *yaml.Node) ([]*Event, error) { for _, v := range val { switch t := v.(type) { case string: + if t == workflowCallEvent { + continue + } res = append(res, &Event{Name: t}) default: return nil, fmt.Errorf("invalid type %T", t) @@ -332,6 +342,9 @@ func ParseRawOn(rawOn *yaml.Node) ([]*Event, error) { } res := make([]*Event, 0, len(events)) for i, k := range events { + if k == workflowCallEvent { + continue + } v := triggers[i] switch v.Kind { case yaml.ScalarNode: @@ -454,6 +467,26 @@ func ParseRawOn(rawOn *yaml.Node) ([]*Event, error) { } } +func EvaluateJobIfExpression(jobID string, job *Job, gitCtx map[string]any, results map[string]*JobResult, vars map[string]string, inputs map[string]any) (bool, error) { + actJob := &model.Job{ + Strategy: &model.Strategy{ + FailFastString: job.Strategy.FailFastString, + MaxParallelString: job.Strategy.MaxParallelString, + RawMatrix: job.Strategy.RawMatrix, + }, + } + evaluator := NewExpressionEvaluator(NewInterpeter(jobID, actJob, nil, toGitContext(gitCtx), results, vars, inputs)) + expr, err := rewriteSubExpression(job.If.Value, false) + if err != nil { + return false, err + } + result, err := evaluator.evaluate(expr, exprparser.DefaultStatusCheckSuccess) + if err != nil { + return false, err + } + return exprparser.IsTruthy(result), nil +} + // parseMappingNode parse a mapping node and preserve order. func parseMappingNode[T any](node *yaml.Node) ([]string, []T, error) { if node.Kind != yaml.MappingNode { diff --git a/modules/actions/jobparser/model_test.go b/modules/actions/jobparser/model_test.go index bd29cb9425..567c160f92 100644 --- a/modules/actions/jobparser/model_test.go +++ b/modules/actions/jobparser/model_test.go @@ -254,6 +254,53 @@ func TestParseRawOn(t *testing.T) { }, }, }, + { + // `workflow_call` is only fired by another workflow's `uses:`, so ParseRawOn intentionally excludes it from trigger detection. + input: `on: + workflow_call: + inputs: + env: + type: string + required: true + outputs: + sha: + value: ${{ jobs.build.outputs.commit }} + secrets: + DEPLOY_KEY: + required: true +`, + result: []*Event{}, + }, + { + // Mixed: a workflow that is both callable AND triggered by push. Only the "push" event surfaces. + input: `on: + workflow_call: + inputs: + env: + type: string + push: + branches: [main] +`, + result: []*Event{ + { + Name: "push", + acts: map[string][]string{"branches": {"main"}}, + }, + }, + }, + { + // Scalar form: a purely reusable workflow has no event triggers. + input: "on: workflow_call", + result: []*Event{}, + }, + { + // Sequence form: `workflow_call` is excluded while sibling events are kept. + input: "on:\n - push\n - workflow_call\n - pull_request", + result: []*Event{ + {Name: "push"}, + {Name: "pull_request"}, + }, + }, } for _, kase := range kases { t.Run(kase.input, func(t *testing.T) { diff --git a/modules/actions/jobparser/uses.go b/modules/actions/jobparser/uses.go new file mode 100644 index 0000000000..d829537c69 --- /dev/null +++ b/modules/actions/jobparser/uses.go @@ -0,0 +1,75 @@ +// Copyright 2026 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package jobparser + +import ( + "errors" + "fmt" + "path" + "regexp" + "strings" +) + +// UsesKind enumerates the supported forms of a reusable workflow "uses:" value. +type UsesKind int + +const ( + // UsesKindLocalSameRepo is "./.gitea/workflows/foo.yml" - a path inside the calling repository. + UsesKindLocalSameRepo UsesKind = iota + 1 + // UsesKindLocalCrossRepo is "owner/repo/.gitea/workflows/foo.yml@ref" - a workflow in another repo on the same instance. + UsesKindLocalCrossRepo +) + +// UsesRef is the parsed form of a reusable workflow "uses:" value. +type UsesRef struct { + Kind UsesKind + Owner string // empty for UsesKindLocalSameRepo + Repo string // empty for UsesKindLocalSameRepo + Path string // workflow file path inside the source repo + Ref string // git ref; empty for UsesKindLocalSameRepo +} + +var ( + reLocalSameRepo = regexp.MustCompile(`^\./\.(gitea|github)/workflows/([^@]+\.ya?ml)$`) + reLocalCrossRepo = regexp.MustCompile(`^([-.\w]+)/([-.\w]+)/\.(gitea|github)/workflows/([^@]+\.ya?ml)@(.+)$`) +) + +// ParseUses parses a reusable workflow "uses:" value. +// Only two forms are supported: +// - "./.gitea/workflows/foo.yml" (UsesKindLocalSameRepo, no @ref) +// - "OWNER/REPO/.gitea/workflows/foo.yml@REF" (UsesKindLocalCrossRepo) +func ParseUses(s string) (*UsesRef, error) { + s = strings.TrimSpace(s) + if s == "" { + return nil, errors.New("empty uses value") + } + + if strings.HasPrefix(s, "./") { + m := reLocalSameRepo.FindStringSubmatch(s) + if m == nil { + return nil, fmt.Errorf(`invalid local "uses:" %q (expect ./.gitea/workflows/.yml)`, s) + } + p := fmt.Sprintf(".%s/workflows/%s", m[1], m[2]) + if path.Clean(p) != p { + return nil, fmt.Errorf("invalid workflow path %q", s) + } + return &UsesRef{Kind: UsesKindLocalSameRepo, Path: p}, nil + } + + m := reLocalCrossRepo.FindStringSubmatch(s) + if m == nil { + return nil, fmt.Errorf(`invalid cross-repo "uses:" %q (expect owner/repo/.gitea/workflows/.yml@ref)`, s) + } + p := fmt.Sprintf(".%s/workflows/%s", m[3], m[4]) + if path.Clean(p) != p { + return nil, fmt.Errorf("invalid workflow path %q", s) + } + return &UsesRef{ + Kind: UsesKindLocalCrossRepo, + Owner: m[1], + Repo: m[2], + Path: p, + Ref: m[5], + }, nil +} diff --git a/modules/actions/jobparser/uses_test.go b/modules/actions/jobparser/uses_test.go new file mode 100644 index 0000000000..c6692054dc --- /dev/null +++ b/modules/actions/jobparser/uses_test.go @@ -0,0 +1,170 @@ +// Copyright 2026 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package jobparser + +import ( + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestParseUses(t *testing.T) { + t.Run("LocalSameRepo", func(t *testing.T) { + cases := []struct { + name string + in string + want UsesRef + }{ + { + name: "gitea dir, .yml", + in: "./.gitea/workflows/build.yml", + want: UsesRef{Kind: UsesKindLocalSameRepo, Path: ".gitea/workflows/build.yml"}, + }, + { + name: "github dir, .yml", + in: "./.github/workflows/build.yml", + want: UsesRef{Kind: UsesKindLocalSameRepo, Path: ".github/workflows/build.yml"}, + }, + { + name: "gitea dir, .yaml", + in: "./.gitea/workflows/build.yaml", + want: UsesRef{Kind: UsesKindLocalSameRepo, Path: ".gitea/workflows/build.yaml"}, + }, + { + name: "filename containing dots is allowed", + in: "./.gitea/workflows/foo..bar.yml", + want: UsesRef{Kind: UsesKindLocalSameRepo, Path: ".gitea/workflows/foo..bar.yml"}, + }, + { + name: "nested subdirectory", + in: "./.gitea/workflows/sub/build.yml", + want: UsesRef{Kind: UsesKindLocalSameRepo, Path: ".gitea/workflows/sub/build.yml"}, + }, + { + name: "leading/trailing whitespace is trimmed", + in: " ./.gitea/workflows/build.yml ", + want: UsesRef{Kind: UsesKindLocalSameRepo, Path: ".gitea/workflows/build.yml"}, + }, + } + for _, c := range cases { + t.Run(c.name, func(t *testing.T) { + got, err := ParseUses(c.in) + require.NoError(t, err) + assert.Equal(t, c.want, *got) + }) + } + }) + + t.Run("LocalCrossRepo", func(t *testing.T) { + cases := []struct { + name string + in string + want UsesRef + }{ + { + name: "gitea dir, simple ref", + in: "owner/repo/.gitea/workflows/build.yml@v1", + want: UsesRef{ + Kind: UsesKindLocalCrossRepo, + Owner: "owner", + Repo: "repo", + Path: ".gitea/workflows/build.yml", + Ref: "v1", + }, + }, + { + name: "github dir, branch ref", + in: "owner/repo/.github/workflows/build.yml@main", + want: UsesRef{ + Kind: UsesKindLocalCrossRepo, + Owner: "owner", + Repo: "repo", + Path: ".github/workflows/build.yml", + Ref: "main", + }, + }, + { + name: ".yaml extension", + in: "owner/repo/.gitea/workflows/build.yaml@abc123", + want: UsesRef{ + Kind: UsesKindLocalCrossRepo, + Owner: "owner", + Repo: "repo", + Path: ".gitea/workflows/build.yaml", + Ref: "abc123", + }, + }, + { + name: "ref with slashes (refs/heads/feature)", + in: "owner/repo/.gitea/workflows/build.yml@refs/heads/feature", + want: UsesRef{ + Kind: UsesKindLocalCrossRepo, + Owner: "owner", + Repo: "repo", + Path: ".gitea/workflows/build.yml", + Ref: "refs/heads/feature", + }, + }, + { + name: "nested subdirectory under workflows", + in: "owner/repo/.gitea/workflows/sub/build.yml@v1", + want: UsesRef{ + Kind: UsesKindLocalCrossRepo, + Owner: "owner", + Repo: "repo", + Path: ".gitea/workflows/sub/build.yml", + Ref: "v1", + }, + }, + } + for _, c := range cases { + t.Run(c.name, func(t *testing.T) { + got, err := ParseUses(c.in) + require.NoError(t, err) + assert.Equal(t, c.want, *got) + }) + } + }) + + t.Run("Errors", func(t *testing.T) { + cases := []struct { + name string + in string + }{ + {name: "empty string", in: ""}, + {name: "whitespace only", in: " "}, + + // Same-repo malformed + {name: "same-repo with @ref", in: "./.gitea/workflows/build.yml@v1"}, + {name: "same-repo wrong directory", in: "./not-workflows/build.yml"}, + {name: "same-repo wrong extension", in: "./.gitea/workflows/build.txt"}, + {name: "same-repo missing extension", in: "./.gitea/workflows/build"}, + {name: "same-repo absolute path", in: "/.gitea/workflows/build.yml"}, + {name: "same-repo path traversal", in: "./.gitea/workflows/../escape.yml"}, + {name: "same-repo double slash", in: "./.gitea/workflows//build.yml"}, + {name: "same-repo redundant ./", in: "./.gitea/workflows/./build.yml"}, + {name: "same-repo no filename", in: "./.gitea/workflows/.yml"}, + + // Cross-repo malformed + {name: "cross-repo missing @ref", in: "owner/repo/.gitea/workflows/build.yml"}, + {name: "cross-repo empty ref", in: "owner/repo/.gitea/workflows/build.yml@"}, + {name: "cross-repo missing owner", in: "/repo/.gitea/workflows/build.yml@v1"}, + {name: "cross-repo missing repo", in: "owner//.gitea/workflows/build.yml@v1"}, + {name: "cross-repo wrong workflows dir", in: "owner/repo/workflows/build.yml@v1"}, + {name: "cross-repo wrong extension", in: "owner/repo/.gitea/workflows/build.txt@v1"}, + {name: "cross-repo path traversal", in: "owner/repo/.gitea/workflows/../escape.yml@v1"}, + {name: "cross-repo double slash in path", in: "owner/repo/.gitea/workflows//build.yml@v1"}, + // owner/repo with chars Gitea's name validators reject + {name: "cross-repo owner with space", in: "bad owner/repo/.gitea/workflows/build.yml@v1"}, + {name: "cross-repo repo with @", in: "owner/re@po/.gitea/workflows/build.yml@v1"}, + } + for _, c := range cases { + t.Run(c.name, func(t *testing.T) { + _, err := ParseUses(c.in) + assert.Error(t, err) + }) + } + }) +} diff --git a/modules/actions/jobparser/workflow_call.go b/modules/actions/jobparser/workflow_call.go new file mode 100644 index 0000000000..7c534dca3c --- /dev/null +++ b/modules/actions/jobparser/workflow_call.go @@ -0,0 +1,401 @@ +// Copyright 2026 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package jobparser + +import ( + "errors" + "fmt" + "regexp" + "strings" + + "gitea.dev/modules/container" + "gitea.dev/modules/util" + + "gitea.com/gitea/runner/act/exprparser" + "gitea.com/gitea/runner/act/model" + "go.yaml.in/yaml/v4" +) + +// InputType enumerates the allowed types for a workflow_call input. +type InputType string + +const ( + InputTypeString InputType = "string" + InputTypeBoolean InputType = "boolean" + InputTypeNumber InputType = "number" +) + +// InputSpec describes a single workflow_call input declaration. +type InputSpec struct { + Description string `yaml:"description"` + Required bool `yaml:"required"` + Default yaml.Node `yaml:"default"` + Type InputType `yaml:"type"` +} + +// SecretSpec describes a single workflow_call secret declaration. +type SecretSpec struct { + Description string `yaml:"description"` + Required bool `yaml:"required"` +} + +// OutputSpec describes a single workflow_call output declaration. +type OutputSpec struct { + Description string `yaml:"description"` + Value string `yaml:"value"` +} + +// WorkflowCallSpec is the parsed "on.workflow_call" schema of a called workflow. +type WorkflowCallSpec struct { + Inputs map[string]InputSpec + Secrets map[string]SecretSpec + Outputs map[string]OutputSpec +} + +// JobOutputs is the per-job-id outputs map used for evaluating workflow_call outputs. +type JobOutputs map[string]map[string]string + +// ParseWorkflowCallSpec extracts on.workflow_call.{inputs,secrets,outputs} from a workflow YAML. +// Returns an error if the workflow does not declare on.workflow_call at all. +func ParseWorkflowCallSpec(content []byte) (*WorkflowCallSpec, error) { + var doc struct { + On yaml.Node `yaml:"on"` + } + if err := yaml.Unmarshal(content, &doc); err != nil { + return nil, fmt.Errorf("parse workflow yaml: %w", err) + } + + wcNode, ok := findWorkflowCallNode(&doc.On) + if !ok { + return nil, errors.New("workflow does not declare on.workflow_call") + } + + spec := &WorkflowCallSpec{ + Inputs: map[string]InputSpec{}, + Secrets: map[string]SecretSpec{}, + Outputs: map[string]OutputSpec{}, + } + + if wcNode == nil || wcNode.Kind != yaml.MappingNode { + return spec, nil + } + + for i := 0; i+1 < len(wcNode.Content); i += 2 { + key := wcNode.Content[i] + val := wcNode.Content[i+1] + switch key.Value { + case "inputs": + if err := decodeWorkflowCallMapping(val, spec.Inputs); err != nil { + return nil, fmt.Errorf("parse workflow_call.inputs: %w", err) + } + case "secrets": + if err := decodeWorkflowCallMapping(val, spec.Secrets); err != nil { + return nil, fmt.Errorf("parse workflow_call.secrets: %w", err) + } + case "outputs": + if err := decodeWorkflowCallMapping(val, spec.Outputs); err != nil { + return nil, fmt.Errorf("parse workflow_call.outputs: %w", err) + } + } + } + + for name, in := range spec.Inputs { + if in.Type == "" { + return nil, fmt.Errorf("workflow_call input %q is missing required field \"type\"", name) + } + switch in.Type { + case InputTypeString, InputTypeBoolean, InputTypeNumber: + default: + return nil, fmt.Errorf("workflow_call input %q has unsupported type %q", name, in.Type) + } + } + + return spec, nil +} + +// findWorkflowCallNode walks the "on:" node and returns the value mapping (or nil) for "workflow_call". +// "ok" is true when the workflow declares workflow_call (even with an empty body). +func findWorkflowCallNode(on *yaml.Node) (val *yaml.Node, ok bool) { + if on == nil || on.Kind == 0 { + return nil, false + } + switch on.Kind { + case yaml.ScalarNode: + return nil, on.Value == "workflow_call" + case yaml.SequenceNode: + for _, item := range on.Content { + if item.Kind == yaml.ScalarNode && item.Value == "workflow_call" { + return nil, true + } + } + return nil, false + case yaml.MappingNode: + for i := 0; i+1 < len(on.Content); i += 2 { + k := on.Content[i] + v := on.Content[i+1] + if k.Value != "workflow_call" { + continue + } + if v.Kind == yaml.MappingNode { + return v, true + } + return nil, true + } + } + return nil, false +} + +func decodeWorkflowCallMapping[T any](node *yaml.Node, dst map[string]T) error { + if node == nil || node.Kind != yaml.MappingNode { + return nil + } + for i := 0; i+1 < len(node.Content); i += 2 { + name := node.Content[i].Value + var v T + if err := node.Content[i+1].Decode(&v); err != nil { + return fmt.Errorf("%q: %w", name, err) + } + dst[name] = v + } + return nil +} + +// EvaluateCallerWith evaluates the caller-side expressions in `job.With` against the provided contexts +func EvaluateCallerWith( + jobID string, + job *Job, + gitCtx map[string]any, + results map[string]*JobResult, + vars map[string]string, + inputs map[string]any, +) (map[string]any, error) { + actJob := &model.Job{Strategy: &model.Strategy{ + FailFastString: job.Strategy.FailFastString, + MaxParallelString: job.Strategy.MaxParallelString, + RawMatrix: job.Strategy.RawMatrix, + }} + + var matrix map[string]any + matrixes, err := actJob.GetMatrixes() + if err != nil { + return nil, fmt.Errorf("get caller %q matrix: %w", jobID, err) + } + if len(matrixes) > 0 { + matrix = matrixes[0] + } + + evaluator := NewExpressionEvaluator(NewInterpeter(jobID, actJob, matrix, toGitContext(gitCtx), results, vars, inputs)) + + out := make(map[string]any, len(job.With)) + for k, raw := range job.With { + var evaluated any + switch v := raw.(type) { + case string: + node := yaml.Node{} + if err := node.Encode(v); err != nil { + return nil, fmt.Errorf("encode caller %q with[%q]: %w", jobID, k, err) + } + if err := evaluator.EvaluateYamlNode(&node); err != nil { + return nil, fmt.Errorf("evaluate caller %q with[%q]: %w", jobID, k, err) + } + if err := node.Decode(&evaluated); err != nil { + return nil, fmt.Errorf("decode caller %q with[%q]: %w", jobID, k, err) + } + default: + evaluated = v + } + out[k] = evaluated + } + return out, nil +} + +// MatchCallerInputsAgainstSpec checks the caller's already-evaluated `with:` values against the callee's declared `on.workflow_call.inputs` schema +func MatchCallerInputsAgainstSpec(spec *WorkflowCallSpec, evaluated map[string]any) (map[string]any, error) { + resolved := make(map[string]any, len(spec.Inputs)) + + // fill defaults first + for name, in := range spec.Inputs { + if in.Default.IsZero() { + continue + } + var defaultVal any + if err := in.Default.Decode(&defaultVal); err != nil { + return nil, fmt.Errorf("decode workflow_call input %q default: %w", name, err) + } + v, err := parseWorkflowCallInput(name, in.Type, defaultVal) + if err != nil { + return nil, err + } + resolved[name] = v + } + + for k, raw := range evaluated { + inputSpec, ok := spec.Inputs[k] + if !ok { + // ignore unknown "with:" keys + continue + } + converted, err := parseWorkflowCallInput(k, inputSpec.Type, raw) + if err != nil { + return nil, err + } + resolved[k] = converted + } + + for name, in := range spec.Inputs { + if !in.Required { + continue + } + // resolved[name] is set when caller provided it OR when spec has a non-zero default - both satisfy "required". + if _, ok := resolved[name]; ok { + continue + } + return nil, fmt.Errorf("workflow_call input %q is required", name) + } + + return resolved, nil +} + +func parseWorkflowCallInput(name string, typ InputType, v any) (any, error) { + switch typ { + case InputTypeString: + return toString(v), nil + case InputTypeBoolean: + // strict type matching: a boolean input only accepts a native bool, not a "true"/"false" string + if b, ok := v.(bool); ok { + return b, nil + } + return false, fmt.Errorf("workflow_call input %q expects boolean", name) + case InputTypeNumber: + // strict type matching: a number input rejects "123"/"3.14" strings. + if _, isString := v.(string); isString { + return 0.0, fmt.Errorf("workflow_call input %q expects number", name) + } + return util.ToFloat64(v) + default: + return nil, fmt.Errorf("workflow_call input %q has unsupported type %q", name, typ) + } +} + +// SecretsInherit is the literal keyword used in a caller's `secrets: inherit` directive +const SecretsInherit = "inherit" + +// callerSecretValueRegexp matches the `${{ secrets.NAME }}` form expected for each value in a caller's `secrets:` mapping. +var callerSecretValueRegexp = regexp.MustCompile(`^\s*\$\{\{\s*secrets\.([A-Za-z_][A-Za-z0-9_]*)\s*\}\}\s*$`) + +// ParseCallerSecrets decodes a caller's "secrets:" YAML node into one of two forms: +// - inherit == true: the caller wrote `secrets: inherit`; mapping is nil +// - inherit == false, mapping == {alias: source_name}: explicit mapping. Each value must be of the form `${{ secrets.NAME }}`. +// +// Both alias and source name are upper-cased: secret names are case-insensitive (matching GitHub), +// and Gitea stores secrets upper-cased, so this keeps lookups and schema validation consistent. +func ParseCallerSecrets(node yaml.Node) (inherit bool, mapping map[string]string, err error) { + if node.IsZero() { + return false, nil, nil + } + if node.Kind == yaml.ScalarNode && strings.TrimSpace(node.Value) == SecretsInherit { + return true, nil, nil + } + if node.Kind != yaml.MappingNode { + return false, nil, errors.New("invalid secrets: section, expected mapping or 'inherit'") + } + out := make(map[string]string, len(node.Content)/2) + for i := 0; i+1 < len(node.Content); i += 2 { + k := node.Content[i] + v := node.Content[i+1] + var sv string + if err := v.Decode(&sv); err != nil { + return false, nil, fmt.Errorf("decode secret %q: %w", k.Value, err) + } + matches := callerSecretValueRegexp.FindStringSubmatch(sv) + if len(matches) != 2 { + return false, nil, fmt.Errorf("caller secret %q value must be of the form ${{ secrets.NAME }}", k.Value) + } + out[strings.ToUpper(k.Value)] = strings.ToUpper(matches[1]) + } + return false, out, nil +} + +// ValidateCallerSecrets checks a caller's parsed explicit-mapping `secrets:` against the called workflow's declared `on.workflow_call.secrets` schema. +func ValidateCallerSecrets(spec *WorkflowCallSpec, mapping map[string]string) error { + if spec == nil { + return errors.New("ValidateCallerSecrets: nil workflow_call spec") + } + // Secret names are case-insensitive, so compare declared names and caller aliases upper-cased. + declaredNames := make(container.Set[string], len(spec.Secrets)) + for name := range spec.Secrets { + declaredNames.Add(strings.ToUpper(name)) + } + provided := make(container.Set[string], len(mapping)) + for alias := range mapping { + up := strings.ToUpper(alias) + provided.Add(up) + if !declaredNames.Contains(up) { + return fmt.Errorf("caller secret %q is not declared in the called workflow's on.workflow_call.secrets", alias) + } + } + for name, sec := range spec.Secrets { + if sec.Required && !provided.Contains(strings.ToUpper(name)) { + return fmt.Errorf("required secret %q is not provided by the caller", name) + } + } + return nil +} + +// EvaluateWorkflowCallOutputs evaluates a called workflow's "on.workflow_call.outputs..value" expressions against the provided contexts. +func EvaluateWorkflowCallOutputs(spec *WorkflowCallSpec, gitCtx *model.GithubContext, vars map[string]string, inputs map[string]any, jobOutputs JobOutputs) (map[string]string, error) { + if spec == nil || len(spec.Outputs) == 0 { + return map[string]string{}, nil + } + + jobsCtx := make(map[string]*model.WorkflowCallResult, len(jobOutputs)) + for jobID, outputs := range jobOutputs { + jobsCtx[jobID] = &model.WorkflowCallResult{Outputs: outputs} + } + + // See `on.workflow_call.outputs..value` in https://docs.github.com/en/actions/reference/workflows-and-actions/contexts#context-availability + env := &exprparser.EvaluationEnvironment{ + Github: gitCtx, + Jobs: &jobsCtx, + Vars: vars, + Inputs: inputs, + } + interpreter := exprparser.NewInterpeter(env, exprparser.Config{}) + + out := make(map[string]string, len(spec.Outputs)) + for name, o := range spec.Outputs { + v, err := evaluateWorkflowCallOutputValue(interpreter, o.Value) + if err != nil { + return nil, fmt.Errorf("workflow_call output %q: %w", name, err) + } + out[name] = v + } + return out, nil +} + +func evaluateWorkflowCallOutputValue(interpreter exprparser.Interpreter, value string) (string, error) { + if !strings.Contains(value, "${{") || !strings.Contains(value, "}}") { + return value, nil + } + expr, err := rewriteSubExpression(value, true) + if err != nil { + return "", err + } + evaluated, err := interpreter.Evaluate(expr, exprparser.DefaultStatusCheckNone) + if err != nil { + return "", err + } + return toString(evaluated), nil +} + +func toString(v any) string { + switch s := v.(type) { + case string: + return s + case nil: + return "" + default: + return fmt.Sprintf("%v", s) + } +} diff --git a/modules/actions/jobparser/workflow_call_test.go b/modules/actions/jobparser/workflow_call_test.go new file mode 100644 index 0000000000..6777d8173a --- /dev/null +++ b/modules/actions/jobparser/workflow_call_test.go @@ -0,0 +1,471 @@ +// Copyright 2026 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package jobparser + +import ( + "maps" + "testing" + + "gitea.com/gitea/runner/act/model" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "go.yaml.in/yaml/v4" +) + +func TestParseWorkflowCallSpec(t *testing.T) { + t.Run("malformed YAML surfaces a parse error", func(t *testing.T) { + // Mismatched flow-sequence brackets — yaml.Unmarshal must reject this. + _, err := ParseWorkflowCallSpec([]byte(`name: bad +on: [workflow_call +jobs: + noop: { } +`)) + require.Error(t, err) + }) + + t.Run("workflow without on.workflow_call is rejected", func(t *testing.T) { + notCallable := []byte(`name: ordinary +on: push +jobs: + noop: + runs-on: ubuntu-latest + steps: + - run: echo +`) + _, err := ParseWorkflowCallSpec(notCallable) + require.Error(t, err) + assert.Contains(t, err.Error(), "does not declare on.workflow_call") + }) + + t.Run("input missing the required type field is rejected", func(t *testing.T) { + content := callableWorkflow(t, `inputs: + x: + description: missing type +`) + _, err := ParseWorkflowCallSpec(content) + require.Error(t, err) + assert.Contains(t, err.Error(), `missing required field "type"`) + }) + + t.Run("inputs/secrets/outputs are decoded", func(t *testing.T) { + content := callableWorkflow(t, `inputs: + env: + type: string + required: true + secrets: + DEPLOY_KEY: + required: true + outputs: + sha: + value: ${{ jobs.build.outputs.commit }} +`) + spec, err := ParseWorkflowCallSpec(content) + require.NoError(t, err) + assert.Equal(t, InputTypeString, spec.Inputs["env"].Type) + assert.True(t, spec.Inputs["env"].Required) + assert.True(t, spec.Secrets["DEPLOY_KEY"].Required) + assert.Equal(t, "${{ jobs.build.outputs.commit }}", spec.Outputs["sha"].Value) + }) +} + +func TestEvaluateCallerWith(t *testing.T) { + t.Run("empty with: returns empty map", func(t *testing.T) { + out, err := EvaluateCallerWith("caller", &Job{}, nil, callerResults("caller", nil, nil), nil, nil) + require.NoError(t, err) + assert.Empty(t, out) + }) + + t.Run("non-string raw values pass through unchanged", func(t *testing.T) { + job := &Job{With: map[string]any{ + "already_bool": true, + "already_int": 42, + "already_slice": []any{"a", "b"}, + }} + out, err := EvaluateCallerWith("caller", job, nil, callerResults("caller", nil, nil), nil, nil) + require.NoError(t, err) + assert.Equal(t, true, out["already_bool"]) + assert.Equal(t, 42, out["already_int"]) + assert.Equal(t, []any{"a", "b"}, out["already_slice"]) + }) + + t.Run("expressions resolve against vars/inputs/results", func(t *testing.T) { + job := &Job{With: map[string]any{ + "env_name": "${{ vars.ENV }}", + "from_inputs": "${{ inputs.PARENT_VAR }}", + "from_needs": "${{ needs.upstream.outputs.commit }}", + }} + gitCtx := map[string]any{"event": map[string]any{}} + results := callerResults("caller", []string{"upstream"}, map[string]*JobResult{ + "upstream": {Result: "success", Outputs: map[string]string{"commit": "abc123"}}, + }) + vars := map[string]string{"ENV": "staging"} + inputs := map[string]any{"PARENT_VAR": "from-parent"} + out, err := EvaluateCallerWith("caller", job, gitCtx, results, vars, inputs) + require.NoError(t, err) + assert.Equal(t, "staging", out["env_name"]) + assert.Equal(t, "from-parent", out["from_inputs"]) + assert.Equal(t, "abc123", out["from_needs"]) + }) + + t.Run("matrix.X resolves to this caller row's matrix instance", func(t *testing.T) { + var rawMatrix yaml.Node + require.NoError(t, rawMatrix.Encode(map[string][]any{"target": {"staging"}})) + job := &Job{ + With: map[string]any{"env": "${{ matrix.target }}"}, + Strategy: Strategy{RawMatrix: rawMatrix}, + } + out, err := EvaluateCallerWith("caller", job, nil, callerResults("caller", nil, nil), nil, nil) + require.NoError(t, err) + assert.Equal(t, "staging", out["env"]) + }) +} + +func TestMatchCallerInputsAgainstSpec(t *testing.T) { + // mustParseSpec wraps ParseWorkflowCallSpec for test brevity. + mustParseSpec := func(t *testing.T, content []byte) *WorkflowCallSpec { + t.Helper() + spec, err := ParseWorkflowCallSpec(content) + require.NoError(t, err) + return spec + } + + t.Run("default is filled when caller does not provide the input", func(t *testing.T) { + spec := mustParseSpec(t, callableWorkflow(t, `inputs: + greeting: + type: string + default: hi +`)) + out, err := MatchCallerInputsAgainstSpec(spec, nil) + require.NoError(t, err) + assert.Equal(t, map[string]any{"greeting": "hi"}, out) + }) + + t.Run("caller-provided value wins over default", func(t *testing.T) { + spec := mustParseSpec(t, callableWorkflow(t, `inputs: + greeting: + type: string + default: hi +`)) + out, err := MatchCallerInputsAgainstSpec(spec, map[string]any{"greeting": "hello"}) + require.NoError(t, err) + assert.Equal(t, map[string]any{"greeting": "hello"}, out) + }) + + t.Run("required input must be provided", func(t *testing.T) { + spec := mustParseSpec(t, callableWorkflow(t, `inputs: + target: + type: string + required: true +`)) + _, err := MatchCallerInputsAgainstSpec(spec, nil) + require.Error(t, err) + assert.Contains(t, err.Error(), `"target" is required`) + }) + + t.Run("required input is satisfied by a default value", func(t *testing.T) { + spec := mustParseSpec(t, callableWorkflow(t, `inputs: + target: + type: string + required: true + default: prod +`)) + out, err := MatchCallerInputsAgainstSpec(spec, nil) + require.NoError(t, err) + assert.Equal(t, map[string]any{"target": "prod"}, out) + }) + + t.Run("boolean inputs accept native bool values and bool defaults", func(t *testing.T) { + spec := mustParseSpec(t, callableWorkflow(t, `inputs: + flag1: + type: boolean + flag2: + type: boolean + default: true + flag3: + type: boolean +`)) + out, err := MatchCallerInputsAgainstSpec(spec, map[string]any{ + "flag1": true, + "flag3": false, + }) + require.NoError(t, err) + assert.Equal(t, true, out["flag1"]) + assert.Equal(t, true, out["flag2"]) // from default + assert.Equal(t, false, out["flag3"]) + }) + + t.Run("boolean input rejects strings", func(t *testing.T) { + spec := mustParseSpec(t, callableWorkflow(t, `inputs: + flag: + type: boolean +`)) + _, err := MatchCallerInputsAgainstSpec(spec, map[string]any{"flag": "true"}) + require.Error(t, err) + assert.Contains(t, err.Error(), "expects boolean") + }) + + t.Run("number inputs accept native numeric values and number defaults", func(t *testing.T) { + spec := mustParseSpec(t, callableWorkflow(t, `inputs: + count: + type: number + ratio: + type: number + default: 0.5 +`)) + out, err := MatchCallerInputsAgainstSpec(spec, map[string]any{"count": 42}) + require.NoError(t, err) + assert.InDelta(t, 42.0, out["count"], 0) + assert.InDelta(t, 0.5, out["ratio"], 0) + }) + + t.Run("number input rejects strings", func(t *testing.T) { + spec := mustParseSpec(t, callableWorkflow(t, `inputs: + count: + type: number +`)) + _, err := MatchCallerInputsAgainstSpec(spec, map[string]any{"count": "42"}) + require.Error(t, err) + assert.Contains(t, err.Error(), "expects number") + }) + + t.Run("unknown caller-with key is silently dropped", func(t *testing.T) { + spec := mustParseSpec(t, callableWorkflow(t, `inputs: + known: + type: string + default: ok +`)) + out, err := MatchCallerInputsAgainstSpec(spec, map[string]any{ + "known": "yes", + "unknown": "ignored", + }) + require.NoError(t, err) + assert.Equal(t, map[string]any{"known": "yes"}, out) + }) +} + +func TestParseCallerSecrets(t *testing.T) { + // secretYAMLNode unmarshals raw YAML text into a yaml.Node so tests can hand it to ParseCallerSecrets. + secretYAMLNode := func(t *testing.T, s string) yaml.Node { + t.Helper() + var node yaml.Node + require.NoError(t, yaml.Unmarshal([]byte(s), &node)) + // yaml.Unmarshal wraps content in a DocumentNode; the meaningful node is the first child. + if node.Kind == yaml.DocumentNode && len(node.Content) > 0 { + return *node.Content[0] + } + return node + } + + t.Run("zero node returns no inherit, no mapping", func(t *testing.T) { + inherit, mapping, err := ParseCallerSecrets(yaml.Node{}) + require.NoError(t, err) + assert.False(t, inherit) + assert.Nil(t, mapping) + }) + + t.Run("\"inherit\" scalar sets inherit=true", func(t *testing.T) { + inherit, mapping, err := ParseCallerSecrets(secretYAMLNode(t, `inherit`)) + require.NoError(t, err) + assert.True(t, inherit) + assert.Nil(t, mapping) + }) + + t.Run("non-inherit scalar is rejected", func(t *testing.T) { + _, _, err := ParseCallerSecrets(secretYAMLNode(t, `something-else`)) + require.Error(t, err) + assert.Contains(t, err.Error(), "expected mapping or 'inherit'") + }) + + t.Run("mapping of secrets-style references is parsed", func(t *testing.T) { + inherit, mapping, err := ParseCallerSecrets(secretYAMLNode(t, ` +DEPLOY_KEY: ${{ secrets.GITEA_DEPLOY_KEY }} +DB_PASS: ${{ secrets.PROD_DB_PASS }} +`)) + require.NoError(t, err) + assert.False(t, inherit) + assert.Equal(t, map[string]string{ + "DEPLOY_KEY": "GITEA_DEPLOY_KEY", + "DB_PASS": "PROD_DB_PASS", + }, mapping) + }) + + t.Run("alias and source names are upper-cased", func(t *testing.T) { + inherit, mapping, err := ParseCallerSecrets(secretYAMLNode(t, ` +deploy_key: ${{ secrets.gitea_deploy_key }} +`)) + require.NoError(t, err) + assert.False(t, inherit) + assert.Equal(t, map[string]string{"DEPLOY_KEY": "GITEA_DEPLOY_KEY"}, mapping) + }) + + t.Run("mapping value not in ${{ secrets.NAME }} form is rejected", func(t *testing.T) { + // plain string + _, _, err := ParseCallerSecrets(secretYAMLNode(t, `KEY: not-an-expression`)) + require.Error(t, err) + assert.Contains(t, err.Error(), `must be of the form ${{ secrets.NAME }}`) + + // expression but referencing the wrong context (vars instead of secrets) + _, _, err = ParseCallerSecrets(secretYAMLNode(t, `KEY: ${{ vars.NAME }}`)) + require.Error(t, err) + assert.Contains(t, err.Error(), `must be of the form ${{ secrets.NAME }}`) + }) +} + +func TestValidateCallerSecrets(t *testing.T) { + specWith := func(secrets map[string]SecretSpec) *WorkflowCallSpec { + return &WorkflowCallSpec{Secrets: secrets} + } + + t.Run("explicit mapping with all required + only declared aliases is accepted", func(t *testing.T) { + spec := specWith(map[string]SecretSpec{ + "DEPLOY_KEY": {Required: true}, + "OPTIONAL": {}, + }) + mapping := map[string]string{ + "DEPLOY_KEY": "PROD_DEPLOY_KEY", + "OPTIONAL": "SOMETHING_ELSE", + } + require.NoError(t, ValidateCallerSecrets(spec, mapping)) + }) + + t.Run("alias not in callee schema is rejected", func(t *testing.T) { + spec := specWith(map[string]SecretSpec{"DEPLOY_KEY": {}}) + mapping := map[string]string{ + "DEPLOY_KEY": "PROD_DEPLOY_KEY", + "EXTRA": "SOMETHING_NOT_DECLARED", + } + err := ValidateCallerSecrets(spec, mapping) + require.Error(t, err) + assert.Contains(t, err.Error(), `caller secret "EXTRA"`) + assert.Contains(t, err.Error(), `not declared`) + }) + + t.Run("missing required secret is rejected", func(t *testing.T) { + spec := specWith(map[string]SecretSpec{ + "MUST_HAVE": {Required: true}, + "OPTIONAL": {}, + }) + mapping := map[string]string{"OPTIONAL": "X"} + err := ValidateCallerSecrets(spec, mapping) + require.Error(t, err) + assert.Contains(t, err.Error(), `required secret "MUST_HAVE"`) + assert.Contains(t, err.Error(), `not provided`) + }) + + t.Run("callee with no secrets schema accepts an empty mapping", func(t *testing.T) { + spec := specWith(map[string]SecretSpec{}) + require.NoError(t, ValidateCallerSecrets(spec, nil)) + require.NoError(t, ValidateCallerSecrets(spec, map[string]string{})) + }) + + t.Run("callee with no secrets schema rejects a non-empty mapping", func(t *testing.T) { + spec := specWith(map[string]SecretSpec{}) + err := ValidateCallerSecrets(spec, map[string]string{"X": "Y"}) + require.Error(t, err) + assert.Contains(t, err.Error(), `caller secret "X"`) + }) + + t.Run("name matching is case-insensitive", func(t *testing.T) { + // declared name and caller alias differ only in case; both should match. + spec := specWith(map[string]SecretSpec{"deploy_key": {Required: true}}) + mapping := map[string]string{"DEPLOY_KEY": "PROD_DEPLOY_KEY"} + require.NoError(t, ValidateCallerSecrets(spec, mapping)) + }) + + t.Run("nil spec is rejected", func(t *testing.T) { + err := ValidateCallerSecrets(nil, map[string]string{"X": "Y"}) + require.Error(t, err) + assert.Contains(t, err.Error(), "nil workflow_call spec") + }) +} + +func TestEvaluateWorkflowCallOutputs(t *testing.T) { + t.Run("nil spec returns empty map", func(t *testing.T) { + out, err := EvaluateWorkflowCallOutputs(nil, &model.GithubContext{}, nil, nil, nil) + require.NoError(t, err) + assert.Empty(t, out) + }) + + t.Run("spec with no outputs returns empty map", func(t *testing.T) { + spec := &WorkflowCallSpec{Outputs: map[string]OutputSpec{}} + out, err := EvaluateWorkflowCallOutputs(spec, &model.GithubContext{}, nil, nil, nil) + require.NoError(t, err) + assert.Empty(t, out) + }) + + t.Run("plain string value passes through unchanged", func(t *testing.T) { + spec := &WorkflowCallSpec{Outputs: map[string]OutputSpec{ + "name": {Value: "static-value"}, + }} + out, err := EvaluateWorkflowCallOutputs(spec, &model.GithubContext{}, nil, nil, nil) + require.NoError(t, err) + assert.Equal(t, map[string]string{"name": "static-value"}, out) + }) + + t.Run("output references jobs..outputs.", func(t *testing.T) { + spec := &WorkflowCallSpec{Outputs: map[string]OutputSpec{ + "sha": {Value: "${{ jobs.build.outputs.commit }}"}, + }} + jobOutputs := JobOutputs{ + "build": {"commit": "deadbeef"}, + } + out, err := EvaluateWorkflowCallOutputs(spec, &model.GithubContext{}, nil, nil, jobOutputs) + require.NoError(t, err) + assert.Equal(t, "deadbeef", out["sha"]) + }) + + t.Run("output references inputs.", func(t *testing.T) { + spec := &WorkflowCallSpec{Outputs: map[string]OutputSpec{ + "target": {Value: "${{ inputs.env_name }}"}, + }} + inputs := map[string]any{"env_name": "staging"} + out, err := EvaluateWorkflowCallOutputs(spec, &model.GithubContext{}, nil, inputs, nil) + require.NoError(t, err) + assert.Equal(t, "staging", out["target"]) + }) + + t.Run("multiple outputs are all evaluated", func(t *testing.T) { + spec := &WorkflowCallSpec{Outputs: map[string]OutputSpec{ + "static": {Value: "static-value"}, + "dynamic": {Value: "${{ vars.SUFFIX }}"}, + }} + vars := map[string]string{"SUFFIX": "abc"} + out, err := EvaluateWorkflowCallOutputs(spec, &model.GithubContext{}, vars, nil, nil) + require.NoError(t, err) + assert.Equal(t, "static-value", out["static"]) + assert.Equal(t, "abc", out["dynamic"]) + }) + + t.Run("expression referencing an undefined symbol surfaces an error", func(t *testing.T) { + spec := &WorkflowCallSpec{Outputs: map[string]OutputSpec{ + "bad": {Value: "${{ this.is.not.valid() }}"}, + }} + _, err := EvaluateWorkflowCallOutputs(spec, &model.GithubContext{}, nil, nil, nil) + require.Error(t, err) + assert.Contains(t, err.Error(), `output "bad"`) + }) +} + +// callableWorkflow returns a minimal valid called-workflow YAML with on.workflow_call. +func callableWorkflow(t *testing.T, body string) []byte { + t.Helper() + return []byte(`name: callable +on: + workflow_call: + ` + body + ` +jobs: + noop: + runs-on: ubuntu-latest + steps: + - run: "echo" +`) +} + +// callerResults returns the minimum results map shape that NewInterpeter expects +func callerResults(callerJobID string, callerNeeds []string, deps map[string]*JobResult) map[string]*JobResult { + out := make(map[string]*JobResult, len(deps)+1) + maps.Copy(out, deps) + out[callerJobID] = &JobResult{Needs: callerNeeds} + return out +} diff --git a/modules/actions/log.go b/modules/actions/log.go index 3fb56b402a..3fbdf4cdeb 100644 --- a/modules/actions/log.go +++ b/modules/actions/log.go @@ -12,12 +12,12 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/dbfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/zstd" + runnerv1 "gitea.dev/actions-proto-go/runner/v1" + "gitea.dev/models/dbfs" + "gitea.dev/modules/log" + "gitea.dev/modules/storage" + "gitea.dev/modules/zstd" - runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/modules/actions/task_state.go b/modules/actions/task_state.go index 1f36e021a5..cb7f5724fe 100644 --- a/modules/actions/task_state.go +++ b/modules/actions/task_state.go @@ -4,7 +4,7 @@ package actions import ( - actions_model "code.gitea.io/gitea/models/actions" + actions_model "gitea.dev/models/actions" ) const ( diff --git a/modules/actions/task_state_test.go b/modules/actions/task_state_test.go index ff0fd57195..7b8087a147 100644 --- a/modules/actions/task_state_test.go +++ b/modules/actions/task_state_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - actions_model "code.gitea.io/gitea/models/actions" + actions_model "gitea.dev/models/actions" "github.com/stretchr/testify/assert" ) diff --git a/modules/actions/workflowpattern/workflow_pattern.go b/modules/actions/workflowpattern/workflow_pattern.go index 7e9a5d8597..c5eb1fb575 100644 --- a/modules/actions/workflowpattern/workflow_pattern.go +++ b/modules/actions/workflowpattern/workflow_pattern.go @@ -6,7 +6,7 @@ package workflowpattern import ( "strings" - "code.gitea.io/gitea/modules/glob" + "gitea.dev/modules/glob" ) type WorkflowPattern struct { diff --git a/modules/actions/workflows.go b/modules/actions/workflows.go index 991de1af10..28dc45dc7a 100644 --- a/modules/actions/workflows.go +++ b/modules/actions/workflows.go @@ -8,15 +8,15 @@ import ( "slices" "strings" - "code.gitea.io/gitea/modules/actions/jobparser" - "code.gitea.io/gitea/modules/actions/workflowpattern" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/glob" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" + "gitea.dev/modules/actions/jobparser" + "gitea.dev/modules/actions/workflowpattern" + "gitea.dev/modules/git" + "gitea.dev/modules/glob" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/util" + webhook_module "gitea.dev/modules/webhook" "gitea.com/gitea/runner/act/model" "go.yaml.in/yaml/v4" diff --git a/modules/actions/workflows_test.go b/modules/actions/workflows_test.go index cda2de13e2..aec7144783 100644 --- a/modules/actions/workflows_test.go +++ b/modules/actions/workflows_test.go @@ -6,11 +6,11 @@ package actions import ( "testing" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - webhook_module "code.gitea.io/gitea/modules/webhook" + "gitea.dev/modules/git" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + webhook_module "gitea.dev/modules/webhook" "github.com/stretchr/testify/assert" ) diff --git a/modules/assetfs/embed.go b/modules/assetfs/embed.go index 7c90e3aca2..99a6e5e624 100644 --- a/modules/assetfs/embed.go +++ b/modules/assetfs/embed.go @@ -15,8 +15,8 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/json" + "gitea.dev/modules/util" ) type EmbeddedFile interface { diff --git a/modules/assetfs/layered.go b/modules/assetfs/layered.go index 380c3ac455..5ee585afa1 100644 --- a/modules/assetfs/layered.go +++ b/modules/assetfs/layered.go @@ -14,10 +14,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/container" + "gitea.dev/modules/log" + "gitea.dev/modules/process" + "gitea.dev/modules/util" "github.com/fsnotify/fsnotify" ) diff --git a/modules/auth/common.go b/modules/auth/common.go index 77361f6561..ea72d77086 100644 --- a/modules/auth/common.go +++ b/modules/auth/common.go @@ -4,8 +4,8 @@ package auth import ( - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/json" + "gitea.dev/modules/log" ) func UnmarshalGroupTeamMapping(raw string) (map[string]map[string][]string, error) { diff --git a/modules/auth/httpauth/httpauth.go b/modules/auth/httpauth/httpauth.go index 7f1f1ee152..332441bca6 100644 --- a/modules/auth/httpauth/httpauth.go +++ b/modules/auth/httpauth/httpauth.go @@ -7,7 +7,7 @@ import ( "encoding/base64" "strings" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/util" ) type BasicAuth struct { diff --git a/modules/auth/password/hash/argon2.go b/modules/auth/password/hash/argon2.go index f4a7497df6..64d1fe8294 100644 --- a/modules/auth/password/hash/argon2.go +++ b/modules/auth/password/hash/argon2.go @@ -7,7 +7,7 @@ import ( "encoding/hex" "strings" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/log" "golang.org/x/crypto/argon2" ) diff --git a/modules/auth/password/hash/common.go b/modules/auth/password/hash/common.go index 1fafc289ed..30324de546 100644 --- a/modules/auth/password/hash/common.go +++ b/modules/auth/password/hash/common.go @@ -6,8 +6,8 @@ package hash import ( "strconv" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/log" + "gitea.dev/modules/util" ) func parseIntParam(value, param, algorithmName, config string, previousErr error) (int, error) { diff --git a/modules/auth/password/hash/hash.go b/modules/auth/password/hash/hash.go index 459320e1b0..ffe5d76cbd 100644 --- a/modules/auth/password/hash/hash.go +++ b/modules/auth/password/hash/hash.go @@ -10,7 +10,7 @@ import ( "strings" "sync/atomic" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/log" ) // This package takes care of hashing passwords, verifying passwords, defining diff --git a/modules/auth/password/hash/hash_test.go b/modules/auth/password/hash/hash_test.go index 7aa051733f..4b459778de 100644 --- a/modules/auth/password/hash/hash_test.go +++ b/modules/auth/password/hash/hash_test.go @@ -74,6 +74,7 @@ func TestHashing(t *testing.T) { runTests := func(password, salt string, shouldPass bool) { for _, algorithmName := range hashAlgorithmsToTest { t.Run(algorithmName, func(t *testing.T) { + t.Parallel() // CPU-bound; these subtests only read the shared hasher registry output, err := Parse(algorithmName).Hash(password, salt) if shouldPass { assert.NoError(t, err) @@ -182,6 +183,7 @@ func TestVectors(t *testing.T) { for i, vector := range vectors { for _, algorithm := range vector.algorithms { t.Run(strconv.Itoa(i)+": "+algorithm, func(t *testing.T) { + t.Parallel() // CPU-bound; these subtests only read the shared hasher registry pa := Parse(algorithm) assert.Equal(t, !vector.shouldfail, pa.VerifyPassword(vector.password, vector.output, vector.salt)) }) diff --git a/modules/auth/password/hash/pbkdf2.go b/modules/auth/password/hash/pbkdf2.go index 27382fedb8..44d7e54be1 100644 --- a/modules/auth/password/hash/pbkdf2.go +++ b/modules/auth/password/hash/pbkdf2.go @@ -8,7 +8,7 @@ import ( "encoding/hex" "strings" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/log" "golang.org/x/crypto/pbkdf2" ) diff --git a/modules/auth/password/hash/scrypt.go b/modules/auth/password/hash/scrypt.go index f3d38f751a..ef678c697e 100644 --- a/modules/auth/password/hash/scrypt.go +++ b/modules/auth/password/hash/scrypt.go @@ -7,7 +7,7 @@ import ( "encoding/hex" "strings" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/log" "golang.org/x/crypto/scrypt" ) diff --git a/modules/auth/password/password.go b/modules/auth/password/password.go index a1e101dd62..fd943c0f75 100644 --- a/modules/auth/password/password.go +++ b/modules/auth/password/password.go @@ -13,8 +13,8 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" + "gitea.dev/modules/setting" + "gitea.dev/modules/translation" ) var ( diff --git a/modules/auth/password/pwn.go b/modules/auth/password/pwn.go index e00205ea19..3539f250a8 100644 --- a/modules/auth/password/pwn.go +++ b/modules/auth/password/pwn.go @@ -8,8 +8,8 @@ import ( "errors" "fmt" - "code.gitea.io/gitea/modules/auth/password/pwn" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/auth/password/pwn" + "gitea.dev/modules/setting" ) var ErrIsPwned = errors.New("password has been pwned") diff --git a/modules/auth/password/pwn/pwn.go b/modules/auth/password/pwn/pwn.go index d5ea96c4af..a4043996fa 100644 --- a/modules/auth/password/pwn/pwn.go +++ b/modules/auth/password/pwn/pwn.go @@ -14,7 +14,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/setting" ) const passwordURL = "https://api.pwnedpasswords.com/range/" diff --git a/modules/auth/webauthn/webauthn.go b/modules/auth/webauthn/webauthn.go index 86f55c6b24..b0b4959168 100644 --- a/modules/auth/webauthn/webauthn.go +++ b/modules/auth/webauthn/webauthn.go @@ -8,10 +8,10 @@ import ( "encoding/binary" "encoding/gob" - "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/auth" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" "github.com/go-webauthn/webauthn/protocol" "github.com/go-webauthn/webauthn/webauthn" diff --git a/modules/auth/webauthn/webauthn_test.go b/modules/auth/webauthn/webauthn_test.go index 15a8d71828..c83afefa2a 100644 --- a/modules/auth/webauthn/webauthn_test.go +++ b/modules/auth/webauthn/webauthn_test.go @@ -6,7 +6,7 @@ package webauthn import ( "testing" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/avatar/avatar.go b/modules/avatar/avatar.go index 44c61e1ff6..ccb5ce58c3 100644 --- a/modules/avatar/avatar.go +++ b/modules/avatar/avatar.go @@ -11,8 +11,8 @@ import ( "image/color" "image/png" - "code.gitea.io/gitea/modules/avatar/identicon" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/avatar/identicon" + "gitea.dev/modules/setting" _ "golang.org/x/image/webp" // for processing webp images _ "image/gif" // for processing gif images diff --git a/modules/avatar/avatar_test.go b/modules/avatar/avatar_test.go index 5414184b6b..8e2aae43fe 100644 --- a/modules/avatar/avatar_test.go +++ b/modules/avatar/avatar_test.go @@ -10,7 +10,7 @@ import ( "os" "testing" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/avatar/hash_test.go b/modules/avatar/hash_test.go index c518144b47..089f8b25bf 100644 --- a/modules/avatar/hash_test.go +++ b/modules/avatar/hash_test.go @@ -9,7 +9,7 @@ import ( "image/png" "testing" - "code.gitea.io/gitea/modules/avatar" + "gitea.dev/modules/avatar" "github.com/stretchr/testify/assert" ) diff --git a/modules/badge/badge.go b/modules/badge/badge.go index d2e9bd9d1b..60781f1893 100644 --- a/modules/badge/badge.go +++ b/modules/badge/badge.go @@ -8,7 +8,7 @@ import ( "sync" "unicode" - actions_model "code.gitea.io/gitea/models/actions" + actions_model "gitea.dev/models/actions" ) // The Badge layout: |offset|label|message| diff --git a/modules/base/tool.go b/modules/base/tool.go index ed94575e74..3709d5ffee 100644 --- a/modules/base/tool.go +++ b/modules/base/tool.go @@ -14,8 +14,8 @@ import ( "strconv" "time" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" "github.com/dustin/go-humanize" ) diff --git a/modules/base/tool_test.go b/modules/base/tool_test.go index 85d28836f1..2523771b93 100644 --- a/modules/base/tool_test.go +++ b/modules/base/tool_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/cache/cache.go b/modules/cache/cache.go index 039caa9fbc..3be8f0fb0a 100644 --- a/modules/cache/cache.go +++ b/modules/cache/cache.go @@ -10,7 +10,7 @@ import ( "strconv" "time" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/setting" _ "gitea.com/go-chi/cache/memcache" //nolint:depguard // memcache plugin for cache, it is required for config "ADAPTER=memcache" ) diff --git a/modules/cache/cache_redis.go b/modules/cache/cache_redis.go index 7473c938af..f6029d533b 100644 --- a/modules/cache/cache_redis.go +++ b/modules/cache/cache_redis.go @@ -8,8 +8,8 @@ import ( "strconv" "time" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/nosql" + "gitea.dev/modules/graceful" + "gitea.dev/modules/nosql" "gitea.com/go-chi/cache" //nolint:depguard // we wrap this package here "github.com/redis/go-redis/v9" diff --git a/modules/cache/cache_test.go b/modules/cache/cache_test.go index d6ea2032ee..97ccf0f6e5 100644 --- a/modules/cache/cache_test.go +++ b/modules/cache/cache_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/cache/cache_twoqueue.go b/modules/cache/cache_twoqueue.go index c8db686e57..ea0f0410e9 100644 --- a/modules/cache/cache_twoqueue.go +++ b/modules/cache/cache_twoqueue.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/json" + "gitea.dev/modules/json" mc "gitea.com/go-chi/cache" //nolint:depguard // we wrap this package here lru "github.com/hashicorp/golang-lru/v2" diff --git a/modules/cache/context_test.go b/modules/cache/context_test.go index 8371c2b908..1eee11836e 100644 --- a/modules/cache/context_test.go +++ b/modules/cache/context_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/test" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/cache/ephemeral.go b/modules/cache/ephemeral.go index 6996010ac4..9e0a611dc7 100644 --- a/modules/cache/ephemeral.go +++ b/modules/cache/ephemeral.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/log" + "gitea.dev/modules/util" ) // EphemeralCache is a cache that can be used to store data in a request level context diff --git a/modules/cache/string_cache.go b/modules/cache/string_cache.go index 3562b7a926..1582c319c4 100644 --- a/modules/cache/string_cache.go +++ b/modules/cache/string_cache.go @@ -7,9 +7,9 @@ import ( "errors" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/json" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" chi_cache "gitea.com/go-chi/cache" //nolint:depguard // we wrap this package here ) diff --git a/modules/charset/ambiguous.go b/modules/charset/ambiguous.go index c87d3cfa5a..97f676c372 100644 --- a/modules/charset/ambiguous.go +++ b/modules/charset/ambiguous.go @@ -8,7 +8,7 @@ import ( "strings" "unicode" - "code.gitea.io/gitea/modules/translation" + "gitea.dev/modules/translation" ) // AmbiguousTablesForLocale provides the table of ambiguous characters for this locale. diff --git a/modules/charset/ambiguous_gen_test.go b/modules/charset/ambiguous_gen_test.go index 81d2e8065b..7b5ebc2c29 100644 --- a/modules/charset/ambiguous_gen_test.go +++ b/modules/charset/ambiguous_gen_test.go @@ -8,7 +8,7 @@ import ( "testing" "unicode" - "code.gitea.io/gitea/modules/translation" + "gitea.dev/modules/translation" "github.com/stretchr/testify/assert" ) diff --git a/modules/charset/charset.go b/modules/charset/charset.go index e5df55c9b6..70f46142a5 100644 --- a/modules/charset/charset.go +++ b/modules/charset/charset.go @@ -12,8 +12,8 @@ import ( "unicode" "unicode/utf8" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" "github.com/gogs/chardet" "golang.org/x/net/html/charset" diff --git a/modules/charset/charset_test.go b/modules/charset/charset_test.go index 0314abc347..30b16e2d47 100644 --- a/modules/charset/charset_test.go +++ b/modules/charset/charset_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/charset/escape.go b/modules/charset/escape.go index 8f25e7876d..596bde8e74 100644 --- a/modules/charset/escape.go +++ b/modules/charset/escape.go @@ -8,8 +8,8 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" + "gitea.dev/modules/setting" + "gitea.dev/modules/translation" ) type EscapeOptions struct { diff --git a/modules/charset/escape_stream.go b/modules/charset/escape_stream.go index 11d09083fc..360e77782f 100644 --- a/modules/charset/escape_stream.go +++ b/modules/charset/escape_stream.go @@ -11,8 +11,8 @@ import ( "unicode" "unicode/utf8" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" + "gitea.dev/modules/setting" + "gitea.dev/modules/translation" ) type htmlChunkReader struct { diff --git a/modules/charset/escape_test.go b/modules/charset/escape_test.go index 4e1ff0fcf4..9791cbd933 100644 --- a/modules/charset/escape_test.go +++ b/modules/charset/escape_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/modules/translation" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/charset/generate/generate.go b/modules/charset/generate/generate.go index 16ea53fda1..0d719ae97e 100644 --- a/modules/charset/generate/generate.go +++ b/modules/charset/generate/generate.go @@ -13,7 +13,7 @@ import ( "text/template" "unicode" - "code.gitea.io/gitea/modules/json" + "gitea.dev/modules/json" "golang.org/x/text/unicode/rangetable" ) diff --git a/modules/csv/csv.go b/modules/csv/csv.go index ad61b81d69..1985e27828 100644 --- a/modules/csv/csv.go +++ b/modules/csv/csv.go @@ -11,9 +11,9 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/markup" + "gitea.dev/modules/translation" + "gitea.dev/modules/util" ) const ( diff --git a/modules/csv/csv_test.go b/modules/csv/csv_test.go index 5ea9718466..d217d57e53 100644 --- a/modules/csv/csv_test.go +++ b/modules/csv/csv_test.go @@ -11,8 +11,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/translation" + "gitea.dev/modules/markup" + "gitea.dev/modules/translation" "github.com/stretchr/testify/assert" ) diff --git a/modules/dump/dumper.go b/modules/dump/dumper.go index 2f16070704..edc666db6d 100644 --- a/modules/dump/dumper.go +++ b/modules/dump/dumper.go @@ -16,9 +16,9 @@ import ( "slices" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/modules/timeutil" "github.com/mholt/archives" ) diff --git a/modules/dump/dumper_test.go b/modules/dump/dumper_test.go index f6b79c072a..b713c87121 100644 --- a/modules/dump/dumper_test.go +++ b/modules/dump/dumper_test.go @@ -14,7 +14,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/emoji/emoji.go b/modules/emoji/emoji.go index 891a0b9ab3..26d552a2a2 100644 --- a/modules/emoji/emoji.go +++ b/modules/emoji/emoji.go @@ -10,7 +10,7 @@ import ( "strings" "sync/atomic" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/setting" ) // Gemoji is a set of emoji data. diff --git a/modules/emoji/emoji_test.go b/modules/emoji/emoji_test.go index 607299cdc1..e33239bf19 100644 --- a/modules/emoji/emoji_test.go +++ b/modules/emoji/emoji_test.go @@ -7,9 +7,9 @@ package emoji import ( "testing" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "gitea.dev/modules/container" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/eventsource/event.go b/modules/eventsource/event.go index c72cc466a0..1f2372d980 100644 --- a/modules/eventsource/event.go +++ b/modules/eventsource/event.go @@ -9,7 +9,7 @@ import ( "io" "time" - "code.gitea.io/gitea/modules/json" + "gitea.dev/modules/json" ) func wrapNewlines(w io.Writer, prefix, value []byte) (sum int64, err error) { diff --git a/modules/eventsource/manager_run.go b/modules/eventsource/manager_run.go index 4a42224dda..b39d400813 100644 --- a/modules/eventsource/manager_run.go +++ b/modules/eventsource/manager_run.go @@ -7,16 +7,16 @@ import ( "context" "time" - activities_model "code.gitea.io/gitea/models/activities" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/services/convert" + activities_model "gitea.dev/models/activities" + issues_model "gitea.dev/models/issues" + user_model "gitea.dev/models/user" + "gitea.dev/modules/graceful" + "gitea.dev/modules/json" + "gitea.dev/modules/log" + "gitea.dev/modules/process" + "gitea.dev/modules/setting" + "gitea.dev/modules/timeutil" + "gitea.dev/services/convert" ) // Init starts this eventsource diff --git a/modules/fileicon/basic.go b/modules/fileicon/basic.go index 9c513ccbd9..c777345b72 100644 --- a/modules/fileicon/basic.go +++ b/modules/fileicon/basic.go @@ -6,8 +6,8 @@ package fileicon import ( "html/template" - "code.gitea.io/gitea/modules/svg" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/svg" + "gitea.dev/modules/util" ) func BasicEntryIconName(entry *EntryInfo) string { diff --git a/modules/fileicon/entry.go b/modules/fileicon/entry.go index 0326c2bfa8..2f76da2475 100644 --- a/modules/fileicon/entry.go +++ b/modules/fileicon/entry.go @@ -3,7 +3,7 @@ package fileicon -import "code.gitea.io/gitea/modules/git" +import "gitea.dev/modules/git" type EntryInfo struct { BaseName string diff --git a/modules/fileicon/material.go b/modules/fileicon/material.go index b8ee13cd8c..94c2cead3d 100644 --- a/modules/fileicon/material.go +++ b/modules/fileicon/material.go @@ -8,12 +8,12 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/options" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/svg" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/json" + "gitea.dev/modules/log" + "gitea.dev/modules/options" + "gitea.dev/modules/setting" + "gitea.dev/modules/svg" + "gitea.dev/modules/util" ) type materialIconRulesData struct { diff --git a/modules/fileicon/material_test.go b/modules/fileicon/material_test.go index d2a769eaac..f6e08ba4c1 100644 --- a/modules/fileicon/material_test.go +++ b/modules/fileicon/material_test.go @@ -6,9 +6,9 @@ package fileicon_test import ( "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/fileicon" - "code.gitea.io/gitea/modules/git" + "gitea.dev/models/unittest" + "gitea.dev/modules/fileicon" + "gitea.dev/modules/git" "github.com/stretchr/testify/assert" ) diff --git a/modules/fileicon/render.go b/modules/fileicon/render.go index 5bf2a3a02e..b974196994 100644 --- a/modules/fileicon/render.go +++ b/modules/fileicon/render.go @@ -7,7 +7,7 @@ import ( "html/template" "strings" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/setting" ) type RenderedIconPool struct { diff --git a/modules/fileicon/render_test.go b/modules/fileicon/render_test.go index d9998f3f4c..ac03fc4928 100644 --- a/modules/fileicon/render_test.go +++ b/modules/fileicon/render_test.go @@ -6,10 +6,10 @@ package fileicon_test import ( "testing" - "code.gitea.io/gitea/modules/fileicon" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "gitea.dev/modules/fileicon" + "gitea.dev/modules/git" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/generate/generate.go b/modules/generate/generate.go index 9baa057b17..f2a5b366d8 100644 --- a/modules/generate/generate.go +++ b/modules/generate/generate.go @@ -11,7 +11,7 @@ import ( "io" "time" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/util" "github.com/golang-jwt/jwt/v5" ) diff --git a/modules/git/attribute/attribute.go b/modules/git/attribute/attribute.go index 8719369df8..02c601399a 100644 --- a/modules/git/attribute/attribute.go +++ b/modules/git/attribute/attribute.go @@ -6,7 +6,7 @@ package attribute import ( "strings" - "code.gitea.io/gitea/modules/optional" + "gitea.dev/modules/optional" ) type Attribute string diff --git a/modules/git/attribute/batch.go b/modules/git/attribute/batch.go index b1e6387ade..96d63a910f 100644 --- a/modules/git/attribute/batch.go +++ b/modules/git/attribute/batch.go @@ -11,9 +11,9 @@ import ( "path/filepath" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/git" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/log" ) // BatchChecker provides a reader for check-attribute content that can be long running diff --git a/modules/git/attribute/batch_test.go b/modules/git/attribute/batch_test.go index 30a3d805fe..a71a73b302 100644 --- a/modules/git/attribute/batch_test.go +++ b/modules/git/attribute/batch_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "gitea.dev/modules/git" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/attribute/checker.go b/modules/git/attribute/checker.go index 3eea31e813..0be610994c 100644 --- a/modules/git/attribute/checker.go +++ b/modules/git/attribute/checker.go @@ -10,8 +10,8 @@ import ( "fmt" "os" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" + "gitea.dev/modules/git" + "gitea.dev/modules/git/gitcmd" ) func checkAttrCommand(gitRepo *git.Repository, treeish string, filenames, attributes []string) (*gitcmd.Command, []string, func(), error) { diff --git a/modules/git/attribute/checker_test.go b/modules/git/attribute/checker_test.go index 67fbda8918..ca10214351 100644 --- a/modules/git/attribute/checker_test.go +++ b/modules/git/attribute/checker_test.go @@ -7,9 +7,9 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "gitea.dev/modules/git" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/attribute/main_test.go b/modules/git/attribute/main_test.go index 1f1d80ec0a..174c27c6f1 100644 --- a/modules/git/attribute/main_test.go +++ b/modules/git/attribute/main_test.go @@ -8,9 +8,9 @@ import ( "os" "testing" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/git" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" ) func testRun(m *testing.M) error { diff --git a/modules/git/blob.go b/modules/git/blob.go index 40d8f44e79..eca9e37d95 100644 --- a/modules/git/blob.go +++ b/modules/git/blob.go @@ -11,8 +11,8 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/typesniffer" + "gitea.dev/modules/util" ) // This file contains common functions between the gogit and !gogit variants for git Blobs diff --git a/modules/git/blob_gogit.go b/modules/git/blob_gogit.go index 7cf622d180..4b96c69253 100644 --- a/modules/git/blob_gogit.go +++ b/modules/git/blob_gogit.go @@ -9,7 +9,7 @@ package git import ( "io" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/log" "github.com/go-git/go-git/v5/plumbing" ) diff --git a/modules/git/blob_nogogit.go b/modules/git/blob_nogogit.go index 837b30fd88..102faf2a5f 100644 --- a/modules/git/blob_nogogit.go +++ b/modules/git/blob_nogogit.go @@ -8,7 +8,7 @@ package git import ( "io" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/log" ) // Blob represents a Git object. diff --git a/modules/git/catfile_batch_command.go b/modules/git/catfile_batch_command.go index 4e18282bf3..3cf7defa8b 100644 --- a/modules/git/catfile_batch_command.go +++ b/modules/git/catfile_batch_command.go @@ -9,9 +9,9 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" ) // catFileBatchCommand implements the CatFileBatch interface using the "cat-file --batch-command" command diff --git a/modules/git/catfile_batch_legacy.go b/modules/git/catfile_batch_legacy.go index 595043d1d2..05c55f3008 100644 --- a/modules/git/catfile_batch_legacy.go +++ b/modules/git/catfile_batch_legacy.go @@ -10,9 +10,9 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" ) // catFileBatchLegacy implements the CatFileBatch interface using the "cat-file --batch" command and "cat-file --batch-check" command diff --git a/modules/git/catfile_batch_reader.go b/modules/git/catfile_batch_reader.go index 4d77fb03c7..71c0c87af6 100644 --- a/modules/git/catfile_batch_reader.go +++ b/modules/git/catfile_batch_reader.go @@ -15,9 +15,9 @@ import ( "strings" "sync/atomic" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/log" + "gitea.dev/modules/util" ) type catFileBatchCommunicator struct { diff --git a/modules/git/catfile_batch_test.go b/modules/git/catfile_batch_test.go index 782d34d249..072759e409 100644 --- a/modules/git/catfile_batch_test.go +++ b/modules/git/catfile_batch_test.go @@ -9,7 +9,7 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/test" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/commit.go b/modules/git/commit.go index b576451db8..0231770a29 100644 --- a/modules/git/commit.go +++ b/modules/git/commit.go @@ -11,9 +11,9 @@ import ( "os/exec" "strings" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/charset" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/util" ) type CommitMessage struct { diff --git a/modules/git/commit_info_nogogit.go b/modules/git/commit_info_nogogit.go index ed775332a9..cf53f9fdf4 100644 --- a/modules/git/commit_info_nogogit.go +++ b/modules/git/commit_info_nogogit.go @@ -11,7 +11,7 @@ import ( "path" "sort" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/log" ) // GetCommitsInfo gets information of all commits that are corresponding to these entries diff --git a/modules/git/commit_submodule_file.go b/modules/git/commit_submodule_file.go index efcf53b07c..fe925dda97 100644 --- a/modules/git/commit_submodule_file.go +++ b/modules/git/commit_submodule_file.go @@ -9,8 +9,8 @@ import ( "path" "strings" - giturl "code.gitea.io/gitea/modules/git/url" - "code.gitea.io/gitea/modules/util" + giturl "gitea.dev/modules/git/url" + "gitea.dev/modules/util" ) // CommitSubmoduleFile represents a file with submodule type. diff --git a/modules/git/config.go b/modules/git/config.go index 79aa0535e4..b1ca18c988 100644 --- a/modules/git/config.go +++ b/modules/git/config.go @@ -11,8 +11,8 @@ import ( "runtime" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/setting" ) // syncGitConfig only modifies gitconfig, won't change global variables (otherwise there will be data-race problem) diff --git a/modules/git/config_test.go b/modules/git/config_test.go index 237feb67d5..9e358d4a80 100644 --- a/modules/git/config_test.go +++ b/modules/git/config_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/git/diff.go b/modules/git/diff.go index d7732eaa29..eebb3c098f 100644 --- a/modules/git/diff.go +++ b/modules/git/diff.go @@ -12,10 +12,10 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" ) // RawDiffType output format: diff or patch diff --git a/modules/git/error.go b/modules/git/error.go index 1b7bdca043..23853f42a2 100644 --- a/modules/git/error.go +++ b/modules/git/error.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/util" ) // ErrNotExist commit not exist error diff --git a/modules/git/foreachref/format_test.go b/modules/git/foreachref/format_test.go index 8ff239323c..5d1082e795 100644 --- a/modules/git/foreachref/format_test.go +++ b/modules/git/foreachref/format_test.go @@ -6,7 +6,7 @@ package foreachref_test import ( "testing" - "code.gitea.io/gitea/modules/git/foreachref" + "gitea.dev/modules/git/foreachref" "github.com/stretchr/testify/require" ) diff --git a/modules/git/foreachref/parser_test.go b/modules/git/foreachref/parser_test.go index fc1c8e7cf6..4ace4286d6 100644 --- a/modules/git/foreachref/parser_test.go +++ b/modules/git/foreachref/parser_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/git/foreachref" - "code.gitea.io/gitea/modules/json" + "gitea.dev/modules/git/foreachref" + "gitea.dev/modules/json" "github.com/stretchr/testify/require" ) diff --git a/modules/git/git.go b/modules/git/git.go index 69eb07d1f0..5359781968 100644 --- a/modules/git/git.go +++ b/modules/git/git.go @@ -13,11 +13,11 @@ import ( "runtime" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/tempdir" - "code.gitea.io/gitea/modules/testlogger" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/modules/tempdir" + "gitea.dev/modules/testlogger" "github.com/hashicorp/go-version" ) diff --git a/modules/git/gitcmd/command.go b/modules/git/gitcmd/command.go index 9e402a3cd7..029cd907f9 100644 --- a/modules/git/gitcmd/command.go +++ b/modules/git/gitcmd/command.go @@ -16,12 +16,12 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/git/internal" //nolint:depguard // only this file can use the internal type CmdArg, other files and packages should use AddXxx functions - "code.gitea.io/gitea/modules/gtprof" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/git/internal" //nolint:depguard // only this file can use the internal type CmdArg, other files and packages should use AddXxx functions + "gitea.dev/modules/gtprof" + "gitea.dev/modules/log" + "gitea.dev/modules/process" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" ) // TrustedCmdArgs returns the trusted arguments for git command. diff --git a/modules/git/gitcmd/command_test.go b/modules/git/gitcmd/command_test.go index 1a9bfe7d75..8425f6f837 100644 --- a/modules/git/gitcmd/command_test.go +++ b/modules/git/gitcmd/command_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/tempdir" - "code.gitea.io/gitea/modules/testlogger" + "gitea.dev/modules/setting" + "gitea.dev/modules/tempdir" + "gitea.dev/modules/testlogger" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/gitcmd/env.go b/modules/git/gitcmd/env.go index 269b51a253..4f8b860e37 100644 --- a/modules/git/gitcmd/env.go +++ b/modules/git/gitcmd/env.go @@ -7,8 +7,8 @@ import ( "fmt" "os/exec" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" ) var GitExecutable = "git" // the command name of git, will be updated to an absolute path during initialization diff --git a/modules/git/gitcmd/host_key_test.go b/modules/git/gitcmd/host_key_test.go index 391b72aac8..13def89e77 100644 --- a/modules/git/gitcmd/host_key_test.go +++ b/modules/git/gitcmd/host_key_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/gpg.go b/modules/git/gpg.go index dbc5569309..68974b9367 100644 --- a/modules/git/gpg.go +++ b/modules/git/gpg.go @@ -11,8 +11,8 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/process" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/process" ) // GPGSettings represents the default GPG settings for this repository diff --git a/modules/git/grep.go b/modules/git/grep.go index 47f66b88b2..5eb8a0320c 100644 --- a/modules/git/grep.go +++ b/modules/git/grep.go @@ -13,8 +13,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/util" ) type GrepResult struct { diff --git a/modules/git/hook.go b/modules/git/hook.go index 0e19387d97..b8cf186dc1 100644 --- a/modules/git/hook.go +++ b/modules/git/hook.go @@ -11,7 +11,7 @@ import ( "slices" "strings" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/util" ) // hookNames is a list of Git server hooks' name that are supported. diff --git a/modules/git/key.go b/modules/git/key.go index 9d51704595..9fd1e09f57 100644 --- a/modules/git/key.go +++ b/modules/git/key.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/setting" ) // Based on https://git-scm.com/docs/git-config#Documentation/git-config.txt-gpgformat diff --git a/modules/git/languagestats/language_stats.go b/modules/git/languagestats/language_stats.go index a71284c3e4..b83d4299cd 100644 --- a/modules/git/languagestats/language_stats.go +++ b/modules/git/languagestats/language_stats.go @@ -8,8 +8,8 @@ import ( "strings" "unicode" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/attribute" + "gitea.dev/modules/git" + "gitea.dev/modules/git/attribute" ) const ( diff --git a/modules/git/languagestats/language_stats_gogit.go b/modules/git/languagestats/language_stats_gogit.go index ec03ca3159..090ac53274 100644 --- a/modules/git/languagestats/language_stats_gogit.go +++ b/modules/git/languagestats/language_stats_gogit.go @@ -9,10 +9,10 @@ import ( "bytes" "io" - "code.gitea.io/gitea/modules/analyze" - git_module "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/attribute" - "code.gitea.io/gitea/modules/optional" + "gitea.dev/modules/analyze" + git_module "gitea.dev/modules/git" + "gitea.dev/modules/git/attribute" + "gitea.dev/modules/optional" "github.com/go-enry/go-enry/v2" "github.com/go-git/go-git/v5" diff --git a/modules/git/languagestats/language_stats_nogogit.go b/modules/git/languagestats/language_stats_nogogit.go index 442313d495..de431ee33a 100644 --- a/modules/git/languagestats/language_stats_nogogit.go +++ b/modules/git/languagestats/language_stats_nogogit.go @@ -9,11 +9,11 @@ import ( "bytes" "io" - "code.gitea.io/gitea/modules/analyze" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/attribute" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" + "gitea.dev/modules/analyze" + "gitea.dev/modules/git" + "gitea.dev/modules/git/attribute" + "gitea.dev/modules/log" + "gitea.dev/modules/optional" "github.com/go-enry/go-enry/v2" ) diff --git a/modules/git/languagestats/language_stats_test.go b/modules/git/languagestats/language_stats_test.go index b908ae6413..1953559f91 100644 --- a/modules/git/languagestats/language_stats_test.go +++ b/modules/git/languagestats/language_stats_test.go @@ -8,8 +8,8 @@ package languagestats import ( "testing" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/git" + "gitea.dev/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/languagestats/main_test.go b/modules/git/languagestats/main_test.go index bf860f2a18..b70be1a5e7 100644 --- a/modules/git/languagestats/main_test.go +++ b/modules/git/languagestats/main_test.go @@ -6,7 +6,7 @@ package languagestats import ( "testing" - "code.gitea.io/gitea/modules/git" + "gitea.dev/modules/git" ) func TestMain(m *testing.M) { diff --git a/modules/git/last_commit_cache.go b/modules/git/last_commit_cache.go index a013773b47..a7e78ff8b3 100644 --- a/modules/git/last_commit_cache.go +++ b/modules/git/last_commit_cache.go @@ -7,9 +7,9 @@ import ( "crypto/sha256" "fmt" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/cache" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" ) func getCacheKey(repoPath, commitID, entryPath string) string { diff --git a/modules/git/log_name_status.go b/modules/git/log_name_status.go index 6e6d9985ae..a7347a6d8a 100644 --- a/modules/git/log_name_status.go +++ b/modules/git/log_name_status.go @@ -13,9 +13,9 @@ import ( "sort" "strings" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/container" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/log" ) // LogNameStatusRepo opens git log --raw in the provided repo and returns a stdin pipe, a stdout reader and cancel function diff --git a/modules/git/notes_gogit.go b/modules/git/notes_gogit.go index b3638820dd..a4cf575ad4 100644 --- a/modules/git/notes_gogit.go +++ b/modules/git/notes_gogit.go @@ -11,7 +11,7 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/log" "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/object" diff --git a/modules/git/notes_nogogit.go b/modules/git/notes_nogogit.go index 4da375c321..09ee53f693 100644 --- a/modules/git/notes_nogogit.go +++ b/modules/git/notes_nogogit.go @@ -10,7 +10,7 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/log" ) // GetNote retrieves the git-notes data for a given commit. diff --git a/modules/git/parse.go b/modules/git/parse.go index 94020e690d..045caf0bed 100644 --- a/modules/git/parse.go +++ b/modules/git/parse.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/optional" + "gitea.dev/modules/optional" ) var sepSpace = []byte{' '} diff --git a/modules/git/pipeline/catfile.go b/modules/git/pipeline/catfile.go index 3d005e28f1..767f08af90 100644 --- a/modules/git/pipeline/catfile.go +++ b/modules/git/pipeline/catfile.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" + "gitea.dev/modules/git/gitcmd" ) // CatFileBatchCheck runs cat-file with --batch-check diff --git a/modules/git/pipeline/lfs_common.go b/modules/git/pipeline/lfs_common.go index 914aefbeaf..99949affde 100644 --- a/modules/git/pipeline/lfs_common.go +++ b/modules/git/pipeline/lfs_common.go @@ -6,7 +6,7 @@ package pipeline import ( "time" - "code.gitea.io/gitea/modules/git" + "gitea.dev/modules/git" ) // LFSResult represents commits found using a provided pointer file hash diff --git a/modules/git/pipeline/lfs_gogit.go b/modules/git/pipeline/lfs_gogit.go index c12397569c..c9685c053d 100644 --- a/modules/git/pipeline/lfs_gogit.go +++ b/modules/git/pipeline/lfs_gogit.go @@ -11,7 +11,7 @@ import ( "sort" "strings" - "code.gitea.io/gitea/modules/git" + "gitea.dev/modules/git" gogit "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" diff --git a/modules/git/pipeline/lfs_nogogit.go b/modules/git/pipeline/lfs_nogogit.go index b4a4aff4ed..8b596e9b05 100644 --- a/modules/git/pipeline/lfs_nogogit.go +++ b/modules/git/pipeline/lfs_nogogit.go @@ -11,8 +11,8 @@ import ( "io" "sort" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" + "gitea.dev/modules/git" + "gitea.dev/modules/git/gitcmd" ) // FindLFSFile finds commits that contain a provided pointer file hash diff --git a/modules/git/pipeline/lfs_test.go b/modules/git/pipeline/lfs_test.go index 30fe2f93c2..97cdbea5ca 100644 --- a/modules/git/pipeline/lfs_test.go +++ b/modules/git/pipeline/lfs_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/git" + "gitea.dev/modules/git" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/pipeline/main_test.go b/modules/git/pipeline/main_test.go index fa5832b68c..7481bec250 100644 --- a/modules/git/pipeline/main_test.go +++ b/modules/git/pipeline/main_test.go @@ -6,7 +6,7 @@ package pipeline import ( "testing" - "code.gitea.io/gitea/modules/git" + "gitea.dev/modules/git" ) func TestMain(m *testing.M) { diff --git a/modules/git/pipeline/namerev.go b/modules/git/pipeline/namerev.go index 24de442940..c8447b86d5 100644 --- a/modules/git/pipeline/namerev.go +++ b/modules/git/pipeline/namerev.go @@ -9,7 +9,7 @@ import ( "errors" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" + "gitea.dev/modules/git/gitcmd" "golang.org/x/sync/errgroup" ) diff --git a/modules/git/pipeline/revlist.go b/modules/git/pipeline/revlist.go index 28d4751bd8..48b489bef7 100644 --- a/modules/git/pipeline/revlist.go +++ b/modules/git/pipeline/revlist.go @@ -9,7 +9,7 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" + "gitea.dev/modules/git/gitcmd" ) // RevListObjects run rev-list --objects from headSHA to baseSHA diff --git a/modules/git/ref.go b/modules/git/ref.go index 7b63d06b38..6ce4968738 100644 --- a/modules/git/ref.go +++ b/modules/git/ref.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/util" ) const ( diff --git a/modules/git/remote.go b/modules/git/remote.go index cec9fefea2..291feb1bee 100644 --- a/modules/git/remote.go +++ b/modules/git/remote.go @@ -9,9 +9,9 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" - giturl "code.gitea.io/gitea/modules/git/url" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/git/gitcmd" + giturl "gitea.dev/modules/git/url" + "gitea.dev/modules/util" ) // GetRemoteAddress returns remote url of git repository in the repoPath with special remote name diff --git a/modules/git/repo.go b/modules/git/repo.go index 64671a73c9..606eeba292 100644 --- a/modules/git/repo.go +++ b/modules/git/repo.go @@ -15,8 +15,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/proxy" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/proxy" ) const prettyLogFormat = `--pretty=format:%H` diff --git a/modules/git/repo_base_gogit.go b/modules/git/repo_base_gogit.go index 986264fd93..83f12f3f9e 100644 --- a/modules/git/repo_base_gogit.go +++ b/modules/git/repo_base_gogit.go @@ -10,9 +10,9 @@ import ( "context" "path/filepath" - gitealog "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + gitealog "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" "github.com/go-git/go-billy/v5" "github.com/go-git/go-billy/v5/osfs" diff --git a/modules/git/repo_base_nogogit.go b/modules/git/repo_base_nogogit.go index 775bbd4a09..2206849544 100644 --- a/modules/git/repo_base_nogogit.go +++ b/modules/git/repo_base_nogogit.go @@ -11,8 +11,8 @@ import ( "path/filepath" "sync" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/log" + "gitea.dev/modules/util" ) const isGogit = false diff --git a/modules/git/repo_branch.go b/modules/git/repo_branch.go index 1eebc72158..aef09a0927 100644 --- a/modules/git/repo_branch.go +++ b/modules/git/repo_branch.go @@ -5,7 +5,7 @@ package git import ( - "code.gitea.io/gitea/modules/git/gitcmd" + "gitea.dev/modules/git/gitcmd" ) // BranchPrefix base dir of the branch information file store on git diff --git a/modules/git/repo_branch_nogogit.go b/modules/git/repo_branch_nogogit.go index f925aab3e4..b43b622d05 100644 --- a/modules/git/repo_branch_nogogit.go +++ b/modules/git/repo_branch_nogogit.go @@ -12,8 +12,8 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/log" ) // IsObjectExist returns true if the given object exists in the repository. diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go index 8ba3f83386..cbe5053346 100644 --- a/modules/git/repo_commit.go +++ b/modules/git/repo_commit.go @@ -11,8 +11,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/setting" ) // GetBranchCommitID returns last commit ID string of given branch. diff --git a/modules/git/repo_commit_gogit.go b/modules/git/repo_commit_gogit.go index 550d153722..ce85b8a878 100644 --- a/modules/git/repo_commit_gogit.go +++ b/modules/git/repo_commit_gogit.go @@ -9,7 +9,7 @@ package git import ( "strings" - "code.gitea.io/gitea/modules/git/gitcmd" + "gitea.dev/modules/git/gitcmd" "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/hash" diff --git a/modules/git/repo_commit_nogogit.go b/modules/git/repo_commit_nogogit.go index 2ddb527502..c90650532b 100644 --- a/modules/git/repo_commit_nogogit.go +++ b/modules/git/repo_commit_nogogit.go @@ -10,8 +10,8 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/log" ) // ResolveReference resolves a name to a reference diff --git a/modules/git/repo_commit_test.go b/modules/git/repo_commit_test.go index ea56a1375d..517decf0ca 100644 --- a/modules/git/repo_commit_test.go +++ b/modules/git/repo_commit_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/repo_commitgraph.go b/modules/git/repo_commitgraph.go index 3dac74304c..4db3c70f52 100644 --- a/modules/git/repo_commitgraph.go +++ b/modules/git/repo_commitgraph.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/git/gitcmd" + "gitea.dev/modules/git/gitcmd" ) // WriteCommitGraph write commit graph to speed up repo access diff --git a/modules/git/repo_commitgraph_gogit.go b/modules/git/repo_commitgraph_gogit.go index aebb9981e2..68646737a2 100644 --- a/modules/git/repo_commitgraph_gogit.go +++ b/modules/git/repo_commitgraph_gogit.go @@ -10,7 +10,7 @@ import ( "os" "path/filepath" - gitealog "code.gitea.io/gitea/modules/log" + gitealog "gitea.dev/modules/log" commitgraph "github.com/go-git/go-git/v5/plumbing/format/commitgraph/v2" cgobject "github.com/go-git/go-git/v5/plumbing/object/commitgraph" diff --git a/modules/git/repo_compare.go b/modules/git/repo_compare.go index aa25e2ec20..2fc18de58b 100644 --- a/modules/git/repo_compare.go +++ b/modules/git/repo_compare.go @@ -15,7 +15,7 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" + "gitea.dev/modules/git/gitcmd" ) type lineCountWriter struct { diff --git a/modules/git/repo_compare_test.go b/modules/git/repo_compare_test.go index bf16b7cfce..21c1e2a432 100644 --- a/modules/git/repo_compare_test.go +++ b/modules/git/repo_compare_test.go @@ -9,7 +9,7 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/git/gitcmd" + "gitea.dev/modules/git/gitcmd" "github.com/stretchr/testify/assert" ) diff --git a/modules/git/repo_index.go b/modules/git/repo_index.go index 1d040d5e0a..957bb6ee32 100644 --- a/modules/git/repo_index.go +++ b/modules/git/repo_index.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/setting" ) // ReadTreeToIndex reads a treeish to the index diff --git a/modules/git/repo_object.go b/modules/git/repo_object.go index 38e16b4646..5398973ef6 100644 --- a/modules/git/repo_object.go +++ b/modules/git/repo_object.go @@ -7,7 +7,7 @@ package git import ( "strings" - "code.gitea.io/gitea/modules/git/gitcmd" + "gitea.dev/modules/git/gitcmd" ) // ObjectType git object type diff --git a/modules/git/repo_ref.go b/modules/git/repo_ref.go index 8859a93a57..5adb1e5735 100644 --- a/modules/git/repo_ref.go +++ b/modules/git/repo_ref.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/util" ) // GetRefs returns all references of the repository. diff --git a/modules/git/repo_ref_nogogit.go b/modules/git/repo_ref_nogogit.go index c58992fa9d..918581e06a 100644 --- a/modules/git/repo_ref_nogogit.go +++ b/modules/git/repo_ref_nogogit.go @@ -10,7 +10,7 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" + "gitea.dev/modules/git/gitcmd" ) // GetRefsFiltered returns all references of the repository that matches patterm exactly or starting with. diff --git a/modules/git/repo_stats.go b/modules/git/repo_stats.go index 1dd77f05d4..716bf0ba05 100644 --- a/modules/git/repo_stats.go +++ b/modules/git/repo_stats.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git/gitcmd" + "gitea.dev/modules/container" + "gitea.dev/modules/git/gitcmd" ) // CodeActivityStats represents git statistics data diff --git a/modules/git/repo_tag.go b/modules/git/repo_tag.go index 862b370890..0a42401611 100644 --- a/modules/git/repo_tag.go +++ b/modules/git/repo_tag.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/git/foreachref" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/git/foreachref" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/util" ) // TagPrefix tags prefix path on the repository diff --git a/modules/git/repo_tag_gogit.go b/modules/git/repo_tag_gogit.go index a3e25f3899..bcb5826623 100644 --- a/modules/git/repo_tag_gogit.go +++ b/modules/git/repo_tag_gogit.go @@ -7,7 +7,7 @@ package git import ( - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/log" "github.com/go-git/go-git/v5/plumbing" ) diff --git a/modules/git/repo_tag_nogogit.go b/modules/git/repo_tag_nogogit.go index 053c633662..184e125a8f 100644 --- a/modules/git/repo_tag_nogogit.go +++ b/modules/git/repo_tag_nogogit.go @@ -10,7 +10,7 @@ import ( "errors" "io" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/log" ) // IsTagExist returns true if given tag exists in the repository. diff --git a/modules/git/repo_tree.go b/modules/git/repo_tree.go index e65e2441ed..aa750d3e1e 100644 --- a/modules/git/repo_tree.go +++ b/modules/git/repo_tree.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/git/gitcmd" + "gitea.dev/modules/git/gitcmd" ) // CommitTreeOpts represents the possible options to CommitTree diff --git a/modules/git/repo_tree_gogit.go b/modules/git/repo_tree_gogit.go index 89d34e87da..622052d64d 100644 --- a/modules/git/repo_tree_gogit.go +++ b/modules/git/repo_tree_gogit.go @@ -9,7 +9,7 @@ package git import ( "errors" - "code.gitea.io/gitea/modules/git/gitcmd" + "gitea.dev/modules/git/gitcmd" "github.com/go-git/go-git/v5/plumbing" ) diff --git a/modules/git/signature.go b/modules/git/signature.go index f50a097758..231b2e25cd 100644 --- a/modules/git/signature.go +++ b/modules/git/signature.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/log" ) // Helper to get a signature from the commit line, which looks like: diff --git a/modules/git/signature_nogogit.go b/modules/git/signature_nogogit.go index 0d19c0abdc..d4ddfb23ce 100644 --- a/modules/git/signature_nogogit.go +++ b/modules/git/signature_nogogit.go @@ -10,7 +10,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/util" ) // Signature represents the Author, Committer or Tagger information. diff --git a/modules/git/submodule.go b/modules/git/submodule.go index ed69cbe55d..1b100c06c5 100644 --- a/modules/git/submodule.go +++ b/modules/git/submodule.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/log" ) type TemplateSubmoduleCommit struct { diff --git a/modules/git/submodule_test.go b/modules/git/submodule_test.go index 22bd5bf71e..25355ac32a 100644 --- a/modules/git/submodule_test.go +++ b/modules/git/submodule_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/git/gitcmd" + "gitea.dev/modules/git/gitcmd" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/tag.go b/modules/git/tag.go index 232dda7fd9..601debde26 100644 --- a/modules/git/tag.go +++ b/modules/git/tag.go @@ -7,7 +7,7 @@ import ( "bytes" "sort" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/util" ) // Tag represents a Git tag. diff --git a/modules/git/tree.go b/modules/git/tree.go index c1898b20cb..854f45c56f 100644 --- a/modules/git/tree.go +++ b/modules/git/tree.go @@ -8,7 +8,7 @@ import ( "bytes" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" + "gitea.dev/modules/git/gitcmd" ) type TreeCommon struct { diff --git a/modules/git/tree_entry.go b/modules/git/tree_entry.go index e7e4ea2d5b..bd7e5131b5 100644 --- a/modules/git/tree_entry.go +++ b/modules/git/tree_entry.go @@ -9,7 +9,7 @@ import ( "slices" "strings" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/util" ) // TreeEntry the leaf in the git tree diff --git a/modules/git/tree_entry_common_test.go b/modules/git/tree_entry_common_test.go index 8e20ee56ff..2907077693 100644 --- a/modules/git/tree_entry_common_test.go +++ b/modules/git/tree_entry_common_test.go @@ -6,7 +6,7 @@ package git import ( "testing" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/tree_entry_nogogit.go b/modules/git/tree_entry_nogogit.go index 0a19b38d3e..467a0d7695 100644 --- a/modules/git/tree_entry_nogogit.go +++ b/modules/git/tree_entry_nogogit.go @@ -5,7 +5,7 @@ package git -import "code.gitea.io/gitea/modules/log" +import "gitea.dev/modules/log" // Size returns the size of the entry func (te *TreeEntry) Size() int64 { diff --git a/modules/git/tree_nogogit.go b/modules/git/tree_nogogit.go index 5d951dad0d..1d78ecdee2 100644 --- a/modules/git/tree_nogogit.go +++ b/modules/git/tree_nogogit.go @@ -9,7 +9,7 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" + "gitea.dev/modules/git/gitcmd" ) // Tree represents a flat directory listing. diff --git a/modules/git/url/url.go b/modules/git/url/url.go index aa6fa31c5e..d73a4fbcbf 100644 --- a/modules/git/url/url.go +++ b/modules/git/url/url.go @@ -10,9 +10,9 @@ import ( stdurl "net/url" "strings" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/httplib" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" ) // ErrWrongURLFormat represents an error with wrong url format diff --git a/modules/git/url/url_test.go b/modules/git/url/url_test.go index 76aa74a128..3a6dcf9632 100644 --- a/modules/git/url/url_test.go +++ b/modules/git/url/url_test.go @@ -9,9 +9,9 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "gitea.dev/modules/httplib" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/git/utils.go b/modules/git/utils.go index e7d30ce9ee..848af0b9e7 100644 --- a/modules/git/utils.go +++ b/modules/git/utils.go @@ -10,7 +10,7 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/util" ) // ObjectCache provides thread-safe cache operations. diff --git a/modules/gitrepo/archive.go b/modules/gitrepo/archive.go index 191a1bd2c0..d7075d6dd7 100644 --- a/modules/gitrepo/archive.go +++ b/modules/gitrepo/archive.go @@ -13,8 +13,8 @@ import ( "slices" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/setting" ) // CreateArchive create archive content to the target path diff --git a/modules/gitrepo/blame.go b/modules/gitrepo/blame.go index 2352da1760..e2a5eefa5f 100644 --- a/modules/gitrepo/blame.go +++ b/modules/gitrepo/blame.go @@ -9,9 +9,9 @@ import ( "context" "io" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/git" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/setting" ) func LineBlame(ctx context.Context, repo Repository, revision, file string, line uint) (string, error) { diff --git a/modules/gitrepo/blame_sha256_test.go b/modules/gitrepo/blame_sha256_test.go index e92931d596..5577432caf 100644 --- a/modules/gitrepo/blame_sha256_test.go +++ b/modules/gitrepo/blame_sha256_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/git" + "gitea.dev/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/gitrepo/blame_test.go b/modules/gitrepo/blame_test.go index 0307a5fd33..54be64f996 100644 --- a/modules/gitrepo/blame_test.go +++ b/modules/gitrepo/blame_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/git" + "gitea.dev/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/gitrepo/branch.go b/modules/gitrepo/branch.go index 4c40d1fba3..09594ca35a 100644 --- a/modules/gitrepo/branch.go +++ b/modules/gitrepo/branch.go @@ -8,8 +8,8 @@ import ( "errors" "strings" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" + "gitea.dev/modules/git" + "gitea.dev/modules/git/gitcmd" ) // GetBranchesByPath returns a branch by its path diff --git a/modules/gitrepo/cat_file.go b/modules/gitrepo/cat_file.go index 42ca23acde..e824c07923 100644 --- a/modules/gitrepo/cat_file.go +++ b/modules/gitrepo/cat_file.go @@ -6,7 +6,7 @@ package gitrepo import ( "context" - "code.gitea.io/gitea/modules/git" + "gitea.dev/modules/git" ) func NewBatch(ctx context.Context, repo Repository) (git.CatFileBatchCloser, error) { diff --git a/modules/gitrepo/clone.go b/modules/gitrepo/clone.go index a0e4cc814c..e1718fd879 100644 --- a/modules/gitrepo/clone.go +++ b/modules/gitrepo/clone.go @@ -6,7 +6,7 @@ package gitrepo import ( "context" - "code.gitea.io/gitea/modules/git" + "gitea.dev/modules/git" ) // CloneExternalRepo clones an external repository to the managed repository. diff --git a/modules/gitrepo/command.go b/modules/gitrepo/command.go index fd21b9a725..f672ca1dbd 100644 --- a/modules/gitrepo/command.go +++ b/modules/gitrepo/command.go @@ -6,7 +6,7 @@ package gitrepo import ( "context" - "code.gitea.io/gitea/modules/git/gitcmd" + "gitea.dev/modules/git/gitcmd" ) func RunCmd(ctx context.Context, repo Repository, cmd *gitcmd.Command) error { diff --git a/modules/gitrepo/commit.go b/modules/gitrepo/commit.go index 0a8cb0544c..38785dcb97 100644 --- a/modules/gitrepo/commit.go +++ b/modules/gitrepo/commit.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" + "gitea.dev/modules/git" + "gitea.dev/modules/git/gitcmd" ) // CommitsCountOptions the options when counting commits diff --git a/modules/gitrepo/commit_file.go b/modules/gitrepo/commit_file.go index 437b3b51ad..ce4f51ffda 100644 --- a/modules/gitrepo/commit_file.go +++ b/modules/gitrepo/commit_file.go @@ -8,8 +8,8 @@ import ( "context" "io" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/log" ) // CommitFileStatus represents status of files in a commit. diff --git a/modules/gitrepo/commitgraph.go b/modules/gitrepo/commitgraph.go index 7310e167f6..adafd107bf 100644 --- a/modules/gitrepo/commitgraph.go +++ b/modules/gitrepo/commitgraph.go @@ -6,7 +6,7 @@ package gitrepo import ( "context" - "code.gitea.io/gitea/modules/git" + "gitea.dev/modules/git" ) func WriteCommitGraph(ctx context.Context, repo Repository) error { diff --git a/modules/gitrepo/compare.go b/modules/gitrepo/compare.go index 7e38d33e6f..1628031230 100644 --- a/modules/gitrepo/compare.go +++ b/modules/gitrepo/compare.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" + "gitea.dev/modules/git/gitcmd" ) // DivergeObject represents commit count diverging commits diff --git a/modules/gitrepo/compare_test.go b/modules/gitrepo/compare_test.go index 91ee32bed5..770a3589ea 100644 --- a/modules/gitrepo/compare_test.go +++ b/modules/gitrepo/compare_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/gitrepo/config.go b/modules/gitrepo/config.go index 4940f1c078..a6e97d594d 100644 --- a/modules/gitrepo/config.go +++ b/modules/gitrepo/config.go @@ -6,8 +6,8 @@ package gitrepo import ( "context" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/globallock" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/globallock" ) func getRepoConfigLockKey(repoStoragePath string) string { diff --git a/modules/gitrepo/diff.go b/modules/gitrepo/diff.go index 0092cf0bb8..5aaddf0560 100644 --- a/modules/gitrepo/diff.go +++ b/modules/gitrepo/diff.go @@ -10,7 +10,7 @@ import ( "regexp" "strconv" - "code.gitea.io/gitea/modules/git/gitcmd" + "gitea.dev/modules/git/gitcmd" ) // GetDiffShortStatByCmdArgs counts number of changed files, number of additions and deletions diff --git a/modules/gitrepo/fetch.go b/modules/gitrepo/fetch.go index 0474d6111e..b50571e5b2 100644 --- a/modules/gitrepo/fetch.go +++ b/modules/gitrepo/fetch.go @@ -6,8 +6,8 @@ package gitrepo import ( "context" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/globallock" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/globallock" ) // FetchRemoteCommit fetches a specific commit and its related objects from a remote diff --git a/modules/gitrepo/fsck.go b/modules/gitrepo/fsck.go index f74ca3b46a..42cf9cb4f9 100644 --- a/modules/gitrepo/fsck.go +++ b/modules/gitrepo/fsck.go @@ -7,7 +7,7 @@ import ( "context" "time" - "code.gitea.io/gitea/modules/git/gitcmd" + "gitea.dev/modules/git/gitcmd" ) // Fsck verifies the connectivity and validity of the objects in the database diff --git a/modules/gitrepo/gitrepo.go b/modules/gitrepo/gitrepo.go index 535d72ed98..1af6f4406c 100644 --- a/modules/gitrepo/gitrepo.go +++ b/modules/gitrepo/gitrepo.go @@ -11,11 +11,11 @@ import ( "os" "path/filepath" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/reqctx" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/git" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/reqctx" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" ) // Repository represents a git repository which stored in a disk diff --git a/modules/gitrepo/hooks.go b/modules/gitrepo/hooks.go index d9d4a88ff1..19b24e6abb 100644 --- a/modules/gitrepo/hooks.go +++ b/modules/gitrepo/hooks.go @@ -10,8 +10,8 @@ import ( "path/filepath" "runtime" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" ) func getHookTemplates() (hookNames, hookTpls, giteaHookTpls []string) { diff --git a/modules/gitrepo/main_test.go b/modules/gitrepo/main_test.go index 08afdffcc6..d7dd292155 100644 --- a/modules/gitrepo/main_test.go +++ b/modules/gitrepo/main_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/git" + "gitea.dev/modules/setting" ) func TestMain(m *testing.M) { diff --git a/modules/gitrepo/merge.go b/modules/gitrepo/merge.go index 5198392949..831b96102b 100644 --- a/modules/gitrepo/merge.go +++ b/modules/gitrepo/merge.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/util" ) // MergeBase checks and returns merge base of two commits. diff --git a/modules/gitrepo/merge_tree.go b/modules/gitrepo/merge_tree.go index 6151b1179f..a026882f0e 100644 --- a/modules/gitrepo/merge_tree.go +++ b/modules/gitrepo/merge_tree.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/util" ) const MaxConflictedDetectFiles = 10 diff --git a/modules/gitrepo/merge_tree_test.go b/modules/gitrepo/merge_tree_test.go index 9327a0c3d8..7d1075fd7b 100644 --- a/modules/gitrepo/merge_tree_test.go +++ b/modules/gitrepo/merge_tree_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/git/gitcmd" + "gitea.dev/modules/git/gitcmd" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/gitrepo/push.go b/modules/gitrepo/push.go index 920c317f79..c7debe431a 100644 --- a/modules/gitrepo/push.go +++ b/modules/gitrepo/push.go @@ -6,7 +6,7 @@ package gitrepo import ( "context" - "code.gitea.io/gitea/modules/git" + "gitea.dev/modules/git" ) // PushToExternal pushes a managed repository to an external remote. diff --git a/modules/gitrepo/ref.go b/modules/gitrepo/ref.go index 5212528326..f8f78d4bcc 100644 --- a/modules/gitrepo/ref.go +++ b/modules/gitrepo/ref.go @@ -6,7 +6,7 @@ package gitrepo import ( "context" - "code.gitea.io/gitea/modules/git/gitcmd" + "gitea.dev/modules/git/gitcmd" ) func UpdateRef(ctx context.Context, repo Repository, refName, newCommitID string) error { diff --git a/modules/gitrepo/remote.go b/modules/gitrepo/remote.go index 3cbc34eedb..eeef123ba7 100644 --- a/modules/gitrepo/remote.go +++ b/modules/gitrepo/remote.go @@ -7,11 +7,11 @@ import ( "context" "errors" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - giturl "code.gitea.io/gitea/modules/git/url" - "code.gitea.io/gitea/modules/globallock" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/git" + "gitea.dev/modules/git/gitcmd" + giturl "gitea.dev/modules/git/url" + "gitea.dev/modules/globallock" + "gitea.dev/modules/util" ) type RemoteOption string diff --git a/modules/gitrepo/signing.go b/modules/gitrepo/signing.go index 2f77758d8c..aa8f947e99 100644 --- a/modules/gitrepo/signing.go +++ b/modules/gitrepo/signing.go @@ -6,7 +6,7 @@ package gitrepo import ( "context" - "code.gitea.io/gitea/modules/git" + "gitea.dev/modules/git" ) func GetSigningKey(ctx context.Context) (*git.SigningKey, *git.Signature) { diff --git a/modules/gitrepo/tag.go b/modules/gitrepo/tag.go index 58ed204a99..47abcac8ce 100644 --- a/modules/gitrepo/tag.go +++ b/modules/gitrepo/tag.go @@ -6,7 +6,7 @@ package gitrepo import ( "context" - "code.gitea.io/gitea/modules/git" + "gitea.dev/modules/git" ) // IsTagExist returns true if given tag exists in the repository. diff --git a/modules/gitrepo/walk_nogogit.go b/modules/gitrepo/walk_nogogit.go index ff9555996d..b4f6f7dfc4 100644 --- a/modules/gitrepo/walk_nogogit.go +++ b/modules/gitrepo/walk_nogogit.go @@ -8,7 +8,7 @@ package gitrepo import ( "context" - "code.gitea.io/gitea/modules/git" + "gitea.dev/modules/git" ) // WalkReferences walks all the references from the repository diff --git a/modules/glob/glob.go b/modules/glob/glob.go index 387a305af3..edc900b72b 100644 --- a/modules/glob/glob.go +++ b/modules/glob/glob.go @@ -10,7 +10,7 @@ import ( "slices" "strings" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/util" ) // Reference: https://github.com/gobwas/glob/blob/master/glob.go diff --git a/modules/globallock/globallock.go b/modules/globallock/globallock.go index 575d41446a..eec9ac04c2 100644 --- a/modules/globallock/globallock.go +++ b/modules/globallock/globallock.go @@ -8,7 +8,7 @@ import ( "sync" "sync/atomic" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/setting" ) var ( diff --git a/modules/globallock/locker_test.go b/modules/globallock/locker_test.go index 44c0c0de5e..131270abd3 100644 --- a/modules/globallock/locker_test.go +++ b/modules/globallock/locker_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/test" + "gitea.dev/modules/util" "github.com/go-redsync/redsync/v4" "github.com/stretchr/testify/assert" diff --git a/modules/globallock/redis_locker.go b/modules/globallock/redis_locker.go index 057848106f..6c9fa80a7f 100644 --- a/modules/globallock/redis_locker.go +++ b/modules/globallock/redis_locker.go @@ -10,7 +10,7 @@ import ( "sync/atomic" "time" - "code.gitea.io/gitea/modules/nosql" + "gitea.dev/modules/nosql" "github.com/go-redsync/redsync/v4" "github.com/go-redsync/redsync/v4/redis/goredis/v9" diff --git a/modules/graceful/manager.go b/modules/graceful/manager.go index 243026ab90..24d4c3f61e 100644 --- a/modules/graceful/manager.go +++ b/modules/graceful/manager.go @@ -9,10 +9,10 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/gtprof" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/gtprof" + "gitea.dev/modules/log" + "gitea.dev/modules/process" + "gitea.dev/modules/setting" ) type state uint8 diff --git a/modules/graceful/manager_common.go b/modules/graceful/manager_common.go index 7cfbdfbeb0..04afeee61b 100644 --- a/modules/graceful/manager_common.go +++ b/modules/graceful/manager_common.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/gtprof" + "gitea.dev/modules/gtprof" ) // FIXME: it seems that there is a bug when using systemd Type=notify: the "Install Page" (INSTALL_LOCK=false) doesn't notify properly. diff --git a/modules/graceful/manager_unix.go b/modules/graceful/manager_unix.go index d03fff9b5b..fb540a79c9 100644 --- a/modules/graceful/manager_unix.go +++ b/modules/graceful/manager_unix.go @@ -15,10 +15,10 @@ import ( "syscall" "time" - "code.gitea.io/gitea/modules/graceful/releasereopen" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/graceful/releasereopen" + "gitea.dev/modules/log" + "gitea.dev/modules/process" + "gitea.dev/modules/setting" ) func pidMsg() systemdNotifyMsg { diff --git a/modules/graceful/manager_windows.go b/modules/graceful/manager_windows.go index 9592dd6b39..be87202bbb 100644 --- a/modules/graceful/manager_windows.go +++ b/modules/graceful/manager_windows.go @@ -13,8 +13,8 @@ import ( "strconv" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" "golang.org/x/sys/windows/svc" "golang.org/x/sys/windows/svc/debug" diff --git a/modules/graceful/net_unix.go b/modules/graceful/net_unix.go index a06f78dafe..98227cb402 100644 --- a/modules/graceful/net_unix.go +++ b/modules/graceful/net_unix.go @@ -16,9 +16,9 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" ) const ( diff --git a/modules/graceful/server.go b/modules/graceful/server.go index b440f68ab5..18e9b96b8f 100644 --- a/modules/graceful/server.go +++ b/modules/graceful/server.go @@ -14,9 +14,9 @@ import ( "syscall" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/proxyprotocol" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/log" + "gitea.dev/modules/proxyprotocol" + "gitea.dev/modules/setting" ) // GetListener returns a net listener diff --git a/modules/graceful/server_hooks.go b/modules/graceful/server_hooks.go index b800c32503..afa74f36f5 100644 --- a/modules/graceful/server_hooks.go +++ b/modules/graceful/server_hooks.go @@ -6,7 +6,7 @@ package graceful import ( "os" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/log" ) // awaitShutdown waits for the shutdown signal from the Manager diff --git a/modules/gtprof/trace.go b/modules/gtprof/trace.go index ad67c226dc..370078516e 100644 --- a/modules/gtprof/trace.go +++ b/modules/gtprof/trace.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/util" ) type contextKey struct { diff --git a/modules/gtprof/trace_builtin.go b/modules/gtprof/trace_builtin.go index 7b4e3b8b4f..76b2dae4b0 100644 --- a/modules/gtprof/trace_builtin.go +++ b/modules/gtprof/trace_builtin.go @@ -10,7 +10,7 @@ import ( "sync/atomic" "time" - "code.gitea.io/gitea/modules/tailmsg" + "gitea.dev/modules/tailmsg" ) type traceBuiltinStarter struct{} diff --git a/modules/hcaptcha/hcaptcha.go b/modules/hcaptcha/hcaptcha.go index b970d491c5..0af1f959ea 100644 --- a/modules/hcaptcha/hcaptcha.go +++ b/modules/hcaptcha/hcaptcha.go @@ -10,8 +10,8 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/json" + "gitea.dev/modules/setting" ) const verifyURL = "https://hcaptcha.com/siteverify" diff --git a/modules/highlight/highlight.go b/modules/highlight/highlight.go index dca28588e4..1ca97c4968 100644 --- a/modules/highlight/highlight.go +++ b/modules/highlight/highlight.go @@ -10,9 +10,9 @@ import ( "html/template" "sync" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" "github.com/alecthomas/chroma/v2" chromahtml "github.com/alecthomas/chroma/v2/formatters/html" diff --git a/modules/highlight/highlight_test.go b/modules/highlight/highlight_test.go index 211132b255..a31f8752f1 100644 --- a/modules/highlight/highlight_test.go +++ b/modules/highlight/highlight_test.go @@ -63,7 +63,7 @@ func TestFile(t *testing.T) { { name: "tags.py", code: "<>", - want: lines(`<>`), + want: lines(`<>`), lexerName: "Python", }, { @@ -102,7 +102,7 @@ c=2 def:\n a=1\n \n -b=''\n +b=''\n \n c=2`, ), @@ -114,6 +114,18 @@ c=2 want: []template.HTML{"--\n", `SELECT`}, lexerName: "SQL", }, + { + name: "test.http", + code: `HTTP/1.0 400 Bad request +Content-Type: text/html + +`, + want: lines(`HTTP/1.0 400 Bad request\n +Content-Type: text/html\n +\n +<html></html>`), + lexerName: "HTTP", + }, } for _, tt := range tests { diff --git a/modules/highlight/lexerdetect.go b/modules/highlight/lexerdetect.go index 5b3348761c..755c4d1076 100644 --- a/modules/highlight/lexerdetect.go +++ b/modules/highlight/lexerdetect.go @@ -8,8 +8,8 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/analyze" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/analyze" + "gitea.dev/modules/log" "github.com/alecthomas/chroma/v2" "github.com/alecthomas/chroma/v2/lexers" @@ -289,24 +289,24 @@ func detectChromaLexerWithAnalyze(fileName, lang string, code []byte) chroma.Lex // if lang is provided, and it matches a lexer, use it directly if byLang { - return lexer + return chroma.Coalesce(lexer) } // if a lexer is detected and there is no conflict for the file extension, use it directly fileExt := path.Ext(fileName) _, hasConflicts := chromaLexers().conflictingExtLangMap[fileExt] if !hasConflicts && lexer != lexers.Fallback { - return lexer + return chroma.Coalesce(lexer) } // try to detect language by content, for best guessing for the language // when using "code" to detect, analyze.GetCodeLanguage is slow, it iterates many rules to detect language from content analyzedLanguage := analyze.GetCodeLanguage(fileName, code) - lexer = DetectChromaLexerByFileName(fileName, analyzedLanguage) + lexer, _ = detectChromaLexerByFileName(fileName, analyzedLanguage) if lexer == lexers.Fallback { if analyzedLanguage != enry.OtherLanguage { log.Warn("No chroma lexer found for enry detected language: %s (file: %s), need to fix the language mapping between enry and chroma.", analyzedLanguage, fileName) } } - return lexer + return chroma.Coalesce(lexer) } diff --git a/modules/httpcache/httpcache.go b/modules/httpcache/httpcache.go index e23cf0a92a..785363c29c 100644 --- a/modules/httpcache/httpcache.go +++ b/modules/httpcache/httpcache.go @@ -10,14 +10,13 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" ) type CacheControlOptions struct { - IsPublic bool - MaxAge time.Duration - NoTransform bool + IsPublic bool + MaxAge time.Duration } // SetCacheControlInHeader sets suitable cache-control headers in the response @@ -38,25 +37,19 @@ func SetCacheControlInHeader(h http.Header, opts *CacheControlOptions) { directives = append(directives, "max-age=0", publicPrivate, "must-revalidate") h.Set("X-Gitea-Debug", fmt.Sprintf("RUN_MODE=%v, MaxAge=%s", setting.RunMode, opts.MaxAge)) } - - if opts.NoTransform { - directives = append(directives, "no-transform") - } h.Set("Cache-Control", strings.Join(directives, ", ")) } func CacheControlForPublicStatic() *CacheControlOptions { return &CacheControlOptions{ - IsPublic: true, - MaxAge: setting.StaticCacheTime, - NoTransform: true, + IsPublic: true, + MaxAge: setting.StaticCacheTime, } } func CacheControlForPrivateStatic() *CacheControlOptions { return &CacheControlOptions{ - MaxAge: setting.StaticCacheTime, - NoTransform: true, + MaxAge: setting.StaticCacheTime, } } diff --git a/modules/httpcache/httpcache_test.go b/modules/httpcache/httpcache_test.go index d510cbe4d7..d715cac4a2 100644 --- a/modules/httpcache/httpcache_test.go +++ b/modules/httpcache/httpcache_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/util" "github.com/stretchr/testify/assert" ) @@ -18,7 +18,7 @@ func TestHandleGenericETagCache(t *testing.T) { matchedEtag := `"matched-etag"` lastModifiedTime := new(time.Date(2021, time.January, 2, 15, 4, 5, 0, time.FixedZone("test-zone", 8*3600))) lastModified := lastModifiedTime.UTC().Format(http.TimeFormat) - cacheControl := "max-age=0, private, must-revalidate, no-transform" + cacheControl := "max-age=0, private, must-revalidate" type testCase struct { name string reqHeaders map[string]string diff --git a/modules/httplib/content_disposition.go b/modules/httplib/content_disposition.go index da23dae221..3262ad6c65 100644 --- a/modules/httplib/content_disposition.go +++ b/modules/httplib/content_disposition.go @@ -7,7 +7,7 @@ import ( "mime" "strings" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/setting" ) type ContentDispositionType string diff --git a/modules/httplib/serve.go b/modules/httplib/serve.go index d51c938bf0..e2da9e85fa 100644 --- a/modules/httplib/serve.go +++ b/modules/httplib/serve.go @@ -15,12 +15,12 @@ import ( "strings" "time" - charsetModule "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" + charsetModule "gitea.dev/modules/charset" + "gitea.dev/modules/container" + "gitea.dev/modules/httpcache" + "gitea.dev/modules/setting" + "gitea.dev/modules/typesniffer" + "gitea.dev/modules/util" "github.com/klauspost/compress/gzhttp" ) @@ -94,9 +94,8 @@ func ServeSetHeaders(w http.ResponseWriter, opts ServeHeaderOptions) { } httpcache.SetCacheControlInHeader(header, &httpcache.CacheControlOptions{ - IsPublic: opts.CacheIsPublic, - MaxAge: opts.CacheDuration, - NoTransform: true, + IsPublic: opts.CacheIsPublic, + MaxAge: opts.CacheDuration, }) if !opts.LastModified.IsZero() { diff --git a/modules/httplib/serve_test.go b/modules/httplib/serve_test.go index 419085237c..9981a8e0e7 100644 --- a/modules/httplib/serve_test.go +++ b/modules/httplib/serve_test.go @@ -12,7 +12,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/typesniffer" + "gitea.dev/modules/typesniffer" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/httplib/url.go b/modules/httplib/url.go index a689c9e98e..0bc996a21e 100644 --- a/modules/httplib/url.go +++ b/modules/httplib/url.go @@ -10,8 +10,8 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" ) type RequestContextKeyStruct struct{} diff --git a/modules/httplib/url_test.go b/modules/httplib/url_test.go index 373693693b..8356213724 100644 --- a/modules/httplib/url_test.go +++ b/modules/httplib/url_test.go @@ -9,8 +9,8 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/indexer/code/bleve/bleve.go b/modules/indexer/code/bleve/bleve.go index 010ee39660..ed5f38fcf0 100644 --- a/modules/indexer/code/bleve/bleve.go +++ b/modules/indexer/code/bleve/bleve.go @@ -11,21 +11,21 @@ import ( "strings" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/analyze" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/indexer" - path_filter "code.gitea.io/gitea/modules/indexer/code/bleve/token/path" - "code.gitea.io/gitea/modules/indexer/code/internal" - indexer_internal "code.gitea.io/gitea/modules/indexer/internal" - inner_bleve "code.gitea.io/gitea/modules/indexer/internal/bleve" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" + repo_model "gitea.dev/models/repo" + "gitea.dev/modules/analyze" + "gitea.dev/modules/charset" + "gitea.dev/modules/git" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/gitrepo" + "gitea.dev/modules/indexer" + path_filter "gitea.dev/modules/indexer/code/bleve/token/path" + "gitea.dev/modules/indexer/code/internal" + indexer_internal "gitea.dev/modules/indexer/internal" + inner_bleve "gitea.dev/modules/indexer/internal/bleve" + "gitea.dev/modules/setting" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/typesniffer" + "gitea.dev/modules/util" "github.com/blevesearch/bleve/v2" analyzer_custom "github.com/blevesearch/bleve/v2/analysis/analyzer/custom" diff --git a/modules/indexer/code/elasticsearch/elasticsearch.go b/modules/indexer/code/elasticsearch/elasticsearch.go index f9a3d4156d..4c35a17b05 100644 --- a/modules/indexer/code/elasticsearch/elasticsearch.go +++ b/modules/indexer/code/elasticsearch/elasticsearch.go @@ -10,21 +10,21 @@ import ( "strconv" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/analyze" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/indexer" - "code.gitea.io/gitea/modules/indexer/code/internal" - es "code.gitea.io/gitea/modules/indexer/internal/elasticsearch" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" + repo_model "gitea.dev/models/repo" + "gitea.dev/modules/analyze" + "gitea.dev/modules/charset" + "gitea.dev/modules/git" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/gitrepo" + "gitea.dev/modules/indexer" + "gitea.dev/modules/indexer/code/internal" + es "gitea.dev/modules/indexer/internal/elasticsearch" + "gitea.dev/modules/json" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/typesniffer" + "gitea.dev/modules/util" "github.com/go-enry/go-enry/v2" ) diff --git a/modules/indexer/code/git.go b/modules/indexer/code/git.go index a17b10551d..88a313c33e 100644 --- a/modules/indexer/code/git.go +++ b/modules/indexer/code/git.go @@ -8,13 +8,13 @@ import ( "strconv" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/indexer/code/internal" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + repo_model "gitea.dev/models/repo" + "gitea.dev/modules/git" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/gitrepo" + "gitea.dev/modules/indexer/code/internal" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" ) func getDefaultBranchSha(ctx context.Context, repo *repo_model.Repository) (string, error) { diff --git a/modules/indexer/code/gitgrep/gitgrep.go b/modules/indexer/code/gitgrep/gitgrep.go index 5fbd7201ef..1d295098d8 100644 --- a/modules/indexer/code/gitgrep/gitgrep.go +++ b/modules/indexer/code/gitgrep/gitgrep.go @@ -8,10 +8,10 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/indexer" - code_indexer "code.gitea.io/gitea/modules/indexer/code" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/git" + "gitea.dev/modules/indexer" + code_indexer "gitea.dev/modules/indexer/code" + "gitea.dev/modules/setting" ) func indexSettingToGitGrepPathspecList() (list []string) { diff --git a/modules/indexer/code/gitgrep/gitgrep_test.go b/modules/indexer/code/gitgrep/gitgrep_test.go index 97dda9d966..5510a7d2be 100644 --- a/modules/indexer/code/gitgrep/gitgrep_test.go +++ b/modules/indexer/code/gitgrep/gitgrep_test.go @@ -6,8 +6,8 @@ package gitgrep import ( "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/indexer/code/indexer.go b/modules/indexer/code/indexer.go index 98df6944a6..312b038e0e 100644 --- a/modules/indexer/code/indexer.go +++ b/modules/indexer/code/indexer.go @@ -11,18 +11,18 @@ import ( "sync/atomic" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/indexer" - "code.gitea.io/gitea/modules/indexer/code/bleve" - "code.gitea.io/gitea/modules/indexer/code/elasticsearch" - "code.gitea.io/gitea/modules/indexer/code/internal" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/modules/graceful" + "gitea.dev/modules/indexer" + "gitea.dev/modules/indexer/code/bleve" + "gitea.dev/modules/indexer/code/elasticsearch" + "gitea.dev/modules/indexer/code/internal" + "gitea.dev/modules/log" + "gitea.dev/modules/process" + "gitea.dev/modules/queue" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" ) var ( diff --git a/modules/indexer/code/indexer_test.go b/modules/indexer/code/indexer_test.go index a8baf44edc..baf9edd8f9 100644 --- a/modules/indexer/code/indexer_test.go +++ b/modules/indexer/code/indexer_test.go @@ -10,19 +10,19 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - indexer_module "code.gitea.io/gitea/modules/indexer" - "code.gitea.io/gitea/modules/indexer/code/bleve" - "code.gitea.io/gitea/modules/indexer/code/elasticsearch" - "code.gitea.io/gitea/modules/indexer/code/internal" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + "gitea.dev/models/unittest" + indexer_module "gitea.dev/modules/indexer" + "gitea.dev/modules/indexer/code/bleve" + "gitea.dev/modules/indexer/code/elasticsearch" + "gitea.dev/modules/indexer/code/internal" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/modules/util" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" + _ "gitea.dev/models" + _ "gitea.dev/models/actions" + _ "gitea.dev/models/activities" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/indexer/code/internal/indexer.go b/modules/indexer/code/internal/indexer.go index d58b028124..7eb08ac579 100644 --- a/modules/indexer/code/internal/indexer.go +++ b/modules/indexer/code/internal/indexer.go @@ -7,10 +7,10 @@ import ( "context" "errors" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/indexer" - "code.gitea.io/gitea/modules/indexer/internal" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/modules/indexer" + "gitea.dev/modules/indexer/internal" ) // Indexer defines an interface to index and search code contents diff --git a/modules/indexer/code/internal/model.go b/modules/indexer/code/internal/model.go index f75263c83c..01779d8776 100644 --- a/modules/indexer/code/internal/model.go +++ b/modules/indexer/code/internal/model.go @@ -3,7 +3,7 @@ package internal -import "code.gitea.io/gitea/modules/timeutil" +import "gitea.dev/modules/timeutil" type FileUpdate struct { Filename string diff --git a/modules/indexer/code/internal/util.go b/modules/indexer/code/internal/util.go index 5d62a5ccb9..3608dc4f12 100644 --- a/modules/indexer/code/internal/util.go +++ b/modules/indexer/code/internal/util.go @@ -6,8 +6,8 @@ package internal import ( "strings" - "code.gitea.io/gitea/modules/indexer/internal" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/indexer/internal" + "gitea.dev/modules/log" ) const filenameMatchNumberOfLines = 7 // Copied from GitHub search diff --git a/modules/indexer/code/search.go b/modules/indexer/code/search.go index b5eb5116b0..87b3105414 100644 --- a/modules/indexer/code/search.go +++ b/modules/indexer/code/search.go @@ -9,9 +9,9 @@ import ( "html/template" "strings" - "code.gitea.io/gitea/modules/highlight" - "code.gitea.io/gitea/modules/indexer/code/internal" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/modules/highlight" + "gitea.dev/modules/indexer/code/internal" + "gitea.dev/modules/timeutil" ) // Result a search result to display diff --git a/modules/indexer/internal/bleve/indexer.go b/modules/indexer/internal/bleve/indexer.go index 9d1e24a874..3e735cea19 100644 --- a/modules/indexer/internal/bleve/indexer.go +++ b/modules/indexer/internal/bleve/indexer.go @@ -7,8 +7,8 @@ import ( "context" "errors" - "code.gitea.io/gitea/modules/indexer/internal" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/indexer/internal" + "gitea.dev/modules/log" "github.com/blevesearch/bleve/v2" "github.com/blevesearch/bleve/v2/mapping" diff --git a/modules/indexer/internal/bleve/query.go b/modules/indexer/internal/bleve/query.go index 8895ae2c64..aa0bf3080f 100644 --- a/modules/indexer/internal/bleve/query.go +++ b/modules/indexer/internal/bleve/query.go @@ -4,7 +4,7 @@ package bleve import ( - "code.gitea.io/gitea/modules/optional" + "gitea.dev/modules/optional" "github.com/blevesearch/bleve/v2" "github.com/blevesearch/bleve/v2/search/query" diff --git a/modules/indexer/internal/bleve/util.go b/modules/indexer/internal/bleve/util.go index b6daa9e14b..0914d4c269 100644 --- a/modules/indexer/internal/bleve/util.go +++ b/modules/indexer/internal/bleve/util.go @@ -8,9 +8,9 @@ import ( "os" "unicode" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" "github.com/blevesearch/bleve/v2" unicode_tokenizer "github.com/blevesearch/bleve/v2/analysis/tokenizer/unicode" diff --git a/modules/indexer/internal/bleve/util_test.go b/modules/indexer/internal/bleve/util_test.go index 1a7e4db0f4..9df8b017ca 100644 --- a/modules/indexer/internal/bleve/util_test.go +++ b/modules/indexer/internal/bleve/util_test.go @@ -7,8 +7,8 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/indexer/internal/db/indexer.go b/modules/indexer/internal/db/indexer.go index 3deec836c4..8d49b44366 100644 --- a/modules/indexer/internal/db/indexer.go +++ b/modules/indexer/internal/db/indexer.go @@ -6,7 +6,7 @@ package db import ( "context" - "code.gitea.io/gitea/modules/indexer/internal" + "gitea.dev/modules/indexer/internal" ) var _ internal.Indexer = &Indexer{} diff --git a/modules/indexer/internal/elasticsearch/indexer.go b/modules/indexer/internal/elasticsearch/indexer.go index eaeb89efaa..1eb7d38d8a 100644 --- a/modules/indexer/internal/elasticsearch/indexer.go +++ b/modules/indexer/internal/elasticsearch/indexer.go @@ -16,8 +16,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/indexer/internal" - "code.gitea.io/gitea/modules/json" + "gitea.dev/modules/indexer/internal" + "gitea.dev/modules/json" ) var _ internal.Indexer = &Indexer{} diff --git a/modules/indexer/internal/elasticsearch/indexer_test.go b/modules/indexer/internal/elasticsearch/indexer_test.go index 4db9270733..cccc42ffcc 100644 --- a/modules/indexer/internal/elasticsearch/indexer_test.go +++ b/modules/indexer/internal/elasticsearch/indexer_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/test" + "gitea.dev/modules/test" "github.com/stretchr/testify/require" ) diff --git a/modules/indexer/internal/elasticsearch/types.go b/modules/indexer/internal/elasticsearch/types.go index 106f2faa8e..b843ad1f2d 100644 --- a/modules/indexer/internal/elasticsearch/types.go +++ b/modules/indexer/internal/elasticsearch/types.go @@ -3,7 +3,7 @@ package elasticsearch -import "code.gitea.io/gitea/modules/json" +import "gitea.dev/modules/json" const ( bulkActionIndex = "index" diff --git a/modules/indexer/internal/elasticsearch/util.go b/modules/indexer/internal/elasticsearch/util.go index 2e96d4220a..8713284af6 100644 --- a/modules/indexer/internal/elasticsearch/util.go +++ b/modules/indexer/internal/elasticsearch/util.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/log" ) // VersionedIndexName returns the full index name with version suffix. diff --git a/modules/indexer/internal/meilisearch/util.go b/modules/indexer/internal/meilisearch/util.go index e6d8fefade..d54a9a5a47 100644 --- a/modules/indexer/internal/meilisearch/util.go +++ b/modules/indexer/internal/meilisearch/util.go @@ -6,7 +6,7 @@ package meilisearch import ( "fmt" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/log" ) // VersionedIndexName returns the full index name with version diff --git a/modules/indexer/internal/paginator.go b/modules/indexer/internal/paginator.go index f1e19740eb..5ca8c4152c 100644 --- a/modules/indexer/internal/paginator.go +++ b/modules/indexer/internal/paginator.go @@ -6,7 +6,7 @@ package internal import ( "math" - "code.gitea.io/gitea/models/db" + "gitea.dev/models/db" ) // ParsePaginator parses a db.Paginator into a skip and limit diff --git a/modules/indexer/issues/bleve/bleve.go b/modules/indexer/issues/bleve/bleve.go index 219d4163d6..a919317728 100644 --- a/modules/indexer/issues/bleve/bleve.go +++ b/modules/indexer/issues/bleve/bleve.go @@ -7,12 +7,12 @@ import ( "context" "strconv" - "code.gitea.io/gitea/modules/indexer" - indexer_internal "code.gitea.io/gitea/modules/indexer/internal" - inner_bleve "code.gitea.io/gitea/modules/indexer/internal/bleve" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/indexer" + indexer_internal "gitea.dev/modules/indexer/internal" + inner_bleve "gitea.dev/modules/indexer/internal/bleve" + "gitea.dev/modules/indexer/issues/internal" + "gitea.dev/modules/optional" + "gitea.dev/modules/util" "github.com/blevesearch/bleve/v2" "github.com/blevesearch/bleve/v2/analysis/analyzer/custom" diff --git a/modules/indexer/issues/bleve/bleve_test.go b/modules/indexer/issues/bleve/bleve_test.go index 908514a01a..ccd7ab7b92 100644 --- a/modules/indexer/issues/bleve/bleve_test.go +++ b/modules/indexer/issues/bleve/bleve_test.go @@ -6,7 +6,7 @@ package bleve import ( "testing" - "code.gitea.io/gitea/modules/indexer/issues/internal/tests" + "gitea.dev/modules/indexer/issues/internal/tests" ) func TestBleveIndexer(t *testing.T) { diff --git a/modules/indexer/issues/db/db.go b/modules/indexer/issues/db/db.go index 50951f9c88..52d6672b6e 100644 --- a/modules/indexer/issues/db/db.go +++ b/modules/indexer/issues/db/db.go @@ -8,13 +8,13 @@ import ( "strings" "sync" - "code.gitea.io/gitea/models/db" - issue_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/indexer" - indexer_internal "code.gitea.io/gitea/modules/indexer/internal" - inner_db "code.gitea.io/gitea/modules/indexer/internal/db" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + issue_model "gitea.dev/models/issues" + "gitea.dev/modules/indexer" + indexer_internal "gitea.dev/modules/indexer/internal" + inner_db "gitea.dev/modules/indexer/internal/db" + "gitea.dev/modules/indexer/issues/internal" + "gitea.dev/modules/util" "xorm.io/builder" ) diff --git a/modules/indexer/issues/db/options.go b/modules/indexer/issues/db/options.go index 7a66efe791..c3921a98ae 100644 --- a/modules/indexer/issues/db/options.go +++ b/modules/indexer/issues/db/options.go @@ -8,12 +8,12 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - issue_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/util" + "gitea.dev/models/db" + issue_model "gitea.dev/models/issues" + "gitea.dev/modules/container" + "gitea.dev/modules/indexer/issues/internal" + "gitea.dev/modules/optional" + "gitea.dev/modules/util" ) func ToDBOptions(ctx context.Context, options *internal.SearchOptions) (*issue_model.IssuesOptions, error) { diff --git a/modules/indexer/issues/dboptions.go b/modules/indexer/issues/dboptions.go index f4582d38dd..be692aa072 100644 --- a/modules/indexer/issues/dboptions.go +++ b/modules/indexer/issues/dboptions.go @@ -6,11 +6,11 @@ package issues import ( "strings" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + issues_model "gitea.dev/models/issues" + "gitea.dev/modules/indexer/issues/internal" + "gitea.dev/modules/optional" + "gitea.dev/modules/setting" ) func ToSearchOptions(keyword string, opts *issues_model.IssuesOptions) *SearchOptions { diff --git a/modules/indexer/issues/elasticsearch/elasticsearch.go b/modules/indexer/issues/elasticsearch/elasticsearch.go index 8286e72f49..baef644cc1 100644 --- a/modules/indexer/issues/elasticsearch/elasticsearch.go +++ b/modules/indexer/issues/elasticsearch/elasticsearch.go @@ -8,12 +8,12 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/indexer" - indexer_internal "code.gitea.io/gitea/modules/indexer/internal" - es "code.gitea.io/gitea/modules/indexer/internal/elasticsearch" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/graceful" + "gitea.dev/modules/indexer" + indexer_internal "gitea.dev/modules/indexer/internal" + es "gitea.dev/modules/indexer/internal/elasticsearch" + "gitea.dev/modules/indexer/issues/internal" + "gitea.dev/modules/util" ) const issueIndexerLatestVersion = 3 diff --git a/modules/indexer/issues/elasticsearch/elasticsearch_test.go b/modules/indexer/issues/elasticsearch/elasticsearch_test.go index e4f23f3417..86f525121d 100644 --- a/modules/indexer/issues/elasticsearch/elasticsearch_test.go +++ b/modules/indexer/issues/elasticsearch/elasticsearch_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/indexer/issues/internal/tests" - "code.gitea.io/gitea/modules/test" + "gitea.dev/modules/indexer/issues/internal/tests" + "gitea.dev/modules/test" "github.com/stretchr/testify/require" ) diff --git a/modules/indexer/issues/indexer.go b/modules/indexer/issues/indexer.go index 52b25c1794..f22e2c2ad5 100644 --- a/modules/indexer/issues/indexer.go +++ b/modules/indexer/issues/indexer.go @@ -11,21 +11,21 @@ import ( "sync/atomic" "time" - db_model "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/indexer" - "code.gitea.io/gitea/modules/indexer/issues/bleve" - "code.gitea.io/gitea/modules/indexer/issues/db" - "code.gitea.io/gitea/modules/indexer/issues/elasticsearch" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/indexer/issues/meilisearch" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + db_model "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/modules/graceful" + "gitea.dev/modules/indexer" + "gitea.dev/modules/indexer/issues/bleve" + "gitea.dev/modules/indexer/issues/db" + "gitea.dev/modules/indexer/issues/elasticsearch" + "gitea.dev/modules/indexer/issues/internal" + "gitea.dev/modules/indexer/issues/meilisearch" + "gitea.dev/modules/log" + "gitea.dev/modules/optional" + "gitea.dev/modules/process" + "gitea.dev/modules/queue" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" ) // IndexerMetadata is used to send data to the queue, so it contains only the ids. diff --git a/modules/indexer/issues/indexer_test.go b/modules/indexer/issues/indexer_test.go index a67e96c0a2..a718e4e72c 100644 --- a/modules/indexer/issues/indexer_test.go +++ b/modules/indexer/issues/indexer_test.go @@ -6,16 +6,16 @@ package issues import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/models/db" + "gitea.dev/models/issues" + "gitea.dev/models/unittest" + "gitea.dev/modules/indexer/issues/internal" + "gitea.dev/modules/optional" + "gitea.dev/modules/setting" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" + _ "gitea.dev/models" + _ "gitea.dev/models/actions" + _ "gitea.dev/models/activities" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/indexer/issues/internal/indexer.go b/modules/indexer/issues/internal/indexer.go index 59c6f48485..0d5d2b9482 100644 --- a/modules/indexer/issues/internal/indexer.go +++ b/modules/indexer/issues/internal/indexer.go @@ -7,8 +7,8 @@ import ( "context" "errors" - "code.gitea.io/gitea/modules/indexer" - "code.gitea.io/gitea/modules/indexer/internal" + "gitea.dev/modules/indexer" + "gitea.dev/modules/indexer/internal" ) // Indexer defines an interface to indexer issues contents diff --git a/modules/indexer/issues/internal/model.go b/modules/indexer/issues/internal/model.go index 84979a8e64..b964f349df 100644 --- a/modules/indexer/issues/internal/model.go +++ b/modules/indexer/issues/internal/model.go @@ -6,10 +6,10 @@ package internal import ( "strconv" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/indexer" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/indexer" + "gitea.dev/modules/optional" + "gitea.dev/modules/timeutil" ) // IndexerData data stored in the issue indexer diff --git a/modules/indexer/issues/internal/tests/tests.go b/modules/indexer/issues/internal/tests/tests.go index 20e64a5955..276f3fb5bb 100644 --- a/modules/indexer/issues/internal/tests/tests.go +++ b/modules/indexer/issues/internal/tests/tests.go @@ -13,10 +13,10 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" + "gitea.dev/models/db" + "gitea.dev/modules/indexer/issues/internal" + "gitea.dev/modules/optional" + "gitea.dev/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/indexer/issues/meilisearch/meilisearch.go b/modules/indexer/issues/meilisearch/meilisearch.go index 6ac6d239c8..ddde9c89f0 100644 --- a/modules/indexer/issues/meilisearch/meilisearch.go +++ b/modules/indexer/issues/meilisearch/meilisearch.go @@ -10,11 +10,11 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/indexer" - indexer_internal "code.gitea.io/gitea/modules/indexer/internal" - inner_meilisearch "code.gitea.io/gitea/modules/indexer/internal/meilisearch" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/json" + "gitea.dev/modules/indexer" + indexer_internal "gitea.dev/modules/indexer/internal" + inner_meilisearch "gitea.dev/modules/indexer/internal/meilisearch" + "gitea.dev/modules/indexer/issues/internal" + "gitea.dev/modules/json" "github.com/meilisearch/meilisearch-go" ) diff --git a/modules/indexer/issues/meilisearch/meilisearch_test.go b/modules/indexer/issues/meilisearch/meilisearch_test.go index bfc953c9ea..2c9814acf6 100644 --- a/modules/indexer/issues/meilisearch/meilisearch_test.go +++ b/modules/indexer/issues/meilisearch/meilisearch_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/indexer/issues/internal/tests" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/test" + "gitea.dev/modules/indexer/issues/internal" + "gitea.dev/modules/indexer/issues/internal/tests" + "gitea.dev/modules/json" + "gitea.dev/modules/test" "github.com/meilisearch/meilisearch-go" "github.com/stretchr/testify/assert" diff --git a/modules/indexer/issues/util.go b/modules/indexer/issues/util.go index fafe9b8bbd..bbfd42be6b 100644 --- a/modules/indexer/issues/util.go +++ b/modules/indexer/issues/util.go @@ -8,12 +8,12 @@ import ( "errors" "fmt" - "code.gitea.io/gitea/models/db" - issue_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" + "gitea.dev/models/db" + issue_model "gitea.dev/models/issues" + "gitea.dev/modules/container" + "gitea.dev/modules/indexer/issues/internal" + "gitea.dev/modules/log" + "gitea.dev/modules/queue" ) // getIssueIndexerData returns the indexer data of an issue and a bool value indicating whether the issue exists. diff --git a/modules/indexer/stats/db.go b/modules/indexer/stats/db.go index 199d493e97..af5127b638 100644 --- a/modules/indexer/stats/db.go +++ b/modules/indexer/stats/db.go @@ -6,14 +6,14 @@ package stats import ( "fmt" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/languagestats" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" + repo_model "gitea.dev/models/repo" + "gitea.dev/modules/git" + "gitea.dev/modules/git/languagestats" + "gitea.dev/modules/gitrepo" + "gitea.dev/modules/graceful" + "gitea.dev/modules/log" + "gitea.dev/modules/process" + "gitea.dev/modules/setting" ) // DBIndexer implements Indexer interface to use database's like search diff --git a/modules/indexer/stats/indexer.go b/modules/indexer/stats/indexer.go index aaf120c6d0..fe11a33e06 100644 --- a/modules/indexer/stats/indexer.go +++ b/modules/indexer/stats/indexer.go @@ -6,10 +6,10 @@ package stats import ( "context" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/modules/graceful" + "gitea.dev/modules/log" ) // Indexer defines an interface to index repository stats diff --git a/modules/indexer/stats/indexer_test.go b/modules/indexer/stats/indexer_test.go index 088f63234a..edc38ffad6 100644 --- a/modules/indexer/stats/indexer_test.go +++ b/modules/indexer/stats/indexer_test.go @@ -7,14 +7,14 @@ import ( "testing" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + "gitea.dev/modules/queue" + "gitea.dev/modules/setting" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" + _ "gitea.dev/models" + _ "gitea.dev/models/actions" + _ "gitea.dev/models/activities" "github.com/stretchr/testify/assert" ) diff --git a/modules/indexer/stats/queue.go b/modules/indexer/stats/queue.go index 69cde321d8..d9edc8b45f 100644 --- a/modules/indexer/stats/queue.go +++ b/modules/indexer/stats/queue.go @@ -6,11 +6,11 @@ package stats import ( "errors" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" + repo_model "gitea.dev/models/repo" + "gitea.dev/modules/graceful" + "gitea.dev/modules/log" + "gitea.dev/modules/queue" + "gitea.dev/modules/setting" ) // statsQueue represents a queue to handle repository stats updates diff --git a/modules/issue/template/template.go b/modules/issue/template/template.go index 192aaf8e01..63f156f9f9 100644 --- a/modules/issue/template/template.go +++ b/modules/issue/template/template.go @@ -12,8 +12,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/container" - api "code.gitea.io/gitea/modules/structs" + "gitea.dev/modules/container" + api "gitea.dev/modules/structs" "gitea.com/go-chi/binding" ) diff --git a/modules/issue/template/template_test.go b/modules/issue/template/template_test.go index 7fec9431b6..b696d952c8 100644 --- a/modules/issue/template/template_test.go +++ b/modules/issue/template/template_test.go @@ -7,8 +7,8 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" + "gitea.dev/modules/json" + api "gitea.dev/modules/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/issue/template/unmarshal.go b/modules/issue/template/unmarshal.go index ceab6babf4..e0d6881cf5 100644 --- a/modules/issue/template/unmarshal.go +++ b/modules/issue/template/unmarshal.go @@ -8,13 +8,13 @@ import ( "path" "strconv" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/git" + "gitea.dev/modules/markup/markdown" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/util" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" ) // CouldBe indicates a file with the filename could be a template, diff --git a/modules/label/label.go b/modules/label/label.go index 3e68c4d26e..3bb881cf72 100644 --- a/modules/label/label.go +++ b/modules/label/label.go @@ -9,7 +9,7 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/util" ) // Label represents label information loaded from template diff --git a/modules/label/parser.go b/modules/label/parser.go index 2a10152062..f56ef0e255 100644 --- a/modules/label/parser.go +++ b/modules/label/parser.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/options" + "gitea.dev/modules/options" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" ) type labelFile struct { diff --git a/modules/lfs/content_store.go b/modules/lfs/content_store.go index be1e6c8e90..04e1091022 100644 --- a/modules/lfs/content_store.go +++ b/modules/lfs/content_store.go @@ -11,8 +11,8 @@ import ( "io" "os" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" + "gitea.dev/modules/log" + "gitea.dev/modules/storage" ) var ( diff --git a/modules/lfs/endpoint.go b/modules/lfs/endpoint.go index 2931defcd9..a7999fc1c4 100644 --- a/modules/lfs/endpoint.go +++ b/modules/lfs/endpoint.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/log" + "gitea.dev/modules/util" ) // DetermineEndpoint determines an endpoint from the clone url or uses the specified LFS url. diff --git a/modules/lfs/filesystem_client.go b/modules/lfs/filesystem_client.go index 71bef5c899..bf95e3ec6d 100644 --- a/modules/lfs/filesystem_client.go +++ b/modules/lfs/filesystem_client.go @@ -10,7 +10,7 @@ import ( "os" "path/filepath" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/util" ) // FilesystemClient is used to read LFS data from a filesystem path diff --git a/modules/lfs/http_client.go b/modules/lfs/http_client.go index 4b51193846..9a7c722ac6 100644 --- a/modules/lfs/http_client.go +++ b/modules/lfs/http_client.go @@ -13,10 +13,10 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/json" + "gitea.dev/modules/log" + "gitea.dev/modules/proxy" + "gitea.dev/modules/setting" "golang.org/x/sync/errgroup" ) diff --git a/modules/lfs/http_client_test.go b/modules/lfs/http_client_test.go index 3e5ee9ec60..a234ceb552 100644 --- a/modules/lfs/http_client_test.go +++ b/modules/lfs/http_client_test.go @@ -11,9 +11,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "gitea.dev/modules/json" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/lfs/pointer_scanner_gogit.go b/modules/lfs/pointer_scanner_gogit.go index ccfb16b6c0..2e2e5800a6 100644 --- a/modules/lfs/pointer_scanner_gogit.go +++ b/modules/lfs/pointer_scanner_gogit.go @@ -9,7 +9,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/git" + "gitea.dev/modules/git" "github.com/go-git/go-git/v5/plumbing/object" ) diff --git a/modules/lfs/pointer_scanner_nogogit.go b/modules/lfs/pointer_scanner_nogogit.go index 29f5d0e346..896c34a20b 100644 --- a/modules/lfs/pointer_scanner_nogogit.go +++ b/modules/lfs/pointer_scanner_nogogit.go @@ -13,10 +13,10 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/git/pipeline" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/git" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/git/pipeline" + "gitea.dev/modules/util" "golang.org/x/sync/errgroup" ) diff --git a/modules/lfs/shared.go b/modules/lfs/shared.go index e04c089e51..a11ab7ba70 100644 --- a/modules/lfs/shared.go +++ b/modules/lfs/shared.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/util" ) const ( diff --git a/modules/lfs/transferadapter.go b/modules/lfs/transferadapter.go index fbc3a3ad8c..81ac998290 100644 --- a/modules/lfs/transferadapter.go +++ b/modules/lfs/transferadapter.go @@ -9,8 +9,8 @@ import ( "io" "net/http" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/json" + "gitea.dev/modules/log" ) // TransferAdapter represents an adapter for downloading/uploading LFS objects. diff --git a/modules/lfs/transferadapter_test.go b/modules/lfs/transferadapter_test.go index ef72d76db4..6c894d4496 100644 --- a/modules/lfs/transferadapter_test.go +++ b/modules/lfs/transferadapter_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/json" + "gitea.dev/modules/json" "github.com/stretchr/testify/assert" ) diff --git a/modules/lfstransfer/backend/backend.go b/modules/lfstransfer/backend/backend.go index 92f08eac13..42a01bf492 100644 --- a/modules/lfstransfer/backend/backend.go +++ b/modules/lfstransfer/backend/backend.go @@ -12,9 +12,9 @@ import ( "net/url" "strconv" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/json" + "gitea.dev/modules/lfs" + "gitea.dev/modules/setting" "github.com/charmbracelet/git-lfs-transfer/transfer" ) diff --git a/modules/lfstransfer/backend/lock.go b/modules/lfstransfer/backend/lock.go index 5bfa3a89c3..90b143a626 100644 --- a/modules/lfstransfer/backend/lock.go +++ b/modules/lfstransfer/backend/lock.go @@ -13,8 +13,8 @@ import ( "strconv" "time" - "code.gitea.io/gitea/modules/json" - lfslock "code.gitea.io/gitea/modules/structs" + "gitea.dev/modules/json" + lfslock "gitea.dev/modules/structs" "github.com/charmbracelet/git-lfs-transfer/transfer" ) diff --git a/modules/lfstransfer/backend/util.go b/modules/lfstransfer/backend/util.go index afe02f799c..3226445048 100644 --- a/modules/lfstransfer/backend/util.go +++ b/modules/lfstransfer/backend/util.go @@ -11,10 +11,10 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/httplib" + "gitea.dev/modules/private" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" "github.com/charmbracelet/git-lfs-transfer/transfer" ) diff --git a/modules/lfstransfer/backend/util_test.go b/modules/lfstransfer/backend/util_test.go index 408b53c369..ed60c6c454 100644 --- a/modules/lfstransfer/backend/util_test.go +++ b/modules/lfstransfer/backend/util_test.go @@ -6,8 +6,8 @@ package backend import ( "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/lfstransfer/main.go b/modules/lfstransfer/main.go index a134f50b86..e5c8a122a4 100644 --- a/modules/lfstransfer/main.go +++ b/modules/lfstransfer/main.go @@ -8,7 +8,7 @@ import ( "fmt" "os" - "code.gitea.io/gitea/modules/lfstransfer/backend" + "gitea.dev/modules/lfstransfer/backend" "github.com/charmbracelet/git-lfs-transfer/transfer" ) diff --git a/modules/log/event_format.go b/modules/log/event_format.go index 4cf471d223..8b57748d51 100644 --- a/modules/log/event_format.go +++ b/modules/log/event_format.go @@ -164,7 +164,7 @@ func EventFormatTextMessage(mode *WriterMode, event *Event, msgFormat string, ms funcName := event.Caller shortFuncName := funcName if flags&Lshortfuncname != 0 { - // funcName = "code.gitea.io/gitea/modules/foo/bar.MyFunc.func1.2()" + // funcName = "gitea.dev/modules/foo/bar.MyFunc.func1.2()" slashPos := strings.LastIndexByte(funcName, '/') dotPos := strings.IndexByte(funcName[slashPos+1:], '.') if dotPos > 0 { diff --git a/modules/log/event_writer_console.go b/modules/log/event_writer_console.go index e4c409d83e..8a3e43710a 100644 --- a/modules/log/event_writer_console.go +++ b/modules/log/event_writer_console.go @@ -6,7 +6,7 @@ package log import ( "os" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/util" ) type WriterConsoleOption struct { diff --git a/modules/log/event_writer_file.go b/modules/log/event_writer_file.go index f26286498a..c4b8183c2a 100644 --- a/modules/log/event_writer_file.go +++ b/modules/log/event_writer_file.go @@ -6,8 +6,8 @@ package log import ( "io" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/util/rotatingfilewriter" + "gitea.dev/modules/util" + "gitea.dev/modules/util/rotatingfilewriter" ) type WriterFileOption struct { diff --git a/modules/log/flags.go b/modules/log/flags.go index f409261150..c480e06c75 100644 --- a/modules/log/flags.go +++ b/modules/log/flags.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - "code.gitea.io/gitea/modules/json" + "gitea.dev/modules/json" ) // These flags define which text to prefix to each log entry generated diff --git a/modules/log/flags_test.go b/modules/log/flags_test.go index 6eb65d8114..2c3f50874a 100644 --- a/modules/log/flags_test.go +++ b/modules/log/flags_test.go @@ -6,7 +6,7 @@ package log import ( "testing" - "code.gitea.io/gitea/modules/json" + "gitea.dev/modules/json" "github.com/stretchr/testify/assert" ) diff --git a/modules/log/init.go b/modules/log/init.go index ccaab50de3..d9cf1d9f80 100644 --- a/modules/log/init.go +++ b/modules/log/init.go @@ -8,8 +8,8 @@ import ( "runtime" "strings" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/util/rotatingfilewriter" + "gitea.dev/modules/process" + "gitea.dev/modules/util/rotatingfilewriter" ) var projectPackagePrefix string diff --git a/modules/log/level.go b/modules/log/level.go index 01fa3f5e46..41a3cd9c00 100644 --- a/modules/log/level.go +++ b/modules/log/level.go @@ -7,7 +7,7 @@ import ( "bytes" "strings" - "code.gitea.io/gitea/modules/json" + "gitea.dev/modules/json" ) // Level is the level of the logger diff --git a/modules/log/level_test.go b/modules/log/level_test.go index 0e59af6cb7..8dc96ecfae 100644 --- a/modules/log/level_test.go +++ b/modules/log/level_test.go @@ -7,7 +7,7 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/modules/json" + "gitea.dev/modules/json" "github.com/stretchr/testify/assert" ) diff --git a/modules/log/logger_impl.go b/modules/log/logger_impl.go index b15dc2f28d..082ab21ace 100644 --- a/modules/log/logger_impl.go +++ b/modules/log/logger_impl.go @@ -13,8 +13,8 @@ import ( "sync/atomic" "time" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/json" + "gitea.dev/modules/util" ) type LoggerImpl struct { diff --git a/modules/markup/asciicast/asciicast.go b/modules/markup/asciicast/asciicast.go index b3af5eef09..665cc8dbc0 100644 --- a/modules/markup/asciicast/asciicast.go +++ b/modules/markup/asciicast/asciicast.go @@ -8,8 +8,8 @@ import ( "io" "net/url" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/markup" + "gitea.dev/modules/setting" ) func init() { diff --git a/modules/markup/camo.go b/modules/markup/camo.go index f07d62d4f9..6c10dee612 100644 --- a/modules/markup/camo.go +++ b/modules/markup/camo.go @@ -10,7 +10,7 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/setting" ) // CamoEncode encodes a lnk to fit with the go-camo and camo proxy links. The purposes of camo-proxy are: diff --git a/modules/markup/camo_test.go b/modules/markup/camo_test.go index 3c5d40afa0..d432b9df4f 100644 --- a/modules/markup/camo_test.go +++ b/modules/markup/camo_test.go @@ -6,7 +6,7 @@ package markup import ( "testing" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/console/console.go b/modules/markup/console/console.go index bcd6cfce77..0524fd22cf 100644 --- a/modules/markup/console/console.go +++ b/modules/markup/console/console.go @@ -8,10 +8,10 @@ import ( "io" "unicode/utf8" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/markup" + "gitea.dev/modules/setting" + "gitea.dev/modules/typesniffer" + "gitea.dev/modules/util" trend "github.com/buildkite/terminal-to-html/v3" ) diff --git a/modules/markup/console/console_test.go b/modules/markup/console/console_test.go index d1192bebc2..00fc5e3b7e 100644 --- a/modules/markup/console/console_test.go +++ b/modules/markup/console/console_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/typesniffer" + "gitea.dev/modules/markup" + "gitea.dev/modules/typesniffer" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/csv/csv.go b/modules/markup/csv/csv.go index 910a1518bc..da73ea8114 100644 --- a/modules/markup/csv/csv.go +++ b/modules/markup/csv/csv.go @@ -9,11 +9,11 @@ import ( "io" "strconv" - "code.gitea.io/gitea/modules/csv" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/csv" + "gitea.dev/modules/markup" + "gitea.dev/modules/setting" + "gitea.dev/modules/translation" + "gitea.dev/modules/util" ) func init() { diff --git a/modules/markup/csv/csv_test.go b/modules/markup/csv/csv_test.go index fff7f0baca..6d68476e90 100644 --- a/modules/markup/csv/csv_test.go +++ b/modules/markup/csv/csv_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/markup" + "gitea.dev/modules/markup" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/external/external.go b/modules/markup/external/external.go index 4b3c96fd33..9a70e8f54b 100644 --- a/modules/markup/external/external.go +++ b/modules/markup/external/external.go @@ -12,9 +12,9 @@ import ( "runtime" "strings" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/markup" + "gitea.dev/modules/process" + "gitea.dev/modules/setting" "github.com/kballard/go-shellquote" ) diff --git a/modules/markup/external/frontend.go b/modules/markup/external/frontend.go index 7327503d28..34fa2715f7 100644 --- a/modules/markup/external/frontend.go +++ b/modules/markup/external/frontend.go @@ -8,11 +8,11 @@ import ( "io" "unicode/utf8" - "code.gitea.io/gitea/modules/htmlutil" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/public" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/htmlutil" + "gitea.dev/modules/markup" + "gitea.dev/modules/public" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" ) type frontendRenderer struct { @@ -90,6 +90,6 @@ func (p *frontendRenderer) Render(ctx *markup.RenderContext, input io.Reader, ou `, p.name, ctx.RenderOptions.RelativePath, contentEncoding, contentString, - public.AssetURI("js/external-render-frontend.js")) + public.AssetURI("web_src/js/external-render-frontend.ts")) return err } diff --git a/modules/markup/html.go b/modules/markup/html.go index 0fe37ae305..4943bdf4a5 100644 --- a/modules/markup/html.go +++ b/modules/markup/html.go @@ -13,9 +13,9 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/htmlutil" - "code.gitea.io/gitea/modules/markup/common" - "code.gitea.io/gitea/modules/translation" + "gitea.dev/modules/htmlutil" + "gitea.dev/modules/markup/common" + "gitea.dev/modules/translation" "golang.org/x/net/html" "golang.org/x/net/html/atom" @@ -175,16 +175,25 @@ var emojiProcessors = []processor{ emojiProcessor, } +// isBareURLSubject reports whether the (HTML-escaped) commit subject content +// is entirely a single URL, ignoring leading/trailing whitespace. +func isBareURLSubject(content string) bool { + s := strings.TrimSpace(html.UnescapeString(content)) + if s == "" { + return false + } + m := common.GlobalVars().LinkRegex.FindStringIndex(s) + return m != nil && m[0] == 0 && m[1] == len(s) +} + // PostProcessCommitMessageSubject will use the same logic as PostProcess and // PostProcessCommitMessage, but will disable the shortLinkProcessor and -// emailAddressProcessor, will add a defaultLinkProcessor if defaultLink is set, -// which changes every text node into a link to the passed default link. +// emailAddressProcessor, and wraps the whole subject in defaultLink. func PostProcessCommitMessageSubject(ctx *RenderContext, defaultLink, content string) (string, error) { procs := []processor{ fullIssuePatternProcessor, comparePatternProcessor, fullHashPatternProcessor, - linkProcessor, mentionProcessor, issueIndexPatternProcessor, commitCrossReferencePatternProcessor, @@ -192,6 +201,15 @@ func PostProcessCommitMessageSubject(ctx *RenderContext, defaultLink, content st emojiShortCodeProcessor, emojiProcessor, } + // When the whole subject is a bare URL, linkProcessor would turn it into + // a competing anchor and hijack the surrounding defaultLink wrapper, leaving + // the subject visually unclickable. Match GitHub: render such subjects as + // plain text inside defaultLink. Partial URLs inside larger text still become + // their own links (nested anchors aren't legal HTML, so the outer defaultLink + // naturally breaks on that span, same as on GitHub). + if !isBareURLSubject(content) { + procs = append(procs, linkProcessor) + } procs = append(procs, func(ctx *RenderContext, node *html.Node) { ch := &html.Node{Parent: node, Type: html.TextNode, Data: node.Data} node.Type = html.ElementNode diff --git a/modules/markup/html_codepreview.go b/modules/markup/html_codepreview.go index 1d6d9a6109..3d4d6d137e 100644 --- a/modules/markup/html_codepreview.go +++ b/modules/markup/html_codepreview.go @@ -9,8 +9,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" + "gitea.dev/modules/httplib" + "gitea.dev/modules/log" "golang.org/x/net/html" ) diff --git a/modules/markup/html_codepreview_test.go b/modules/markup/html_codepreview_test.go index 5ee8ebc6d6..1744cc7648 100644 --- a/modules/markup/html_codepreview_test.go +++ b/modules/markup/html_codepreview_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" + "gitea.dev/modules/markup" + "gitea.dev/modules/markup/markdown" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/html_commit.go b/modules/markup/html_commit.go index a2c5160674..a9c4852026 100644 --- a/modules/markup/html_commit.go +++ b/modules/markup/html_commit.go @@ -8,9 +8,9 @@ import ( "slices" "strings" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/references" + "gitea.dev/modules/base" + "gitea.dev/modules/httplib" + "gitea.dev/modules/references" "golang.org/x/net/html" "golang.org/x/net/html/atom" diff --git a/modules/markup/html_emoji.go b/modules/markup/html_emoji.go index 91ba26c676..e7c2d1ba6c 100644 --- a/modules/markup/html_emoji.go +++ b/modules/markup/html_emoji.go @@ -7,8 +7,8 @@ import ( "strings" "unicode" - "code.gitea.io/gitea/modules/emoji" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/emoji" + "gitea.dev/modules/setting" "golang.org/x/net/html" "golang.org/x/net/html/atom" @@ -69,6 +69,11 @@ func emojiShortCodeProcessor(ctx *RenderContext, node *html.Node) { m[1] += start start = m[1] + // don't render a shortcode whose ":" directly follows a backtick (an unclosed code span) + if m[0] > 0 && node.Data[m[0]-1] == '`' { + continue + } + alias := node.Data[m[0]:m[1]] var nextChar byte diff --git a/modules/markup/html_internal_test.go b/modules/markup/html_internal_test.go index 3a91797e25..186489ae72 100644 --- a/modules/markup/html_internal_test.go +++ b/modules/markup/html_internal_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/setting" - testModule "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/setting" + testModule "gitea.dev/modules/test" + "gitea.dev/modules/util" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/html_issue.go b/modules/markup/html_issue.go index a94abb3883..675098700f 100644 --- a/modules/markup/html_issue.go +++ b/modules/markup/html_issue.go @@ -8,13 +8,13 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/references" - "code.gitea.io/gitea/modules/regexplru" - "code.gitea.io/gitea/modules/templates/vars" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/httplib" + "gitea.dev/modules/log" + "gitea.dev/modules/references" + "gitea.dev/modules/regexplru" + "gitea.dev/modules/templates/vars" + "gitea.dev/modules/translation" + "gitea.dev/modules/util" "golang.org/x/net/html" "golang.org/x/net/html/atom" diff --git a/modules/markup/html_issue_test.go b/modules/markup/html_issue_test.go index 39cd9dcf6a..210a699051 100644 --- a/modules/markup/html_issue_test.go +++ b/modules/markup/html_issue_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/htmlutil" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - testModule "code.gitea.io/gitea/modules/test" + "gitea.dev/modules/htmlutil" + "gitea.dev/modules/markup" + "gitea.dev/modules/markup/markdown" + testModule "gitea.dev/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/markup/html_link.go b/modules/markup/html_link.go index c84e0b90d8..1e0e12da94 100644 --- a/modules/markup/html_link.go +++ b/modules/markup/html_link.go @@ -8,8 +8,8 @@ import ( "path" "strings" - "code.gitea.io/gitea/modules/markup/common" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/markup/common" + "gitea.dev/modules/util" "golang.org/x/net/html" "golang.org/x/net/html/atom" diff --git a/modules/markup/html_mention.go b/modules/markup/html_mention.go index 00cd51ca94..a8f8d18c45 100644 --- a/modules/markup/html_mention.go +++ b/modules/markup/html_mention.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/references" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/references" + "gitea.dev/modules/util" "golang.org/x/net/html" ) diff --git a/modules/markup/html_node.go b/modules/markup/html_node.go index f98e7429a2..33d402231c 100644 --- a/modules/markup/html_node.go +++ b/modules/markup/html_node.go @@ -6,7 +6,7 @@ package markup import ( "strings" - "code.gitea.io/gitea/modules/markup/common" + "gitea.dev/modules/markup/common" "golang.org/x/net/html" ) diff --git a/modules/markup/html_test.go b/modules/markup/html_test.go index 95b34959b9..f3aec68b6a 100644 --- a/modules/markup/html_test.go +++ b/modules/markup/html_test.go @@ -8,12 +8,12 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/emoji" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - testModule "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/emoji" + "gitea.dev/modules/markup" + "gitea.dev/modules/markup/markdown" + "gitea.dev/modules/setting" + testModule "gitea.dev/modules/test" + "gitea.dev/modules/util" "github.com/stretchr/testify/assert" ) @@ -377,6 +377,9 @@ func TestRender_emoji(t *testing.T) { test(":100:200", `

:100:200

`) test("std::thread::something", `

std::thread::something

`) test(":not exist:", `

:not exist:

`) + test("foo `:smile:", "

foo `:smile:

") + test("foo `:smile:`", `

foo :smile:

`) + test("foo ` :smile:", "

foo ` 😄

") } func TestRender_ShortLinks(t *testing.T) { diff --git a/modules/markup/html_toc_test.go b/modules/markup/html_toc_test.go index e93cfc9346..23dbfe3bff 100644 --- a/modules/markup/html_toc_test.go +++ b/modules/markup/html_toc_test.go @@ -7,9 +7,9 @@ import ( "regexp" "testing" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/test" + "gitea.dev/modules/markup" + "gitea.dev/modules/markup/markdown" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/internal/renderinternal.go b/modules/markup/internal/renderinternal.go index 370e642454..3b5886a19f 100644 --- a/modules/markup/internal/renderinternal.go +++ b/modules/markup/internal/renderinternal.go @@ -12,7 +12,7 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/htmlutil" + "gitea.dev/modules/htmlutil" "golang.org/x/net/html" ) diff --git a/modules/markup/main_test.go b/modules/markup/main_test.go index a8dcff475d..f8a77ad86e 100644 --- a/modules/markup/main_test.go +++ b/modules/markup/main_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/markup" + "gitea.dev/modules/setting" ) func TestMain(m *testing.M) { diff --git a/modules/markup/markdown/convertyaml.go b/modules/markup/markdown/convertyaml.go index 04664a9c1d..0c69901929 100644 --- a/modules/markup/markdown/convertyaml.go +++ b/modules/markup/markdown/convertyaml.go @@ -6,12 +6,12 @@ package markdown import ( "strings" - "code.gitea.io/gitea/modules/htmlutil" - "code.gitea.io/gitea/modules/svg" + "gitea.dev/modules/htmlutil" + "gitea.dev/modules/svg" "github.com/yuin/goldmark/ast" east "github.com/yuin/goldmark/extension/ast" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" ) func nodeToTable(meta *yaml.Node) ast.Node { diff --git a/modules/markup/markdown/goldmark.go b/modules/markup/markdown/goldmark.go index b2b16f5d9f..0fdd4cc24f 100644 --- a/modules/markup/markdown/goldmark.go +++ b/modules/markup/markdown/goldmark.go @@ -6,9 +6,9 @@ package markdown import ( "fmt" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/internal" + "gitea.dev/modules/container" + "gitea.dev/modules/markup" + "gitea.dev/modules/markup/internal" "github.com/yuin/goldmark/ast" east "github.com/yuin/goldmark/extension/ast" diff --git a/modules/markup/markdown/main_test.go b/modules/markup/markdown/main_test.go index 4b4d40bb2e..3bbb0f28ef 100644 --- a/modules/markup/markdown/main_test.go +++ b/modules/markup/markdown/main_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/markup" + "gitea.dev/modules/setting" ) func TestMain(m *testing.M) { diff --git a/modules/markup/markdown/markdown.go b/modules/markup/markdown/markdown.go index 7b21dcb012..790de93c09 100644 --- a/modules/markup/markdown/markdown.go +++ b/modules/markup/markdown/markdown.go @@ -11,13 +11,13 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/htmlutil" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/common" - "code.gitea.io/gitea/modules/markup/markdown/math" - "code.gitea.io/gitea/modules/setting" - giteautil "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/htmlutil" + "gitea.dev/modules/log" + "gitea.dev/modules/markup" + "gitea.dev/modules/markup/common" + "gitea.dev/modules/markup/markdown/math" + "gitea.dev/modules/setting" + giteautil "gitea.dev/modules/util" chromahtml "github.com/alecthomas/chroma/v2/formatters/html" "github.com/yuin/goldmark" diff --git a/modules/markup/markdown/markdown_attention_test.go b/modules/markup/markdown/markdown_attention_test.go index 7b54653ec0..d39c87f12c 100644 --- a/modules/markup/markdown/markdown_attention_test.go +++ b/modules/markup/markdown/markdown_attention_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/svg" + "gitea.dev/modules/markup" + "gitea.dev/modules/markup/markdown" + "gitea.dev/modules/svg" "github.com/stretchr/testify/assert" "golang.org/x/text/cases" diff --git a/modules/markup/markdown/markdown_benchmark_test.go b/modules/markup/markdown/markdown_benchmark_test.go index e08612f064..07afd45a8d 100644 --- a/modules/markup/markdown/markdown_benchmark_test.go +++ b/modules/markup/markdown/markdown_benchmark_test.go @@ -6,8 +6,8 @@ package markdown_test import ( "testing" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" + "gitea.dev/modules/markup" + "gitea.dev/modules/markup/markdown" ) func BenchmarkSpecializedMarkdown(b *testing.B) { diff --git a/modules/markup/markdown/markdown_math_test.go b/modules/markup/markdown/markdown_math_test.go index 9e368cb689..fc3ca2cf47 100644 --- a/modules/markup/markdown/markdown_math_test.go +++ b/modules/markup/markdown/markdown_math_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "gitea.dev/modules/markup" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/markdown/markdown_test.go b/modules/markup/markdown/markdown_test.go index c759dbf8b1..11ff7b09c5 100644 --- a/modules/markup/markdown/markdown_test.go +++ b/modules/markup/markdown/markdown_test.go @@ -9,11 +9,11 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "gitea.dev/modules/log" + "gitea.dev/modules/markup" + "gitea.dev/modules/markup/markdown" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/markdown/math/block_parser.go b/modules/markup/markdown/math/block_parser.go index 2c5553550a..1768c3a4b3 100644 --- a/modules/markup/markdown/math/block_parser.go +++ b/modules/markup/markdown/math/block_parser.go @@ -6,7 +6,7 @@ package math import ( "bytes" - giteaUtil "code.gitea.io/gitea/modules/util" + giteaUtil "gitea.dev/modules/util" "github.com/yuin/goldmark/ast" "github.com/yuin/goldmark/parser" diff --git a/modules/markup/markdown/math/block_renderer.go b/modules/markup/markdown/math/block_renderer.go index 95a336a02c..2d589cf7d7 100644 --- a/modules/markup/markdown/math/block_renderer.go +++ b/modules/markup/markdown/math/block_renderer.go @@ -6,8 +6,8 @@ package math import ( "html/template" - "code.gitea.io/gitea/modules/markup/internal" - giteaUtil "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/markup/internal" + giteaUtil "gitea.dev/modules/util" gast "github.com/yuin/goldmark/ast" "github.com/yuin/goldmark/renderer" diff --git a/modules/markup/markdown/math/inline_renderer.go b/modules/markup/markdown/math/inline_renderer.go index eeeb60cc7e..d438af1a24 100644 --- a/modules/markup/markdown/math/inline_renderer.go +++ b/modules/markup/markdown/math/inline_renderer.go @@ -6,7 +6,7 @@ package math import ( "bytes" - "code.gitea.io/gitea/modules/markup/internal" + "gitea.dev/modules/markup/internal" "github.com/yuin/goldmark/ast" "github.com/yuin/goldmark/renderer" diff --git a/modules/markup/markdown/math/math.go b/modules/markup/markdown/math/math.go index 4b74db2d76..b8616f4d80 100644 --- a/modules/markup/markdown/math/math.go +++ b/modules/markup/markdown/math/math.go @@ -4,8 +4,8 @@ package math import ( - "code.gitea.io/gitea/modules/markup/internal" - giteaUtil "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/markup/internal" + giteaUtil "gitea.dev/modules/util" "github.com/yuin/goldmark" "github.com/yuin/goldmark/parser" diff --git a/modules/markup/markdown/meta.go b/modules/markup/markdown/meta.go index 6ddd892110..ecc0b81098 100644 --- a/modules/markup/markdown/meta.go +++ b/modules/markup/markdown/meta.go @@ -9,7 +9,7 @@ import ( "unicode" "unicode/utf8" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" ) func isYAMLSeparator(line []byte) bool { diff --git a/modules/markup/markdown/renderconfig.go b/modules/markup/markdown/renderconfig.go index d8b1b10ce6..59f3e873ec 100644 --- a/modules/markup/markdown/renderconfig.go +++ b/modules/markup/markdown/renderconfig.go @@ -7,10 +7,10 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/markup" + "gitea.dev/modules/markup" "github.com/yuin/goldmark/ast" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" ) // RenderConfig represents rendering configuration for this file diff --git a/modules/markup/markdown/renderconfig_test.go b/modules/markup/markdown/renderconfig_test.go index 53c52177a7..84e4ac33f6 100644 --- a/modules/markup/markdown/renderconfig_test.go +++ b/modules/markup/markdown/renderconfig_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" ) func TestRenderConfig_UnmarshalYAML(t *testing.T) { diff --git a/modules/markup/markdown/transform_blockquote.go b/modules/markup/markdown/transform_blockquote.go index bf17f01681..b6cbef9a0a 100644 --- a/modules/markup/markdown/transform_blockquote.go +++ b/modules/markup/markdown/transform_blockquote.go @@ -6,7 +6,7 @@ package markdown import ( "strings" - "code.gitea.io/gitea/modules/svg" + "gitea.dev/modules/svg" "github.com/yuin/goldmark/ast" "github.com/yuin/goldmark/text" diff --git a/modules/markup/markdown/transform_codespan.go b/modules/markup/markdown/transform_codespan.go index c2e4295bc2..900c38b129 100644 --- a/modules/markup/markdown/transform_codespan.go +++ b/modules/markup/markdown/transform_codespan.go @@ -7,7 +7,7 @@ import ( "bytes" "strings" - "code.gitea.io/gitea/modules/markup" + "gitea.dev/modules/markup" "github.com/microcosm-cc/bluemonday/css" "github.com/yuin/goldmark/ast" diff --git a/modules/markup/markdown/transform_list.go b/modules/markup/markdown/transform_list.go index 6cafa8ff78..999738790c 100644 --- a/modules/markup/markdown/transform_list.go +++ b/modules/markup/markdown/transform_list.go @@ -6,7 +6,7 @@ package markdown import ( "fmt" - "code.gitea.io/gitea/modules/markup" + "gitea.dev/modules/markup" "github.com/yuin/goldmark/ast" east "github.com/yuin/goldmark/extension/ast" diff --git a/modules/markup/mdstripper/mdstripper.go b/modules/markup/mdstripper/mdstripper.go index bf69051e87..a127bbfd4b 100644 --- a/modules/markup/mdstripper/mdstripper.go +++ b/modules/markup/mdstripper/mdstripper.go @@ -10,9 +10,9 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup/common" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/log" + "gitea.dev/modules/markup/common" + "gitea.dev/modules/setting" "github.com/yuin/goldmark" "github.com/yuin/goldmark/ast" diff --git a/modules/markup/orgmode/orgmode.go b/modules/markup/orgmode/orgmode.go index ea331672bf..37184dcdac 100644 --- a/modules/markup/orgmode/orgmode.go +++ b/modules/markup/orgmode/orgmode.go @@ -9,11 +9,11 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/highlight" - "code.gitea.io/gitea/modules/htmlutil" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/highlight" + "gitea.dev/modules/htmlutil" + "gitea.dev/modules/log" + "gitea.dev/modules/markup" + "gitea.dev/modules/setting" "github.com/alecthomas/chroma/v2" "github.com/niklasfasching/go-org/org" diff --git a/modules/markup/orgmode/orgmode_test.go b/modules/markup/orgmode/orgmode_test.go index ebda2271f2..d18660b054 100644 --- a/modules/markup/orgmode/orgmode_test.go +++ b/modules/markup/orgmode/orgmode_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/orgmode" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/markup" + "gitea.dev/modules/markup/orgmode" + "gitea.dev/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/render.go b/modules/markup/render.go index da4cbbb6f9..6f43434485 100644 --- a/modules/markup/render.go +++ b/modules/markup/render.go @@ -15,12 +15,12 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/htmlutil" - "code.gitea.io/gitea/modules/markup/internal" - "code.gitea.io/gitea/modules/public" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" + "gitea.dev/modules/htmlutil" + "gitea.dev/modules/markup/internal" + "gitea.dev/modules/public" + "gitea.dev/modules/setting" + "gitea.dev/modules/typesniffer" + "gitea.dev/modules/util" "golang.org/x/sync/errgroup" ) @@ -243,7 +243,7 @@ func RenderWithRenderer(ctx *RenderContext, renderer Renderer, input io.Reader, return RenderIFrame(ctx, &extOpts, output) } // else: this is a standalone page, fallthrough to the real rendering, and add extra JS/CSS - extraScriptSrc := public.AssetURI("js/external-render-helper.js") + extraScriptSrc := public.AssetURI("web_src/js/external-render-helper.ts") extraLinkHref := ctx.RenderOptions.StandalonePageOptions.CurrentWebTheme.PublicAssetURI() // " -{{ctx.ScriptImport "js/iife.js"}} +{{ctx.ScriptImport "web_src/js/iife.ts"}} diff --git a/templates/base/head_style.tmpl b/templates/base/head_style.tmpl index 4a4fb9d96f..dba782f9bb 100644 --- a/templates/base/head_style.tmpl +++ b/templates/base/head_style.tmpl @@ -1,2 +1,2 @@ - +{{AssetCSSLinks "web_src/js/index.ts" "web_src/css/index.css"}} diff --git a/templates/devtest/devtest-header.tmpl b/templates/devtest/devtest-header.tmpl index c9d7b3047f..ad153364e0 100644 --- a/templates/devtest/devtest-header.tmpl +++ b/templates/devtest/devtest-header.tmpl @@ -1,4 +1,4 @@ {{template "base/head" ctx.RootData}} - +
{{template "base/alert" ctx.RootData}}
diff --git a/templates/devtest/repo-action-view.tmpl b/templates/devtest/repo-action-view.tmpl index 2971039fc9..4e06f72cdd 100644 --- a/templates/devtest/repo-action-view.tmpl +++ b/templates/devtest/repo-action-view.tmpl @@ -5,6 +5,7 @@ Run:CanApprove Run:CanRerunLatest Run:PreviousAttempt + Run:ReusableCaller {{template "repo/actions/view_component" (dict "JobID" (or .JobID 0) diff --git a/templates/home.tmpl b/templates/home.tmpl index 4d7e7b9327..0513520567 100644 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -43,7 +43,7 @@ {{svg "octicon-code"}} {{ctx.Locale.Tr "startpage.license"}}

- {{ctx.Locale.Tr "startpage.license_desc" "https://code.gitea.io/gitea" "code.gitea.io/gitea" "https://github.com/go-gitea/gitea"}} + {{ctx.Locale.Tr "startpage.license_desc" "https://gitea.dev" "gitea.dev" "https://github.com/go-gitea/gitea"}}

diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index b8e88b837d..ea637e76fb 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -11,6 +11,17 @@
{{end}} +
+
+
+ {{template "shared/search/input" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.user_kind")}} + {{template "shared/search/button"}} +
+
+
+ {{ctx.Locale.Tr "org.members"}}: {{CountFmt .MembersShown}} / {{CountFmt .MembersTotal}} +
+
{{range .Members}} {{$isPublic := index $.MembersIsPublicMember .ID}} @@ -67,6 +78,12 @@ {{end}}
+ {{else}} +
+
+ {{ctx.Locale.Tr "search.no_results"}} +
+
{{end}} {{template "base/paginate" .}} diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl index 5244a8f165..1e5ad99bdb 100644 --- a/templates/org/settings/navbar.tmpl +++ b/templates/org/settings/navbar.tmpl @@ -29,7 +29,7 @@ {{end}} {{if .EnableActions}} -
+
{{ctx.Locale.Tr "actions.actions"}}
diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index 30056e211f..8f4f1d60fd 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -134,16 +134,16 @@ {{if $canWriteProject}} + {{if .AllowBulkActions}} +
+
+ + + + +
+
+ {{end}} + {{if .Runners}}
+ {{if .AllowBulkActions}} + + {{end}} {{range .Runners}} + {{if $.AllowBulkActions}} + + {{end}} - {{else}} - - - {{end}}
{{ctx.Locale.Tr "actions.runners.status"}} {{SortArrow "online" "offline" .SortType false}} @@ -66,6 +84,9 @@
{{.StatusLocaleName ctx.Locale}} {{if .IsDisabled}}{{ctx.Locale.Tr "actions.runners.disabled"}}{{end}} @@ -84,15 +105,13 @@ {{end}}
{{ctx.Locale.Tr "actions.runners.none"}}
+ {{else}} +
{{ctx.Locale.Tr "actions.runners.none"}}
+ {{end}} {{template "base/paginate" .}} -
diff --git a/templates/swagger/openapi-viewer.tmpl b/templates/swagger/openapi-viewer.tmpl index 792364157d..2e3e9bf149 100644 --- a/templates/swagger/openapi-viewer.tmpl +++ b/templates/swagger/openapi-viewer.tmpl @@ -4,14 +4,14 @@ {{ctx.HeadMetaContentSecurityPolicy}} Gitea API - {{/* HINT: SWAGGER-CSS-IMPORT: import swagger styles ahead to avoid UI flicker (e.g.: the swagger-back-link element) */}} - + {{/* HINT: SWAGGER-CSS-IMPORT: load swagger styles ahead to avoid flicker (e.g. the swagger-back-link) */}} + {{AssetCSSLinks "web_src/js/swagger.ts" "web_src/css/swagger-standalone.css"}} {{/* TODO: add Help & Glossary to help users understand the API, and explain some concepts like "Owner" */}} {{svg "octicon-reply"}}{{ctx.Locale.Tr "return_to_gitea"}}
- {{ctx.ScriptImport "js/swagger.js" "module"}} + {{ctx.ScriptImport "web_src/js/swagger.ts" "module"}} diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index bc2681c3e5..f5258d3c00 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -21741,7 +21741,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "AccessToken": { "type": "object", @@ -21789,7 +21789,7 @@ "x-go-name": "TokenLastEight" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionArtifact": { "description": "ActionArtifact represents a ActionArtifact", @@ -21840,7 +21840,7 @@ "$ref": "#/definitions/ActionWorkflowRun" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionArtifactsResponse": { "description": "ActionArtifactsResponse returns ActionArtifacts", @@ -21859,7 +21859,7 @@ "x-go-name": "TotalCount" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionRunner": { "description": "ActionRunner represents a Runner", @@ -21898,7 +21898,7 @@ "x-go-name": "Status" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionRunnerLabel": { "description": "ActionRunnerLabel represents a Runner Label", @@ -21918,7 +21918,7 @@ "x-go-name": "Type" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionRunnersResponse": { "description": "ActionRunnersResponse returns Runners", @@ -21937,7 +21937,7 @@ "x-go-name": "TotalCount" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionTask": { "description": "ActionTask represents a ActionTask", @@ -22011,7 +22011,7 @@ "x-go-name": "WorkflowID" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionTaskResponse": { "description": "ActionTaskResponse returns a ActionTask", @@ -22032,7 +22032,7 @@ "x-go-name": "Entries" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionVariable": { "description": "ActionVariable return value of the query API", @@ -22066,7 +22066,7 @@ "x-go-name": "RepoID" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionWorkflow": { "description": "ActionWorkflow represents a ActionWorkflow", @@ -22123,7 +22123,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionWorkflowJob": { "description": "ActionWorkflowJob represents a WorkflowJob", @@ -22215,7 +22215,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionWorkflowJobsResponse": { "description": "ActionWorkflowJobsResponse returns ActionWorkflowJobs", @@ -22234,7 +22234,7 @@ "x-go-name": "TotalCount" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionWorkflowResponse": { "description": "ActionWorkflowResponse returns a ActionWorkflow", @@ -22253,7 +22253,7 @@ "x-go-name": "Workflows" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionWorkflowRun": { "description": "ActionWorkflowRun represents a WorkflowRun", @@ -22344,7 +22344,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionWorkflowRunsResponse": { "description": "ActionWorkflowRunsResponse returns ActionWorkflowRuns", @@ -22363,7 +22363,7 @@ "x-go-name": "Entries" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionWorkflowStep": { "description": "ActionWorkflowStep represents a step of a WorkflowJob", @@ -22397,7 +22397,7 @@ "x-go-name": "Status" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Activity": { "type": "object", @@ -22497,7 +22497,7 @@ "x-go-name": "UserID" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "AddCollaboratorOption": { "description": "AddCollaboratorOption options when adding a user as a collaborator of a repository", @@ -22515,7 +22515,7 @@ "x-go-name": "Permission" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "AddTimeOption": { "description": "AddTimeOption options for adding time to an issue", @@ -22541,7 +22541,7 @@ "x-go-name": "User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "AnnotatedTag": { "description": "AnnotatedTag represents an annotated tag", @@ -22577,7 +22577,7 @@ "$ref": "#/definitions/PayloadCommitVerification" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "AnnotatedTagObject": { "description": "AnnotatedTagObject contains meta information of the tag object", @@ -22599,7 +22599,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ApplyDiffPatchFileOptions": { "description": "ApplyDiffPatchFileOptions options for applying a diff patch\nNote: `author` and `committer` are optional (if only one is given, it will be used for the other, otherwise the authenticated user will be used)", @@ -22647,7 +22647,7 @@ "x-go-name": "Signoff" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Attachment": { "description": "Attachment a generic attachment", @@ -22692,7 +22692,7 @@ "x-go-name": "UUID" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Badge": { "description": "Badge represents a user badge", @@ -22716,7 +22716,7 @@ "x-go-name": "Slug" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Branch": { "description": "Branch represents a repository branch", @@ -22770,7 +22770,7 @@ "x-go-name": "UserCanPush" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "BranchProtection": { "description": "BranchProtection represents a branch protection for a repository", @@ -22961,7 +22961,7 @@ "x-go-name": "Updated" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ChangeFileOperation": { "description": "ChangeFileOperation for creating, updating or deleting a file", @@ -23004,7 +23004,7 @@ "x-go-name": "SHA" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ChangeFilesOptions": { "description": "ChangeFilesOptions options for creating, updating or deleting multiple files\nNote: `author` and `committer` are optional (if only one is given, it will be used for the other, otherwise the authenticated user will be used)", @@ -23056,7 +23056,7 @@ "x-go-name": "Signoff" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ChangedFile": { "description": "ChangedFile store information about files affected by the pull request", @@ -23111,7 +23111,7 @@ "x-go-name": "Status" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CombinedStatus": { "description": "CombinedStatus holds the combined state of several statuses for a single commit", @@ -23164,7 +23164,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Comment": { "description": "Comment represents a comment on a commit or issue", @@ -23229,7 +23229,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Commit": { "type": "object", @@ -23284,7 +23284,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CommitAffectedFiles": { "description": "CommitAffectedFiles store information about files affected by the commit", @@ -23301,7 +23301,7 @@ "x-go-name": "Status" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CommitDateOptions": { "description": "CommitDateOptions store dates for GIT_AUTHOR_DATE and GIT_COMMITTER_DATE", @@ -23318,7 +23318,7 @@ "x-go-name": "Committer" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CommitMeta": { "type": "object", @@ -23340,7 +23340,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CommitStats": { "description": "CommitStats is statistics for a RepoCommit", @@ -23365,7 +23365,7 @@ "x-go-name": "Total" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CommitStatus": { "description": "CommitStatus holds a single status of a single Commit", @@ -23425,7 +23425,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CommitUser": { "type": "object", @@ -23447,7 +23447,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Compare": { "type": "object", @@ -23466,7 +23466,7 @@ "x-go-name": "TotalCommits" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ContentsExtResponse": { "type": "object", @@ -23483,7 +23483,7 @@ "$ref": "#/definitions/ContentsResponse" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ContentsResponse": { "description": "ContentsResponse contains information about a repo's entry's (dir, file, symlink, submodule) metadata and content", @@ -23590,7 +23590,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateAccessTokenOption": { "description": "CreateAccessTokenOption options when create access token", @@ -23622,7 +23622,7 @@ ] } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateActionWorkflowDispatch": { "description": "CreateActionWorkflowDispatch represents the payload for triggering a workflow dispatch event", @@ -23644,7 +23644,7 @@ "example": "refs/heads/main" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateBranchProtectionOption": { "description": "CreateBranchProtectionOption options for creating a branch protection", @@ -23823,7 +23823,7 @@ "x-go-name": "UnprotectedFilePatterns" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateBranchRepoOption": { "description": "CreateBranchRepoOption options when creating a branch in a repository", @@ -23851,7 +23851,7 @@ "x-go-name": "OldRefName" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateEmailOption": { "description": "CreateEmailOption options when creating email addresses", @@ -23866,7 +23866,7 @@ "x-go-name": "Emails" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateFileOptions": { "description": "CreateFileOptions options for creating a file\nNote: `author` and `committer` are optional (if only one is given, it will be used for the other, otherwise the authenticated user will be used)", @@ -23915,7 +23915,7 @@ "x-go-name": "Signoff" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateForkOption": { "description": "CreateForkOption options for creating a fork", @@ -23932,7 +23932,7 @@ "x-go-name": "Organization" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateGPGKeyOption": { "description": "CreateGPGKeyOption options create user GPG key", @@ -23953,7 +23953,7 @@ "x-go-name": "Signature" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateHookOption": { "description": "CreateHookOption options when create a hook", @@ -24011,7 +24011,7 @@ "x-go-name": "Type" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateHookOptionConfig": { "description": "CreateHookOptionConfig has all config options in it\nrequired are \"content_type\" and \"url\" Required", @@ -24019,7 +24019,7 @@ "additionalProperties": { "type": "string" }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateIssueCommentOption": { "description": "CreateIssueCommentOption options for creating a comment on an issue", @@ -24033,7 +24033,7 @@ "x-go-name": "Body" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateIssueOption": { "description": "CreateIssueOption options to create one issue", @@ -24100,7 +24100,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateKeyOption": { "description": "CreateKeyOption options when creating a key", @@ -24128,7 +24128,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateLabelOption": { "description": "CreateLabelOption options for creating a label", @@ -24163,7 +24163,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateMilestoneOption": { "description": "CreateMilestoneOption options for creating a milestone", @@ -24193,7 +24193,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateOAuth2ApplicationOptions": { "description": "CreateOAuth2ApplicationOptions holds options to create an oauth2 application", @@ -24223,7 +24223,7 @@ "x-go-name": "SkipSecondaryAuthorization" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateOrUpdateSecretOption": { "description": "CreateOrUpdateSecretOption options when creating or updating secret", @@ -24243,7 +24243,7 @@ "x-go-name": "Description" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateOrgOption": { "description": "CreateOrgOption options for creating an organization", @@ -24299,7 +24299,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreatePullRequestOption": { "description": "CreatePullRequestOption options when creating a pull request", @@ -24380,7 +24380,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreatePullReviewComment": { "description": "CreatePullReviewComment represent a review comment for creation api", @@ -24408,7 +24408,7 @@ "x-go-name": "Path" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreatePullReviewCommentReplyOptions": { "description": "CreatePullReviewCommentReplyOptions are options to reply to a pull request review comment", @@ -24419,7 +24419,7 @@ "x-go-name": "Body" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreatePullReviewOptions": { "description": "CreatePullReviewOptions are options to create a pull request review", @@ -24453,7 +24453,7 @@ "x-go-name": "Event" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreatePushMirrorOption": { "type": "object", @@ -24485,7 +24485,7 @@ "x-go-name": "SyncOnCommit" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateReleaseOption": { "description": "CreateReleaseOption options when creating a release", @@ -24529,7 +24529,7 @@ "x-go-name": "Target" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateRepoOption": { "description": "CreateRepoOption options when creating repository", @@ -24611,7 +24611,7 @@ "x-go-name": "TrustModel" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateStatusOption": { "description": "CreateStatusOption holds the information needed to create a new CommitStatus for a Commit", @@ -24647,7 +24647,7 @@ "x-go-name": "TargetURL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateTagOption": { "description": "CreateTagOption options when creating a tag", @@ -24671,7 +24671,7 @@ "x-go-name": "Target" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateTagProtectionOption": { "description": "CreateTagProtectionOption options for creating a tag protection", @@ -24699,7 +24699,7 @@ "x-go-name": "WhitelistUsernames" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateTeamOption": { "description": "CreateTeamOption options for creating a team", @@ -24765,7 +24765,7 @@ "example": "{\"repo.actions\",\"repo.packages\",\"repo.code\":\"read\",\"repo.issues\":\"write\",\"repo.ext_issues\":\"none\",\"repo.wiki\":\"admin\",\"repo.pulls\":\"owner\",\"repo.releases\":\"none\",\"repo.projects\":\"none\",\"repo.ext_wiki\":\"none\"}" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateUserOption": { "description": "CreateUserOption create user options", @@ -24840,7 +24840,7 @@ "x-go-name": "Visibility" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateVariableOption": { "description": "CreateVariableOption the option when creating variable", @@ -24860,7 +24860,7 @@ "x-go-name": "Value" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateWikiPageOptions": { "description": "CreateWikiPageOptions form for creating wiki", @@ -24882,7 +24882,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Cron": { "description": "Cron represents a Cron task", @@ -24917,7 +24917,7 @@ "x-go-name": "Schedule" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "DeleteEmailOption": { "description": "DeleteEmailOption options when deleting email addresses", @@ -24932,7 +24932,7 @@ "x-go-name": "Emails" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "DeleteFileOptions": { "description": "DeleteFileOptions options for deleting a file\nNote: `author` and `committer` are optional (if only one is given, it will be used for the other, otherwise the authenticated user will be used)", @@ -24981,7 +24981,7 @@ "x-go-name": "Signoff" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "DeployKey": { "description": "DeployKey a deploy key", @@ -25033,7 +25033,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "DismissPullReviewOptions": { "description": "DismissPullReviewOptions are options to dismiss a pull request review", @@ -25048,7 +25048,7 @@ "x-go-name": "Priors" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditActionRunnerOption": { "type": "object", @@ -25062,7 +25062,7 @@ "x-go-name": "Disabled" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditAttachmentOptions": { "description": "EditAttachmentOptions options for editing attachments", @@ -25074,7 +25074,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditBranchProtectionOption": { "description": "EditBranchProtectionOption options for editing a branch protection", @@ -25244,7 +25244,7 @@ "x-go-name": "UnprotectedFilePatterns" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditDeadlineOption": { "description": "EditDeadlineOption options for creating a deadline", @@ -25259,7 +25259,7 @@ "x-go-name": "Deadline" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditGitHookOption": { "description": "EditGitHookOption options when modifying one Git hook", @@ -25271,7 +25271,7 @@ "x-go-name": "Content" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditHookOption": { "description": "EditHookOption options when modify one hook", @@ -25314,7 +25314,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditIssueCommentOption": { "description": "EditIssueCommentOption options for editing a comment", @@ -25328,7 +25328,7 @@ "x-go-name": "Body" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditIssueOption": { "description": "EditIssueOption options for editing an issue", @@ -25392,7 +25392,7 @@ "x-go-name": "RemoveDeadline" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditLabelOption": { "description": "EditLabelOption options for editing a label", @@ -25424,7 +25424,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditMilestoneOption": { "description": "EditMilestoneOption options for editing a milestone", @@ -25456,7 +25456,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditOrgOption": { "description": "EditOrgOption options for editing an organization", @@ -25504,7 +25504,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditPullRequestOption": { "description": "EditPullRequestOption options when modify pull request", @@ -25580,7 +25580,7 @@ "x-go-name": "RemoveDeadline" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditReactionOption": { "description": "EditReactionOption contain the reaction type", @@ -25592,7 +25592,7 @@ "x-go-name": "Reaction" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditReleaseOption": { "description": "EditReleaseOption options when editing a release", @@ -25629,7 +25629,7 @@ "x-go-name": "Target" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditRepoOption": { "description": "EditRepoOption options when editing a repository's properties", @@ -25821,7 +25821,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditTagProtectionOption": { "description": "EditTagProtectionOption options for editing a tag protection", @@ -25849,7 +25849,7 @@ "x-go-name": "WhitelistUsernames" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditTeamOption": { "description": "EditTeamOption options for editing a team", @@ -25922,7 +25922,7 @@ } } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditUserOption": { "description": "EditUserOption edit user options", @@ -26031,7 +26031,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Email": { "description": "Email an email address belonging to a user", @@ -26064,7 +26064,7 @@ "x-go-name": "Verified" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ExternalTracker": { "description": "ExternalTracker represents settings for external tracker", @@ -26091,7 +26091,7 @@ "x-go-name": "ExternalTrackerURL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ExternalWiki": { "description": "ExternalWiki represents setting for external wiki", @@ -26103,7 +26103,7 @@ "x-go-name": "ExternalWikiURL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "FileCommitResponse": { "type": "object", @@ -26152,7 +26152,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "FileDeleteResponse": { "description": "FileDeleteResponse contains information about a repo's file that was deleted", @@ -26169,7 +26169,7 @@ "$ref": "#/definitions/PayloadCommitVerification" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "FileLinksResponse": { "description": "FileLinksResponse contains the links for a repo's file", @@ -26191,7 +26191,7 @@ "x-go-name": "Self" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "FileResponse": { "description": "FileResponse contains information about a repo's file", @@ -26207,7 +26207,7 @@ "$ref": "#/definitions/PayloadCommitVerification" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "FilesResponse": { "description": "FilesResponse contains information about multiple files from a repo", @@ -26228,7 +26228,7 @@ "$ref": "#/definitions/PayloadCommitVerification" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "GPGKey": { "description": "GPGKey a user GPG key to sign commit and tag in repository", @@ -26307,7 +26307,7 @@ "x-go-name": "Verified" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "GPGKeyEmail": { "description": "GPGKeyEmail an email attached to a GPGKey", @@ -26324,7 +26324,7 @@ "x-go-name": "Verified" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "GeneralAPISettings": { "description": "GeneralAPISettings contains global api settings exposed by it", @@ -26361,7 +26361,7 @@ "x-go-name": "MaxResponseItems" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "GeneralAttachmentSettings": { "description": "GeneralAttachmentSettings contains global Attachment settings exposed by API", @@ -26390,7 +26390,7 @@ "x-go-name": "MaxSize" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "GeneralRepoSettings": { "description": "GeneralRepoSettings contains global repository settings exposed by API", @@ -26427,7 +26427,7 @@ "x-go-name": "TimeTrackingDisabled" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "GeneralUISettings": { "description": "GeneralUISettings contains global ui settings exposed by API", @@ -26455,7 +26455,7 @@ "x-go-name": "DefaultTheme" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "GenerateRepoOption": { "description": "GenerateRepoOption options when creating a repository using a template", @@ -26526,7 +26526,7 @@ "x-go-name": "Webhooks" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "GetFilesOptions": { "description": "GetFilesOptions options for retrieving metadate and content of multiple files", @@ -26541,7 +26541,7 @@ "x-go-name": "Files" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "GitBlobResponse": { "description": "GitBlobResponse represents a git blob", @@ -26585,7 +26585,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "GitEntry": { "description": "GitEntry represents a git tree", @@ -26623,7 +26623,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "GitHook": { "description": "GitHook represents a Git repository hook", @@ -26645,7 +26645,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "GitObject": { "type": "object", @@ -26667,7 +26667,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "GitTreeResponse": { "description": "GitTreeResponse returns a git tree", @@ -26709,7 +26709,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "GitignoreTemplateInfo": { "description": "GitignoreTemplateInfo name and text of a gitignore template", @@ -26726,7 +26726,7 @@ "x-go-name": "Source" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Hook": { "description": "Hook a hook is a web hook when one repository changed", @@ -26790,7 +26790,7 @@ "x-go-name": "Updated" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Identity": { "description": "Identity for a person's identity like an author or committer", @@ -26807,7 +26807,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "InternalTracker": { "description": "InternalTracker represents settings for internal tracker", @@ -26829,7 +26829,7 @@ "x-go-name": "EnableTimeTracker" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Issue": { "description": "Issue represents an issue in a repository", @@ -26972,7 +26972,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "IssueConfig": { "type": "object", @@ -26989,7 +26989,7 @@ "x-go-name": "ContactLinks" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "IssueConfigContactLink": { "type": "object", @@ -27007,7 +27007,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "IssueConfigValidation": { "type": "object", @@ -27021,7 +27021,7 @@ "x-go-name": "Valid" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "IssueDeadline": { "description": "IssueDeadline represents an issue deadline", @@ -27033,7 +27033,7 @@ "x-go-name": "Deadline" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "IssueFormField": { "description": "IssueFormField represents a form field", @@ -27078,7 +27078,7 @@ "x-go-name": "Visible" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "IssueLabelsOption": { "description": "IssueLabelsOption a collection of labels", @@ -27091,7 +27091,7 @@ "x-go-name": "Labels" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "IssueMeta": { "description": "IssueMeta basic issue information", @@ -27112,7 +27112,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "IssueTemplate": { "description": "IssueTemplate represents an issue template for a repository", @@ -27156,14 +27156,14 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "IssueTemplateStringSlice": { "type": "array", "items": { "type": "string" }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Label": { "description": "Label a label to an issue or a pr", @@ -27206,7 +27206,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "LabelTemplate": { "description": "LabelTemplate info of a Label template", @@ -27233,7 +27233,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "LicenseTemplateInfo": { "description": "LicensesInfo contains information about a License", @@ -27265,7 +27265,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "LicensesTemplateListEntry": { "description": "LicensesListEntry is used for the API", @@ -27287,7 +27287,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "LockIssueOption": { "description": "LockIssueOption options to lock an issue", @@ -27298,7 +27298,7 @@ "x-go-name": "Reason" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "MarkdownOption": { "description": "MarkdownOption markdown options", @@ -27321,7 +27321,7 @@ "type": "boolean" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "MarkupOption": { "description": "MarkupOption markup options", @@ -27348,7 +27348,7 @@ "type": "boolean" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "MergePullRequestOption": { "description": "MergePullRequestForm form for merging Pull Request", @@ -27399,7 +27399,7 @@ } }, "x-go-name": "MergePullRequestForm", - "x-go-package": "code.gitea.io/gitea/services/forms" + "x-go-package": "gitea.dev/services/forms" }, "MergeUpstreamRequest": { "type": "object", @@ -27413,7 +27413,7 @@ "x-go-name": "FfOnly" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "MergeUpstreamResponse": { "type": "object", @@ -27423,7 +27423,7 @@ "x-go-name": "MergeStyle" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "MigrateRepoOptions": { "description": "MigrateRepoOptions options for migrating repository's\nthis is used to interact with api v1", @@ -27536,7 +27536,7 @@ "x-go-name": "Wiki" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Milestone": { "description": "Milestone milestone is a collection of issues on one repository", @@ -27601,7 +27601,7 @@ "x-go-name": "Updated" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "NewIssuePinsAllowed": { "description": "NewIssuePinsAllowed represents an API response that says if new Issue Pins are allowed", @@ -27616,7 +27616,7 @@ "x-go-name": "PullRequests" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "NodeInfo": { "description": "NodeInfo contains standardized way of exposing metadata about a server running one of the distributed social networks", @@ -27655,7 +27655,7 @@ "x-go-name": "Version" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "NodeInfoServices": { "description": "NodeInfoServices contains the third party sites this server can connect to via their application API", @@ -27678,7 +27678,7 @@ "x-go-name": "Outbound" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "NodeInfoSoftware": { "description": "NodeInfoSoftware contains Metadata about server software in use", @@ -27705,7 +27705,7 @@ "x-go-name": "Version" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "NodeInfoUsage": { "description": "NodeInfoUsage contains usage statistics for this server", @@ -27727,7 +27727,7 @@ "$ref": "#/definitions/NodeInfoUsageUsers" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "NodeInfoUsageUsers": { "description": "NodeInfoUsageUsers contains statistics about the users of this server", @@ -27752,7 +27752,7 @@ "x-go-name": "Total" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Note": { "description": "Note contains information related to a git note", @@ -27767,7 +27767,7 @@ "x-go-name": "Message" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "NotificationCount": { "description": "NotificationCount number of unread notifications", @@ -27780,7 +27780,7 @@ "x-go-name": "New" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "NotificationSubject": { "description": "NotificationSubject contains the notification subject (Issue/Pull/Commit)", @@ -27835,7 +27835,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "NotificationThread": { "description": "NotificationThread expose Notification on API", @@ -27875,7 +27875,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "OAuth2Application": { "type": "object", @@ -27927,7 +27927,7 @@ "x-go-name": "SkipSecondaryAuthorization" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Organization": { "description": "Organization represents an organization", @@ -27996,7 +27996,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "OrganizationPermissions": { "description": "OrganizationPermissions list different users permissions on an organization", @@ -28028,7 +28028,7 @@ "x-go-name": "IsOwner" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "PRBranchInfo": { "description": "PRBranchInfo information about a branch", @@ -28059,7 +28059,7 @@ "x-go-name": "Sha" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Package": { "description": "Package represents a package", @@ -28106,7 +28106,7 @@ "x-go-name": "Version" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "PackageFile": { "description": "PackageFile represents a package file", @@ -28150,7 +28150,7 @@ "x-go-name": "Size" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "PayloadCommit": { "description": "PayloadCommit represents a commit", @@ -28210,7 +28210,7 @@ "$ref": "#/definitions/PayloadCommitVerification" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "PayloadCommitVerification": { "description": "PayloadCommitVerification represents the GPG verification of a commit", @@ -28240,7 +28240,7 @@ "x-go-name": "Verified" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "PayloadUser": { "description": "PayloadUser represents the author or committer of a commit", @@ -28262,7 +28262,7 @@ "x-go-name": "UserName" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Permission": { "description": "Permission represents a set of permissions", @@ -28281,7 +28281,7 @@ "x-go-name": "Push" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Project": { "description": "Project represents a project", @@ -28342,7 +28342,7 @@ "x-go-name": "Updated" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "PublicKey": { "description": "PublicKey publickey is a user key to push code to repository", @@ -28399,7 +28399,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "PullRequest": { "description": "PullRequest represents a pull request", @@ -28610,7 +28610,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "PullRequestMeta": { "description": "PullRequestMeta PR info if an issue is a PR", @@ -28634,7 +28634,7 @@ "x-go-name": "Merged" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "PullReview": { "description": "PullReview represents a pull request review", @@ -28709,7 +28709,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "PullReviewComment": { "description": "PullReviewComment represents a comment on a pull request review", @@ -28780,7 +28780,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "PullReviewRequestOptions": { "description": "PullReviewRequestOptions are options to add or remove pull request review requests", @@ -28801,7 +28801,7 @@ "x-go-name": "TeamReviewers" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "PushMirror": { "description": "PushMirror represents information of a push mirror", @@ -28848,7 +28848,7 @@ "x-go-name": "SyncOnCommit" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Reaction": { "description": "Reaction contain one reaction", @@ -28868,7 +28868,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Reference": { "type": "object", @@ -28888,7 +28888,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Release": { "description": "Release represents a repository release", @@ -28977,7 +28977,7 @@ "x-go-name": "ZipURL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "RenameBranchRepoOption": { "description": "RenameBranchRepoOption options when renaming a branch in a repository", @@ -28993,7 +28993,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "RenameOrgOption": { "description": "RenameOrgOption options when renaming an organization", @@ -29009,7 +29009,7 @@ "x-go-name": "NewName" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "RenameUserOption": { "description": "RenameUserOption options when renaming a user", @@ -29025,7 +29025,7 @@ "x-go-name": "NewName" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "RepoCollaboratorPermission": { "description": "RepoCollaboratorPermission to get repository permission for a collaborator", @@ -29053,7 +29053,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "RepoCommit": { "type": "object", @@ -29082,7 +29082,7 @@ "$ref": "#/definitions/PayloadCommitVerification" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "RepoTopicOptions": { "description": "RepoTopicOptions a collection of repo topic names", @@ -29097,7 +29097,7 @@ "x-go-name": "Topics" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "RepoTransfer": { "description": "RepoTransfer represents a pending repo transfer", @@ -29117,7 +29117,7 @@ "x-go-name": "Teams" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Repository": { "description": "Repository represents a repository", @@ -29423,7 +29423,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "RepositoryMeta": { "description": "RepositoryMeta basic repository information", @@ -29447,7 +29447,7 @@ "x-go-name": "Owner" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "RunDetails": { "description": "RunDetails returns workflow_dispatch runid and url", @@ -29467,7 +29467,7 @@ "x-go-name": "WorkflowRunID" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "SearchResults": { "description": "SearchResults results of a successful search", @@ -29487,7 +29487,7 @@ "x-go-name": "OK" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Secret": { "description": "Secret represents a secret", @@ -29509,7 +29509,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ServerVersion": { "description": "ServerVersion wraps the version of the server", @@ -29521,7 +29521,7 @@ "x-go-name": "Version" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "StopWatch": { "description": "StopWatch represent a running stopwatch", @@ -29565,7 +29565,7 @@ "x-go-name": "Seconds" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "SubmitPullReviewOptions": { "description": "SubmitPullReviewOptions are options to submit a pending pull request review", @@ -29588,7 +29588,7 @@ "x-go-name": "Event" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Tag": { "description": "Tag represents a repository tag", @@ -29623,7 +29623,7 @@ "x-go-name": "ZipballURL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "TagProtection": { "description": "TagProtection represents a tag protection", @@ -29667,7 +29667,7 @@ "x-go-name": "WhitelistUsernames" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Team": { "description": "Team represents a team in an organization", @@ -29749,13 +29749,13 @@ } } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "TimeStamp": { "description": "TimeStamp defines a timestamp", "type": "integer", "format": "int64", - "x-go-package": "code.gitea.io/gitea/modules/timeutil" + "x-go-package": "gitea.dev/modules/timeutil" }, "TimelineComment": { "description": "TimelineComment represents a timeline comment (comment of any type) on a commit or issue", @@ -29881,7 +29881,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "TopicName": { "description": "TopicName a list of repo topic names", @@ -29896,7 +29896,7 @@ "x-go-name": "TopicNames" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "TopicResponse": { "description": "TopicResponse for returning topics", @@ -29932,7 +29932,7 @@ "x-go-name": "Updated" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "TrackedTime": { "description": "TrackedTime worked time for an issue / pr", @@ -29976,7 +29976,7 @@ "x-go-name": "UserName" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "TransferRepoOption": { "description": "TransferRepoOption options when transfer a repository's ownership", @@ -29999,7 +29999,7 @@ "x-go-name": "TeamIDs" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "UpdateBranchProtectionPriories": { "description": "UpdateBranchProtectionPriories a list to update the branch protection rule priorities", @@ -30014,7 +30014,7 @@ "x-go-name": "IDs" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "UpdateBranchRepoOption": { "description": "UpdateBranchRepoOption options when updating a branch reference in a repository", @@ -30039,7 +30039,7 @@ "x-go-name": "OldCommitID" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "UpdateFileOptions": { "description": "UpdateFileOptions options for updating or creating a file\nNote: `author` and `committer` are optional (if only one is given, it will be used for the other, otherwise the authenticated user will be used)", @@ -30098,7 +30098,7 @@ "x-go-name": "Signoff" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "UpdateRepoAvatarOption": { "description": "UpdateRepoAvatarUserOption options when updating the repo avatar", @@ -30110,7 +30110,7 @@ "x-go-name": "Image" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "UpdateUserAvatarOption": { "description": "UpdateUserAvatarUserOption options when updating the user avatar", @@ -30122,7 +30122,7 @@ "x-go-name": "Image" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "UpdateVariableOption": { "description": "UpdateVariableOption the option when updating variable", @@ -30147,7 +30147,7 @@ "x-go-name": "Value" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "User": { "description": "User represents a user", @@ -30274,7 +30274,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "UserBadgeOption": { "description": "UserBadgeOption options for link between users and badges", @@ -30292,7 +30292,7 @@ ] } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "UserHeatmapData": { "description": "UserHeatmapData represents the data needed to create a heatmap", @@ -30307,7 +30307,7 @@ "$ref": "#/definitions/TimeStamp" } }, - "x-go-package": "code.gitea.io/gitea/models/activities" + "x-go-package": "gitea.dev/models/activities" }, "UserSettings": { "description": "UserSettings represents user settings", @@ -30351,7 +30351,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "UserSettingsOptions": { "description": "UserSettingsOptions represents options to change user settings", @@ -30395,7 +30395,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "WatchInfo": { "description": "WatchInfo represents an API watch status of one repository", @@ -30432,7 +30432,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "WikiCommit": { "description": "WikiCommit page commit/revision", @@ -30455,7 +30455,7 @@ "x-go-name": "ID" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "WikiCommitList": { "description": "WikiCommitList commit/revision list", @@ -30476,7 +30476,7 @@ "x-go-name": "Count" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "WikiPage": { "description": "WikiPage a wiki page", @@ -30522,7 +30522,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "WikiPageMetaData": { "description": "WikiPageMetaData wiki page meta information", @@ -30547,7 +30547,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" } }, "responses": { diff --git a/templates/swagger/v1_openapi3_json.tmpl b/templates/swagger/v1_openapi3_json.tmpl index 9dd147f0e5..a1b1a00d93 100644 --- a/templates/swagger/v1_openapi3_json.tmpl +++ b/templates/swagger/v1_openapi3_json.tmpl @@ -1757,7 +1757,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "AccessLevelName": { "enum": [ @@ -1815,7 +1815,7 @@ }, "title": "AccessToken represents an API access token.", "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionArtifact": { "description": "ActionArtifact represents a ActionArtifact", @@ -1868,7 +1868,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionArtifactsResponse": { "description": "ActionArtifactsResponse returns ActionArtifacts", @@ -1887,7 +1887,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionRunner": { "description": "ActionRunner represents a Runner", @@ -1926,7 +1926,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionRunnerLabel": { "description": "ActionRunnerLabel represents a Runner Label", @@ -1946,7 +1946,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionRunnersResponse": { "description": "ActionRunnersResponse returns Runners", @@ -1965,7 +1965,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionTask": { "description": "ActionTask represents a ActionTask", @@ -2040,7 +2040,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionTaskResponse": { "description": "ActionTaskResponse returns a ActionTask", @@ -2061,7 +2061,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionVariable": { "description": "ActionVariable return value of the query API", @@ -2095,7 +2095,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionWorkflow": { "description": "ActionWorkflow represents a ActionWorkflow", @@ -2155,7 +2155,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionWorkflowJob": { "description": "ActionWorkflowJob represents a WorkflowJob", @@ -2250,7 +2250,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionWorkflowJobsResponse": { "description": "ActionWorkflowJobsResponse returns ActionWorkflowJobs", @@ -2269,7 +2269,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionWorkflowResponse": { "description": "ActionWorkflowResponse returns a ActionWorkflow", @@ -2288,7 +2288,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionWorkflowRun": { "description": "ActionWorkflowRun represents a WorkflowRun", @@ -2382,7 +2382,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionWorkflowRunsResponse": { "description": "ActionWorkflowRunsResponse returns ActionWorkflowRuns", @@ -2401,7 +2401,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ActionWorkflowStep": { "description": "ActionWorkflowStep represents a step of a WorkflowJob", @@ -2435,7 +2435,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Activity": { "properties": { @@ -2535,7 +2535,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "AddCollaboratorOption": { "description": "AddCollaboratorOption options when adding a user as a collaborator of a repository", @@ -2550,7 +2550,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "AddTimeOption": { "description": "AddTimeOption options for adding time to an issue", @@ -2576,7 +2576,7 @@ "time" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "AnnotatedTag": { "description": "AnnotatedTag represents an annotated tag", @@ -2613,7 +2613,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "AnnotatedTagObject": { "description": "AnnotatedTagObject contains meta information of the tag object", @@ -2636,7 +2636,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ApplyDiffPatchFileOptions": { "description": "ApplyDiffPatchFileOptions options for applying a diff patch\nNote: `author` and `committer` are optional (if only one is given, it will be used for the other, otherwise the authenticated user will be used)", @@ -2684,7 +2684,7 @@ "content" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Attachment": { "description": "Attachment a generic attachment", @@ -2730,7 +2730,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Badge": { "description": "Badge represents a user badge", @@ -2755,7 +2755,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Branch": { "description": "Branch represents a repository branch", @@ -2809,7 +2809,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "BranchProtection": { "description": "BranchProtection represents a branch protection for a repository", @@ -3001,7 +3001,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ChangeFileOperation": { "description": "ChangeFileOperation for creating, updating or deleting a file", @@ -3044,7 +3044,7 @@ "path" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ChangeFilesOptions": { "description": "ChangeFilesOptions options for creating, updating or deleting multiple files\nNote: `author` and `committer` are optional (if only one is given, it will be used for the other, otherwise the authenticated user will be used)", @@ -3096,7 +3096,7 @@ "files" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ChangedFile": { "description": "ChangedFile store information about files affected by the pull request", @@ -3154,7 +3154,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CombinedStatus": { "description": "CombinedStatus holds the combined state of several statuses for a single commit", @@ -3203,7 +3203,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Comment": { "description": "Comment represents a comment on a commit or issue", @@ -3271,7 +3271,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Commit": { "properties": { @@ -3328,7 +3328,7 @@ }, "title": "Commit contains information generated from a Git commit.", "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CommitAffectedFiles": { "description": "CommitAffectedFiles store information about files affected by the commit", @@ -3345,7 +3345,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CommitDateOptions": { "description": "CommitDateOptions store dates for GIT_AUTHOR_DATE and GIT_COMMITTER_DATE", @@ -3362,7 +3362,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CommitMeta": { "properties": { @@ -3385,7 +3385,7 @@ }, "title": "CommitMeta contains meta information of a commit in terms of API.", "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CommitStats": { "description": "CommitStats is statistics for a RepoCommit", @@ -3410,7 +3410,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CommitStatus": { "description": "CommitStatus holds a single status of a single Commit", @@ -3466,7 +3466,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CommitStatusState": { "enum": [ @@ -3499,7 +3499,7 @@ }, "title": "CommitUser contains information of a user in the context of a commit.", "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Compare": { "properties": { @@ -3518,7 +3518,7 @@ }, "title": "Compare represents a comparison between two commits.", "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ContentsExtResponse": { "properties": { @@ -3535,7 +3535,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ContentsResponse": { "description": "ContentsResponse contains information about a repo's entry's (dir, file, symlink, submodule) metadata and content", @@ -3647,7 +3647,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateAccessTokenOption": { "description": "CreateAccessTokenOption options when create access token", @@ -3679,7 +3679,7 @@ "name" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateActionWorkflowDispatch": { "description": "CreateActionWorkflowDispatch represents the payload for triggering a workflow dispatch event", @@ -3701,7 +3701,7 @@ "ref" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateBranchProtectionOption": { "description": "CreateBranchProtectionOption options for creating a branch protection", @@ -3881,7 +3881,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateBranchRepoOption": { "description": "CreateBranchRepoOption options when creating a branch in a repository", @@ -3910,7 +3910,7 @@ "new_branch_name" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateEmailOption": { "description": "CreateEmailOption options when creating email addresses", @@ -3925,7 +3925,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateFileOptions": { "description": "CreateFileOptions options for creating a file\nNote: `author` and `committer` are optional (if only one is given, it will be used for the other, otherwise the authenticated user will be used)", @@ -3974,7 +3974,7 @@ "content" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateForkOption": { "description": "CreateForkOption options for creating a fork", @@ -3991,7 +3991,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateGPGKeyOption": { "description": "CreateGPGKeyOption options create user GPG key", @@ -4012,7 +4012,7 @@ "armored_public_key" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateHookOption": { "description": "CreateHookOption options when create a hook", @@ -4070,7 +4070,7 @@ "config" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateHookOptionConfig": { "additionalProperties": { @@ -4078,7 +4078,7 @@ }, "description": "CreateHookOptionConfig has all config options in it\nrequired are \"content_type\" and \"url\" Required", "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateIssueCommentOption": { "description": "CreateIssueCommentOption options for creating a comment on an issue", @@ -4092,7 +4092,7 @@ "body" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateIssueOption": { "description": "CreateIssueOption options to create one issue", @@ -4160,7 +4160,7 @@ "title" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateKeyOption": { "description": "CreateKeyOption options when creating a key", @@ -4188,7 +4188,7 @@ "key" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateLabelOption": { "description": "CreateLabelOption options for creating a label", @@ -4223,7 +4223,7 @@ "color" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateMilestoneOption": { "description": "CreateMilestoneOption options for creating a milestone", @@ -4248,7 +4248,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateOAuth2ApplicationOptions": { "description": "CreateOAuth2ApplicationOptions holds options to create an oauth2 application", @@ -4278,7 +4278,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateOrUpdateSecretOption": { "description": "CreateOrUpdateSecretOption options when creating or updating secret", @@ -4298,7 +4298,7 @@ "data" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateOrgOption": { "description": "CreateOrgOption options for creating an organization", @@ -4351,7 +4351,7 @@ "username" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreatePullRequestOption": { "description": "CreatePullRequestOption options when creating a pull request", @@ -4432,7 +4432,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreatePullReviewComment": { "description": "CreatePullReviewComment represent a review comment for creation api", @@ -4460,7 +4460,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreatePullReviewCommentReplyOptions": { "description": "CreatePullReviewCommentReplyOptions are options to reply to a pull request review comment", @@ -4471,7 +4471,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreatePullReviewOptions": { "description": "CreatePullReviewOptions are options to create a pull request review", @@ -4496,7 +4496,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreatePushMirrorOption": { "properties": { @@ -4528,7 +4528,7 @@ }, "title": "CreatePushMirrorOption represents need information to create a push mirror of a repository.", "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateReleaseOption": { "description": "CreateReleaseOption options when creating a release", @@ -4572,7 +4572,7 @@ "tag_name" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateRepoOption": { "description": "CreateRepoOption options when creating repository", @@ -4652,7 +4652,7 @@ "name" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateStatusOption": { "description": "CreateStatusOption holds the information needed to create a new CommitStatus for a Commit", @@ -4683,7 +4683,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateTagOption": { "description": "CreateTagOption options when creating a tag", @@ -4707,7 +4707,7 @@ "tag_name" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateTagProtectionOption": { "description": "CreateTagProtectionOption options for creating a tag protection", @@ -4735,7 +4735,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateTeamOption": { "description": "CreateTeamOption options for creating a team", @@ -4794,7 +4794,7 @@ "name" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateUserOption": { "description": "CreateUserOption create user options", @@ -4866,7 +4866,7 @@ "email" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateVariableOption": { "description": "CreateVariableOption the option when creating variable", @@ -4886,7 +4886,7 @@ "value" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "CreateWikiPageOptions": { "description": "CreateWikiPageOptions form for creating wiki", @@ -4908,7 +4908,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Cron": { "description": "Cron represents a Cron task", @@ -4943,7 +4943,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "DeleteEmailOption": { "description": "DeleteEmailOption options when deleting email addresses", @@ -4958,7 +4958,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "DeleteFileOptions": { "description": "DeleteFileOptions options for deleting a file\nNote: `author` and `committer` are optional (if only one is given, it will be used for the other, otherwise the authenticated user will be used)", @@ -5007,7 +5007,7 @@ "sha" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "DeployKey": { "description": "DeployKey a deploy key", @@ -5060,7 +5060,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "DismissPullReviewOptions": { "description": "DismissPullReviewOptions are options to dismiss a pull request review", @@ -5075,7 +5075,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditActionRunnerOption": { "properties": { @@ -5089,7 +5089,7 @@ ], "title": "EditActionRunnerOption represents the editable fields for a runner.", "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditAttachmentOptions": { "description": "EditAttachmentOptions options for editing attachments", @@ -5101,7 +5101,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditBranchProtectionOption": { "description": "EditBranchProtectionOption options for editing a branch protection", @@ -5271,7 +5271,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditDeadlineOption": { "description": "EditDeadlineOption options for creating a deadline", @@ -5286,7 +5286,7 @@ "due_date" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditGitHookOption": { "description": "EditGitHookOption options when modifying one Git hook", @@ -5298,7 +5298,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditHookOption": { "description": "EditHookOption options when modify one hook", @@ -5341,7 +5341,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditIssueCommentOption": { "description": "EditIssueCommentOption options for editing a comment", @@ -5355,7 +5355,7 @@ "body" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditIssueOption": { "description": "EditIssueOption options for editing an issue", @@ -5420,7 +5420,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditLabelOption": { "description": "EditLabelOption options for editing a label", @@ -5452,7 +5452,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditMilestoneOption": { "description": "EditMilestoneOption options for editing a milestone", @@ -5483,7 +5483,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditOrgOption": { "description": "EditOrgOption options for editing an organization", @@ -5528,7 +5528,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditPullRequestOption": { "description": "EditPullRequestOption options when modify pull request", @@ -5604,7 +5604,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditReactionOption": { "description": "EditReactionOption contain the reaction type", @@ -5616,7 +5616,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditReleaseOption": { "description": "EditReleaseOption options when editing a release", @@ -5653,7 +5653,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditRepoOption": { "description": "EditRepoOption options when editing a repository's properties", @@ -5845,7 +5845,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditTagProtectionOption": { "description": "EditTagProtectionOption options for editing a tag protection", @@ -5873,7 +5873,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditTeamOption": { "description": "EditTeamOption options for editing a team", @@ -5939,7 +5939,7 @@ "name" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "EditUserOption": { "description": "EditUserOption edit user options", @@ -6045,7 +6045,7 @@ "login_name" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Email": { "description": "Email an email address belonging to a user", @@ -6078,7 +6078,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ExternalTracker": { "description": "ExternalTracker represents settings for external tracker", @@ -6106,7 +6106,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ExternalWiki": { "description": "ExternalWiki represents setting for external wiki", @@ -6119,7 +6119,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "FileCommitResponse": { "properties": { @@ -6170,7 +6170,7 @@ }, "title": "FileCommitResponse contains information generated from a Git commit for a repo's file.", "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "FileDeleteResponse": { "description": "FileDeleteResponse contains information about a repo's file that was deleted", @@ -6187,7 +6187,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "FileLinksResponse": { "description": "FileLinksResponse contains the links for a repo's file", @@ -6209,7 +6209,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "FileResponse": { "description": "FileResponse contains information about a repo's file", @@ -6225,7 +6225,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "FilesResponse": { "description": "FilesResponse contains information about multiple files from a repo", @@ -6246,7 +6246,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "GPGKey": { "description": "GPGKey a user GPG key to sign commit and tag in repository", @@ -6325,7 +6325,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "GPGKeyEmail": { "description": "GPGKeyEmail an email attached to a GPGKey", @@ -6342,7 +6342,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "GeneralAPISettings": { "description": "GeneralAPISettings contains global api settings exposed by it", @@ -6379,7 +6379,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "GeneralAttachmentSettings": { "description": "GeneralAttachmentSettings contains global Attachment settings exposed by API", @@ -6408,7 +6408,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "GeneralRepoSettings": { "description": "GeneralRepoSettings contains global repository settings exposed by API", @@ -6445,7 +6445,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "GeneralUISettings": { "description": "GeneralUISettings contains global ui settings exposed by API", @@ -6473,7 +6473,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "GenerateRepoOption": { "description": "GenerateRepoOption options when creating a repository using a template", @@ -6544,7 +6544,7 @@ "name" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "GetFilesOptions": { "description": "GetFilesOptions options for retrieving metadate and content of multiple files", @@ -6559,7 +6559,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "GitBlobResponse": { "description": "GitBlobResponse represents a git blob", @@ -6604,7 +6604,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "GitEntry": { "description": "GitEntry represents a git tree", @@ -6643,7 +6643,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "GitHook": { "description": "GitHook represents a Git repository hook", @@ -6665,7 +6665,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "GitObject": { "properties": { @@ -6688,7 +6688,7 @@ }, "title": "GitObject represents a Git object.", "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "GitTreeResponse": { "description": "GitTreeResponse returns a git tree", @@ -6731,7 +6731,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "GitignoreTemplateInfo": { "description": "GitignoreTemplateInfo name and text of a gitignore template", @@ -6748,7 +6748,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Hook": { "description": "Hook a hook is a web hook when one repository changed", @@ -6812,7 +6812,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Identity": { "description": "Identity for a person's identity like an author or committer", @@ -6829,7 +6829,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "InternalTracker": { "description": "InternalTracker represents settings for internal tracker", @@ -6851,7 +6851,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Issue": { "description": "Issue represents an issue in a repository", @@ -6990,7 +6990,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "IssueConfig": { "properties": { @@ -7007,7 +7007,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "IssueConfigContactLink": { "properties": { @@ -7026,7 +7026,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "IssueConfigValidation": { "properties": { @@ -7040,7 +7040,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "IssueDeadline": { "description": "IssueDeadline represents an issue deadline", @@ -7052,7 +7052,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "IssueFormField": { "description": "IssueFormField represents a form field", @@ -7097,7 +7097,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "IssueLabelsOption": { "description": "IssueLabelsOption a collection of labels", @@ -7110,7 +7110,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "IssueMeta": { "description": "IssueMeta basic issue information", @@ -7131,7 +7131,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "IssueTemplate": { "description": "IssueTemplate represents an issue template for a repository", @@ -7175,14 +7175,14 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "IssueTemplateStringSlice": { "items": { "type": "string" }, "type": "array", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Label": { "description": "Label a label to an issue or a pr", @@ -7226,7 +7226,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "LabelTemplate": { "description": "LabelTemplate info of a Label template", @@ -7253,7 +7253,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "LicenseTemplateInfo": { "description": "LicensesInfo contains information about a License", @@ -7286,7 +7286,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "LicensesTemplateListEntry": { "description": "LicensesListEntry is used for the API", @@ -7309,7 +7309,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "LockIssueOption": { "description": "LockIssueOption options to lock an issue", @@ -7320,7 +7320,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "MarkdownOption": { "description": "MarkdownOption markdown options", @@ -7344,7 +7344,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "MarkupOption": { "description": "MarkupOption markup options", @@ -7372,7 +7372,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "MergePullRequestOption": { "description": "MergePullRequestForm form for merging Pull Request", @@ -7423,7 +7423,7 @@ ], "type": "object", "x-go-name": "MergePullRequestForm", - "x-go-package": "code.gitea.io/gitea/services/forms" + "x-go-package": "gitea.dev/services/forms" }, "MergeUpstreamRequest": { "properties": { @@ -7437,7 +7437,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "MergeUpstreamResponse": { "properties": { @@ -7447,7 +7447,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "MigrateRepoOptions": { "description": "MigrateRepoOptions options for migrating repository's\nthis is used to interact with api v1", @@ -7561,7 +7561,7 @@ "repo_name" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Milestone": { "description": "Milestone milestone is a collection of issues on one repository", @@ -7624,7 +7624,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "NewIssuePinsAllowed": { "description": "NewIssuePinsAllowed represents an API response that says if new Issue Pins are allowed", @@ -7639,7 +7639,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "NodeInfo": { "description": "NodeInfo contains standardized way of exposing metadata about a server running one of the distributed social networks", @@ -7678,7 +7678,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "NodeInfoServices": { "description": "NodeInfoServices contains the third party sites this server can connect to via their application API", @@ -7701,7 +7701,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "NodeInfoSoftware": { "description": "NodeInfoSoftware contains Metadata about server software in use", @@ -7728,7 +7728,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "NodeInfoUsage": { "description": "NodeInfoUsage contains usage statistics for this server", @@ -7750,7 +7750,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "NodeInfoUsageUsers": { "description": "NodeInfoUsageUsers contains statistics about the users of this server", @@ -7775,7 +7775,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Note": { "description": "Note contains information related to a git note", @@ -7790,7 +7790,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "NotificationCount": { "description": "NotificationCount number of unread notifications", @@ -7803,7 +7803,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "NotificationSubject": { "description": "NotificationSubject contains the notification subject (Issue/Pull/Commit)", @@ -7862,7 +7862,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "NotificationThread": { "description": "NotificationThread expose Notification on API", @@ -7903,7 +7903,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "OAuth2Application": { "properties": { @@ -7955,7 +7955,7 @@ }, "title": "OAuth2Application represents an OAuth2 application.", "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ObjectFormatName": { "enum": [ @@ -8030,7 +8030,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "OrganizationPermissions": { "description": "OrganizationPermissions list different users permissions on an organization", @@ -8062,7 +8062,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "PRBranchInfo": { "description": "PRBranchInfo information about a branch", @@ -8093,7 +8093,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Package": { "description": "Package represents a package", @@ -8141,7 +8141,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "PackageFile": { "description": "PackageFile represents a package file", @@ -8185,7 +8185,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "PayloadCommit": { "description": "PayloadCommit represents a commit", @@ -8246,7 +8246,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "PayloadCommitVerification": { "description": "PayloadCommitVerification represents the GPG verification of a commit", @@ -8276,7 +8276,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "PayloadUser": { "description": "PayloadUser represents the author or committer of a commit", @@ -8298,7 +8298,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Permission": { "description": "Permission represents a set of permissions", @@ -8317,7 +8317,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Project": { "description": "Project represents a project", @@ -8378,7 +8378,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "PublicKey": { "description": "PublicKey publickey is a user key to push code to repository", @@ -8436,7 +8436,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "PullRequest": { "description": "PullRequest represents a pull request", @@ -8649,7 +8649,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "PullRequestMeta": { "description": "PullRequestMeta PR info if an issue is a PR", @@ -8674,7 +8674,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "PullReview": { "description": "PullReview represents a pull request review", @@ -8742,7 +8742,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "PullReviewComment": { "description": "PullReviewComment represents a comment on a pull request review", @@ -8815,7 +8815,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "PullReviewRequestOptions": { "description": "PullReviewRequestOptions are options to add or remove pull request review requests", @@ -8836,7 +8836,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "PushMirror": { "description": "PushMirror represents information of a push mirror", @@ -8883,7 +8883,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Reaction": { "description": "Reaction contain one reaction", @@ -8903,7 +8903,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Reference": { "properties": { @@ -8924,7 +8924,7 @@ }, "title": "Reference represents a Git reference.", "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Release": { "description": "Release represents a repository release", @@ -9018,7 +9018,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "RenameBranchRepoOption": { "description": "RenameBranchRepoOption options when renaming a branch in a repository", @@ -9034,7 +9034,7 @@ "name" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "RenameOrgOption": { "description": "RenameOrgOption options when renaming an organization", @@ -9050,7 +9050,7 @@ "new_name" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "RenameUserOption": { "description": "RenameUserOption options when renaming a user", @@ -9066,7 +9066,7 @@ "new_username" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "RepoCollaboratorPermission": { "description": "RepoCollaboratorPermission to get repository permission for a collaborator", @@ -9089,7 +9089,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "RepoCommit": { "properties": { @@ -9119,7 +9119,7 @@ }, "title": "RepoCommit contains information of a commit in the context of a repository.", "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "RepoTopicOptions": { "description": "RepoTopicOptions a collection of repo topic names", @@ -9134,7 +9134,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "RepoTransfer": { "description": "RepoTransfer represents a pending repo transfer", @@ -9154,7 +9154,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "RepoWritePermission": { "enum": [ @@ -9473,7 +9473,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "RepositoryMeta": { "description": "RepositoryMeta basic repository information", @@ -9497,7 +9497,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ReviewStateType": { "enum": [ @@ -9529,7 +9529,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "SearchResults": { "description": "SearchResults results of a successful search", @@ -9549,7 +9549,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Secret": { "description": "Secret represents a secret", @@ -9571,7 +9571,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "ServerVersion": { "description": "ServerVersion wraps the version of the server", @@ -9583,7 +9583,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "StateType": { "enum": [ @@ -9634,7 +9634,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "SubmitPullReviewOptions": { "description": "SubmitPullReviewOptions are options to submit a pending pull request review", @@ -9648,7 +9648,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Tag": { "description": "Tag represents a repository tag", @@ -9685,7 +9685,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "TagProtection": { "description": "TagProtection represents a tag protection", @@ -9729,7 +9729,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "Team": { "description": "Team represents a team in an organization", @@ -9802,13 +9802,13 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "TimeStamp": { "description": "TimeStamp defines a timestamp", "format": "int64", "type": "integer", - "x-go-package": "code.gitea.io/gitea/modules/timeutil" + "x-go-package": "gitea.dev/modules/timeutil" }, "TimelineComment": { "description": "TimelineComment represents a timeline comment (comment of any type) on a commit or issue", @@ -9937,7 +9937,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "TopicName": { "description": "TopicName a list of repo topic names", @@ -9952,7 +9952,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "TopicResponse": { "description": "TopicResponse for returning topics", @@ -9988,7 +9988,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "TrackedTime": { "description": "TrackedTime worked time for an issue / pr", @@ -10034,7 +10034,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "TransferRepoOption": { "description": "TransferRepoOption options when transfer a repository's ownership", @@ -10057,7 +10057,7 @@ "new_owner" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "UpdateBranchProtectionPriories": { "description": "UpdateBranchProtectionPriories a list to update the branch protection rule priorities", @@ -10072,7 +10072,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "UpdateBranchRepoOption": { "description": "UpdateBranchRepoOption options when updating a branch reference in a repository", @@ -10097,7 +10097,7 @@ "new_commit_id" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "UpdateFileOptions": { "description": "UpdateFileOptions options for updating or creating a file\nNote: `author` and `committer` are optional (if only one is given, it will be used for the other, otherwise the authenticated user will be used)", @@ -10156,7 +10156,7 @@ "content" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "UpdateRepoAvatarOption": { "description": "UpdateRepoAvatarUserOption options when updating the repo avatar", @@ -10168,7 +10168,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "UpdateUserAvatarOption": { "description": "UpdateUserAvatarUserOption options when updating the user avatar", @@ -10180,7 +10180,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "UpdateVariableOption": { "description": "UpdateVariableOption the option when updating variable", @@ -10205,7 +10205,7 @@ "value" ], "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "User": { "description": "User represents a user", @@ -10331,7 +10331,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "UserBadgeOption": { "description": "UserBadgeOption options for link between users and badges", @@ -10349,7 +10349,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "UserHeatmapData": { "description": "UserHeatmapData represents the data needed to create a heatmap", @@ -10364,7 +10364,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/models/activities" + "x-go-package": "gitea.dev/models/activities" }, "UserSettings": { "description": "UserSettings represents user settings", @@ -10408,7 +10408,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "UserSettingsOptions": { "description": "UserSettingsOptions represents options to change user settings", @@ -10452,7 +10452,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "UserVisibility": { "enum": [ @@ -10499,7 +10499,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "WikiCommit": { "description": "WikiCommit page commit/revision", @@ -10522,7 +10522,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "WikiCommitList": { "description": "WikiCommitList commit/revision list", @@ -10543,7 +10543,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "WikiPage": { "description": "WikiPage a wiki page", @@ -10591,7 +10591,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" }, "WikiPageMetaData": { "description": "WikiPageMetaData wiki page meta information", @@ -10618,7 +10618,7 @@ } }, "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "gitea.dev/modules/structs" } }, "securitySchemes": { diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl index e2bc72ca5f..aa63439275 100644 --- a/templates/user/settings/navbar.tmpl +++ b/templates/user/settings/navbar.tmpl @@ -34,7 +34,7 @@ {{end}} {{if .EnableActions}} -
+
{{ctx.Locale.Tr "actions.actions"}}
diff --git a/tests/e2e/issue-comment.test.ts b/tests/e2e/issue-comment.test.ts index d3de59ba5f..414e0567ce 100644 --- a/tests/e2e/issue-comment.test.ts +++ b/tests/e2e/issue-comment.test.ts @@ -18,7 +18,9 @@ test('comment on and close an issue', async ({page, request}) => { await page.getByRole('button', {name: 'Comment', exact: true}).click(); await expect(page.locator('.comment-body').filter({hasText: body})).toBeVisible(); - // posting reloaded the page with an empty box, so the status button now reads "Close Issue" + // wait for the form to re-initialize (the empty box disables the comment button); a close click + // before that does a native submit which lands on a raw JSON page instead of reloading the issue + await expect(page.getByRole('button', {name: 'Comment', exact: true})).toBeDisabled(); await page.getByRole('button', {name: 'Close Issue'}).click(); await expect(page.getByRole('button', {name: 'Reopen Issue'})).toBeVisible(); }); diff --git a/tests/e2e/licenses.test.ts b/tests/e2e/licenses.test.ts index b347ad95e2..30db43c467 100644 --- a/tests/e2e/licenses.test.ts +++ b/tests/e2e/licenses.test.ts @@ -5,5 +5,5 @@ test('licenses.txt', async ({page}) => { expect(resp?.status()).toBe(200); const content = await resp!.text(); expect(content).toContain('@vue/'); - expect(content).toContain('code.gitea.io/'); + expect(content).toContain('gitea.dev/'); }); diff --git a/tests/fuzz/fuzz_test.go b/tests/fuzz/fuzz_test.go index e7b832412a..7179779636 100644 --- a/tests/fuzz/fuzz_test.go +++ b/tests/fuzz/fuzz_test.go @@ -8,9 +8,9 @@ import ( "io" "testing" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" + "gitea.dev/modules/markup" + "gitea.dev/modules/markup/markdown" + "gitea.dev/modules/setting" ) func newFuzzRenderContext() *markup.RenderContext { diff --git a/tests/gitea-repositories-meta/user2/commits_search_test.git/config b/tests/gitea-repositories-meta/user2/commits_search_test.git/config index bfbada5989..6fc27333b1 100644 --- a/tests/gitea-repositories-meta/user2/commits_search_test.git/config +++ b/tests/gitea-repositories-meta/user2/commits_search_test.git/config @@ -3,6 +3,6 @@ filemode = true bare = true [remote "origin"] - url = /home/mura/go/src/code.gitea.io/gitea/tests/gitea-repositories-meta/user2/commits_search_test/ + url = /home/mura/go/src/gitea.dev/tests/gitea-repositories-meta/user2/commits_search_test/ fetch = +refs/*:refs/* mirror = true diff --git a/tests/integration/actions_approve_test.go b/tests/integration/actions_approve_test.go index 1964ff44d5..3c9f7a341c 100644 --- a/tests/integration/actions_approve_test.go +++ b/tests/integration/actions_approve_test.go @@ -11,12 +11,12 @@ import ( "testing" "time" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + actions_model "gitea.dev/models/actions" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/actions_concurrency_test.go b/tests/integration/actions_concurrency_test.go index ce90256ed2..47b9112534 100644 --- a/tests/integration/actions_concurrency_test.go +++ b/tests/integration/actions_concurrency_test.go @@ -11,20 +11,20 @@ import ( "testing" "time" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - webhook_module "code.gitea.io/gitea/modules/webhook" - actions_web "code.gitea.io/gitea/routers/web/repo/actions" - actions_service "code.gitea.io/gitea/services/actions" + runnerv1 "gitea.dev/actions-proto-go/runner/v1" + actions_model "gitea.dev/models/actions" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/timeutil" + webhook_module "gitea.dev/modules/webhook" + actions_web "gitea.dev/routers/web/repo/actions" + actions_service "gitea.dev/services/actions" - runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/tests/integration/actions_delete_run_test.go b/tests/integration/actions_delete_run_test.go index 096921faac..dc8f67d70e 100644 --- a/tests/integration/actions_delete_run_test.go +++ b/tests/integration/actions_delete_run_test.go @@ -11,14 +11,14 @@ import ( "testing" "time" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/routers/web/repo/actions" + runnerv1 "gitea.dev/actions-proto-go/runner/v1" + actions_model "gitea.dev/models/actions" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/json" + "gitea.dev/routers/web/repo/actions" - runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "github.com/stretchr/testify/assert" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/tests/integration/actions_inputs_test.go b/tests/integration/actions_inputs_test.go index 9e29be3432..52f214a1c7 100644 --- a/tests/integration/actions_inputs_test.go +++ b/tests/integration/actions_inputs_test.go @@ -9,11 +9,11 @@ import ( "net/url" "testing" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + actions_model "gitea.dev/models/actions" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/actions_job_test.go b/tests/integration/actions_job_test.go index 3e1fd50eb5..b472d9b8e1 100644 --- a/tests/integration/actions_job_test.go +++ b/tests/integration/actions_job_test.go @@ -13,20 +13,20 @@ import ( "testing" "time" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - actions_service "code.gitea.io/gitea/services/actions" + runnerv1 "gitea.dev/actions-proto-go/runner/v1" + actions_model "gitea.dev/models/actions" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/git" + "gitea.dev/modules/json" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/timeutil" + actions_service "gitea.dev/services/actions" - runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "connectrpc.com/connect" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/actions_job_token_test.go b/tests/integration/actions_job_token_test.go index 421dec17d9..e85201e829 100644 --- a/tests/integration/actions_job_token_test.go +++ b/tests/integration/actions_job_token_test.go @@ -12,19 +12,19 @@ import ( "strconv" "testing" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - org_model "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + actions_model "gitea.dev/models/actions" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + org_model "gitea.dev/models/organization" + "gitea.dev/models/perm" + repo_model "gitea.dev/models/repo" + unit_model "gitea.dev/models/unit" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/lfs" + "gitea.dev/modules/structs" + "gitea.dev/modules/util" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/actions_list_filter_test.go b/tests/integration/actions_list_filter_test.go new file mode 100644 index 0000000000..6502036362 --- /dev/null +++ b/tests/integration/actions_list_filter_test.go @@ -0,0 +1,68 @@ +// Copyright 2026 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package integration + +import ( + "fmt" + "net/http" + "net/url" + "strings" + "testing" + + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/tests" + + "github.com/PuerkitoBio/goquery" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestActionsListFilters(t *testing.T) { + defer tests.PrepareTestEnv(t)() + + user5 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 5}) + repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 4}) + session := loginUser(t, user5.Name) + actionsURL := fmt.Sprintf("/%s/%s/actions", user5.Name, repo.Name) + + t.Run("BranchDropdownListsBranches", func(t *testing.T) { + req := NewRequest(t, "GET", actionsURL) + resp := session.MakeRequest(t, req, http.StatusOK) + htmlDoc := NewHTMLParser(t, resp.Body) + + var labels []string + htmlDoc.doc.Find(`[data-test-id="filter-branch"] .menu a.item`).Each(func(_ int, a *goquery.Selection) { + labels = append(labels, strings.TrimSpace(a.Text())) + }) + assert.Contains(t, labels, "master") + }) + + t.Run("FilterByBranch", func(t *testing.T) { + req := NewRequest(t, "GET", actionsURL+"?branch=master") + resp := session.MakeRequest(t, req, http.StatusOK) + htmlDoc := NewHTMLParser(t, resp.Body) + + refs := htmlDoc.doc.Find(".run-list .run-list-ref") + assert.Positive(t, refs.Length(), "filtered run list should not be empty") + refs.Each(func(_ int, sel *goquery.Selection) { + assert.Equal(t, "master", strings.TrimSpace(sel.Text())) + }) + }) + + t.Run("PaginationPreservesFilters", func(t *testing.T) { + req := NewRequest(t, "GET", actionsURL+"?branch=master&limit=1") + resp := session.MakeRequest(t, req, http.StatusOK) + htmlDoc := NewHTMLParser(t, resp.Body) + + pageLinks := htmlDoc.doc.Find(".pagination a[href]") + assert.Positive(t, pageLinks.Length(), "pagination should be rendered") + pageLinks.Each(func(_ int, a *goquery.Selection) { + u, err := url.Parse(a.AttrOr("href", "")) + require.NoError(t, err) + assert.Equal(t, "master", u.Query().Get("branch"), "pagination link must preserve branch filter") + }) + }) +} diff --git a/tests/integration/actions_log_finalize_test.go b/tests/integration/actions_log_finalize_test.go index 5f6e2a0efc..134f96bda7 100644 --- a/tests/integration/actions_log_finalize_test.go +++ b/tests/integration/actions_log_finalize_test.go @@ -9,16 +9,16 @@ import ( "os" "testing" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/dbfs" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - actions_module "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/storage" + runnerv1 "gitea.dev/actions-proto-go/runner/v1" + actions_model "gitea.dev/models/actions" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/dbfs" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + actions_module "gitea.dev/modules/actions" + "gitea.dev/modules/storage" - runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "connectrpc.com/connect" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -73,5 +73,19 @@ jobs: _, err = dbfs.Open(t.Context(), actions_module.DBFSPrefix+freshTask.LogFilename) assert.ErrorIs(t, err, os.ErrNotExist, "DBFS row must be cleaned up after TransferLogs") + + // The runner re-sends its final UpdateLog when the response was lost. + // A sealed log must ack the re-send and still reject new appended rows. + t.Run("re-sent finalize is idempotent", func(t *testing.T) { + finalize := &runnerv1.UpdateLogRequest{TaskId: task.Id, Index: 0, Rows: nil, NoMore: true} + resp, err := runner.client.runnerServiceClient.UpdateLog(t.Context(), connect.NewRequest(finalize)) + require.NoError(t, err) + assert.EqualValues(t, 0, resp.Msg.AckIndex) + + _, err = runner.client.runnerServiceClient.UpdateLog(t.Context(), connect.NewRequest(&runnerv1.UpdateLogRequest{ + TaskId: task.Id, Index: 0, Rows: []*runnerv1.LogRow{{Content: "late"}}, NoMore: true, + })) + require.Error(t, err, "appending rows past the seal must be rejected") + }) }) } diff --git a/tests/integration/actions_log_test.go b/tests/integration/actions_log_test.go index 4a48f865bc..a8cbc13058 100644 --- a/tests/integration/actions_log_test.go +++ b/tests/integration/actions_log_test.go @@ -11,16 +11,16 @@ import ( "testing" "time" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/test" + runnerv1 "gitea.dev/actions-proto-go/runner/v1" + actions_model "gitea.dev/models/actions" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + "gitea.dev/modules/storage" + "gitea.dev/modules/test" - runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "github.com/stretchr/testify/assert" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/tests/integration/actions_rerun_test.go b/tests/integration/actions_rerun_test.go index 24c2d726eb..b088a2379a 100644 --- a/tests/integration/actions_rerun_test.go +++ b/tests/integration/actions_rerun_test.go @@ -11,20 +11,20 @@ import ( "testing" "time" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/actions/jobparser" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/timeutil" - actions_web "code.gitea.io/gitea/routers/web/repo/actions" + runnerv1 "gitea.dev/actions-proto-go/runner/v1" + actions_model "gitea.dev/models/actions" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/actions/jobparser" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/modules/timeutil" + actions_web "gitea.dev/routers/web/repo/actions" - runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/tests/integration/actions_reusable_workflow_test.go b/tests/integration/actions_reusable_workflow_test.go new file mode 100644 index 0000000000..39e14b6d7d --- /dev/null +++ b/tests/integration/actions_reusable_workflow_test.go @@ -0,0 +1,782 @@ +// Copyright 2026 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package integration + +import ( + "encoding/base64" + "fmt" + "net/http" + "net/url" + "testing" + "time" + + runnerv1 "gitea.dev/actions-proto-go/runner/v1" + actions_model "gitea.dev/models/actions" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/gitrepo" + "gitea.dev/modules/json" + api "gitea.dev/modules/structs" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestActionsReusableWorkflow(t *testing.T) { + onGiteaRun(t, func(t *testing.T, u *url.URL) { + user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) + user2Session := loginUser(t, user2.Name) + user2Token := getTokenForLoggedInUser(t, user2Session, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) + user4 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4}) + user4Session := loginUser(t, user4.Name) + user4Token := getTokenForLoggedInUser(t, user4Session, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) + + t.Run("Same-repo reusable workflow", func(t *testing.T) { + apiRepo := createActionsTestRepo(t, user2Token, "workflow-call-test", false) + repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: apiRepo.ID}) + + defaultRunner := newMockRunner() + defaultRunner.registerAsRepoRunner(t, repo.OwnerName, repo.Name, "mock-default-runner", []string{"ubuntu-latest"}, false) + customRunner := newMockRunner() + customRunner.registerAsRepoRunner(t, repo.OwnerName, repo.Name, "mock-custom-runner", []string{"custom-os"}, false) + + // add a variable for test + req := NewRequestWithJSON(t, "POST", + fmt.Sprintf("/api/v1/repos/%s/%s/actions/variables/myvar", repo.OwnerName, repo.Name), &api.CreateVariableOption{ + Value: "abcdef", + }). + AddTokenAuth(user2Token) + MakeRequest(t, req, http.StatusCreated) + // add a secret for test + req = NewRequestWithJSON(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/%s/actions/secrets/mysecret", repo.OwnerName, repo.Name), api.CreateOrUpdateSecretOption{ + Data: "secRET-t0Ken", + }).AddTokenAuth(user2Token) + MakeRequest(t, req, http.StatusCreated) + + createRepoWorkflowFile(t, user2, user2Token, repo, ".gitea/workflows/reusable1.yaml", + `name: Reusable1 +on: + workflow_call: + inputs: + str_input: + type: string + num_input: + type: number + bool_input: + type: boolean + parent_var: + type: string + needs_out: + type: string + secrets: + PARENT_TOKEN: + outputs: + r1_out: + value: ${{ jobs.reusable1_job2.outputs.r1j2_out }} + +jobs: + reusable1_job1: + runs-on: ubuntu-latest + steps: + - run: echo 'reusable1_job1' + + reusable1_job2: + needs: [reusable1_job1] + outputs: + r1j2_out: ${{ steps.gen_r1j2_output.outputs.out }} + runs-on: custom-os + steps: + - id: gen_r1j2_output + run: | + echo "out=r1j2_out_data" >> "$GITHUB_OUTPUT" + + reusable1_job3: + needs: [reusable1_job2] + uses: ./.gitea/workflows/reusable2.yaml + with: + msg: ${{ inputs.str_input }} +`) + + createRepoWorkflowFile(t, user2, user2Token, repo, ".gitea/workflows/reusable2.yaml", + `name: Reusable2 +on: + workflow_call: + inputs: + msg: + type: string + +jobs: + reusable2_job1: + runs-on: ubuntu-latest + steps: + - run: echo ${{ inputs.msg }} +`) + + createRepoWorkflowFile(t, user2, user2Token, repo, ".gitea/workflows/caller.yaml", + `name: Caller +on: + push: + paths: + - '.gitea/workflows/caller.yaml' +jobs: + caller_job1: + runs-on: ubuntu-latest + outputs: + prepared: ${{ steps.gen_output.outputs.pd }} + steps: + - id: gen_output + run: | + echo "pd=prepared_data" >> "$GITHUB_OUTPUT" + + caller_job2: + needs: [caller_job1] + uses: './.gitea/workflows/reusable1.yaml' + with: + str_input: 'from_caller_job2' + num_input: ${{ 2.3e2 }} + bool_input: ${{ gitea.event_name == 'push' }} + parent_var: ${{ vars.myvar }} + needs_out: ${{ needs.caller_job1.outputs.prepared }} + secrets: + PARENT_TOKEN: ${{ secrets.mysecret }} + + caller_job3: + needs: [caller_job2] + runs-on: ubuntu-latest + steps: + - run: | + echo ${{ needs.caller_job1.outputs.r1_out }} +`) + + var ( + runID int64 + callerJob2ID, callerJob2AttemptJobID int64 + callerJob3AttemptJobID int64 + r1Job2ID, r1Job2AttemptJobID int64 + r1Job3ID, r1Job3AttemptJobID int64 + r2Job1AttemptJobID int64 + ) + + t.Run("Check initialized jobs", func(t *testing.T) { + // run + assert.Equal(t, 1, unittest.GetCount(t, &actions_model.ActionRun{RepoID: repo.ID})) + run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{RepoID: repo.ID}) + runID = run.ID + + // caller_job1 + assert.Equal(t, 3, unittest.GetCount(t, &actions_model.ActionRunJob{RunID: runID})) + callerJob1 := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{RunID: runID, JobID: "caller_job1"}) + assert.Equal(t, actions_model.StatusWaiting, callerJob1.Status) + assert.False(t, callerJob1.IsReusableCaller) + + // caller_job2 + callerJob2 := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{RunID: runID, JobID: "caller_job2"}) + callerJob2ID = callerJob2.ID + callerJob2AttemptJobID = callerJob2.AttemptJobID + assert.Equal(t, actions_model.StatusBlocked, callerJob2.Status) + assert.True(t, callerJob2.IsReusableCaller) + + // caller_job3 + callerJob3 := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{RunID: runID, JobID: "caller_job3"}) + callerJob3AttemptJobID = callerJob3.AttemptJobID + assert.Equal(t, actions_model.StatusBlocked, callerJob3.Status) + assert.False(t, callerJob3.IsReusableCaller) + }) + + t.Run("First run", func(t *testing.T) { + callerJob1Task := defaultRunner.fetchTask(t) // for caller_job1 + _, callerJob1, _ := getTaskAndJobAndRunByTaskID(t, callerJob1Task.Id) + assert.Equal(t, "caller_job1", callerJob1.JobID) + defaultRunner.fetchNoTask(t) + defaultRunner.execTask(t, callerJob1Task, &mockTaskOutcome{ + result: runnerv1.Result_RESULT_SUCCESS, + outputs: map[string]string{ + "prepared": "prepared_data", + }, + }) + + r1Job1Task := defaultRunner.fetchTask(t) // for reusable1_job1 + _, r1Job1, _ := getTaskAndJobAndRunByTaskID(t, r1Job1Task.Id) + assert.Equal(t, "reusable1_job1", r1Job1.JobID) + assert.Equal(t, callerJob2ID, r1Job1.ParentJobID) + payload := getWorkflowCallPayloadFromTask(t, r1Job1Task) + if assert.Len(t, payload.Inputs, 5) { + assert.Equal(t, "from_caller_job2", payload.Inputs["str_input"]) + assert.EqualValues(t, 230, payload.Inputs["num_input"]) + assert.Equal(t, true, payload.Inputs["bool_input"]) + assert.Equal(t, "abcdef", payload.Inputs["parent_var"]) + assert.Equal(t, "prepared_data", payload.Inputs["needs_out"]) + } + if assert.Len(t, r1Job1Task.Secrets, 3) { + assert.Contains(t, r1Job1Task.Secrets, "GITEA_TOKEN") + assert.Contains(t, r1Job1Task.Secrets, "GITHUB_TOKEN") + assert.Equal(t, "secRET-t0Ken", r1Job1Task.Secrets["PARENT_TOKEN"]) + } + customRunner.fetchNoTask(t) + defaultRunner.execTask(t, r1Job1Task, &mockTaskOutcome{ + result: runnerv1.Result_RESULT_SUCCESS, + }) + + // reusable1_job3 (a nested caller) needs reusable1_job2, so it stays Blocked until r1j2 succeeds. + r1Job3Pre := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{RunID: runID, JobID: "reusable1_job3"}) + assert.Equal(t, actions_model.StatusBlocked, r1Job3Pre.Status) + assert.False(t, r1Job3Pre.IsExpanded) + assert.Equal(t, 0, unittest.GetCount(t, &actions_model.ActionRunJob{RunID: runID, JobID: "reusable2_job1"})) + + r1Job2Task := customRunner.fetchTask(t) // for reusable1_job2 + _, r1Job2, _ := getTaskAndJobAndRunByTaskID(t, r1Job2Task.Id) + assert.Equal(t, "reusable1_job2", r1Job2.JobID) + r1Job2ID = r1Job2.ID + r1Job2AttemptJobID = r1Job2.AttemptJobID + if assert.Len(t, r1Job2Task.Needs, 1) { + assert.Contains(t, r1Job2Task.Needs, "reusable1_job1") + assert.Equal(t, runnerv1.Result_RESULT_SUCCESS, r1Job2Task.Needs["reusable1_job1"].Result) + } + customRunner.execTask(t, r1Job2Task, &mockTaskOutcome{ + result: runnerv1.Result_RESULT_SUCCESS, + outputs: map[string]string{ + "r1j2_out": "r1j2_out_data", + }, + }) + + // Now reusable1_job3 expands and reusable2_job1 becomes runnable. + r1Job3 := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{RunID: runID, JobID: "reusable1_job3"}) + assert.True(t, r1Job3.IsReusableCaller) + assert.True(t, r1Job3.IsExpanded) + assert.Equal(t, callerJob2ID, r1Job3.ParentJobID) + r1Job3ID = r1Job3.ID + r1Job3AttemptJobID = r1Job3.AttemptJobID + r2Job1 := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{RunID: runID, JobID: "reusable2_job1"}) + assert.Equal(t, r1Job3ID, r2Job1.ParentJobID) + r2Job1AttemptJobID = r2Job1.AttemptJobID + + r2Job1Task := defaultRunner.fetchTask(t) // for reusable2_job1 + _, fetchedR2Job1, _ := getTaskAndJobAndRunByTaskID(t, r2Job1Task.Id) + assert.Equal(t, "reusable2_job1", fetchedR2Job1.JobID) + assert.Equal(t, r1Job3ID, fetchedR2Job1.ParentJobID) + r2Job1Payload := getWorkflowCallPayloadFromTask(t, r2Job1Task) + if assert.Len(t, r2Job1Payload.Inputs, 1) { + assert.Equal(t, "from_caller_job2", r2Job1Payload.Inputs["msg"]) + } + defaultRunner.execTask(t, r2Job1Task, &mockTaskOutcome{ + result: runnerv1.Result_RESULT_SUCCESS, + }) + + callerJob2 := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{ID: callerJob2ID}) + assert.Equal(t, actions_model.StatusSuccess, callerJob2.Status) + + callerJob3Task := defaultRunner.fetchTask(t) // for caller_job3 + _, callerJob3, _ := getTaskAndJobAndRunByTaskID(t, callerJob3Task.Id) + assert.Equal(t, "caller_job3", callerJob3.JobID) + if assert.Len(t, callerJob3Task.Needs, 1) { + assert.Contains(t, callerJob3Task.Needs, "caller_job2") + assert.Equal(t, runnerv1.Result_RESULT_SUCCESS, callerJob3Task.Needs["caller_job2"].Result) + if assert.Len(t, callerJob3Task.Needs["caller_job2"].Outputs, 1) { + assert.Equal(t, "r1j2_out_data", callerJob3Task.Needs["caller_job2"].Outputs["r1_out"]) + } + } + defaultRunner.execTask(t, callerJob3Task, &mockTaskOutcome{ + result: runnerv1.Result_RESULT_SUCCESS, + }) + callerRun := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{ID: runID}) + assert.Equal(t, actions_model.StatusSuccess, callerRun.Status) + }) + + t.Run("Rerun 'reusable1_job2'", func(t *testing.T) { + req = NewRequest(t, "POST", fmt.Sprintf("/%s/%s/actions/runs/%d/jobs/%d/rerun", repo.OwnerName, repo.Name, runID, r1Job2ID)) + user2Session.MakeRequest(t, req, http.StatusOK) + + run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{ID: runID}) + assert.Equal(t, actions_model.StatusWaiting, run.Status) + attempt2 := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunAttempt{RunID: runID, Attempt: 2}) + assert.Equal(t, actions_model.StatusWaiting, attempt2.Status) + callerJob2 := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{RunID: runID, RunAttemptID: attempt2.ID, AttemptJobID: callerJob2AttemptJobID}) + assert.Equal(t, actions_model.StatusWaiting, callerJob2.Status) + callerJob3 := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{RunID: runID, RunAttemptID: attempt2.ID, AttemptJobID: callerJob3AttemptJobID}) + assert.Equal(t, actions_model.StatusBlocked, callerJob3.Status) + + // reusable1_job3 needs reusable1_job2, so rerunning r1j2 pulls r1j3 (and its subtree) into the rerun set + r1Job3Attempt2 := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{RunID: runID, RunAttemptID: attempt2.ID, AttemptJobID: r1Job3AttemptJobID}) + assert.Equal(t, actions_model.StatusBlocked, r1Job3Attempt2.Status) + assert.True(t, r1Job3Attempt2.IsReusableCaller) + assert.False(t, r1Job3Attempt2.IsExpanded) + assert.Equal(t, 0, unittest.GetCount(t, &actions_model.ActionRunJob{RunID: runID, RunAttemptID: attempt2.ID, JobID: "reusable2_job1"})) + + defaultRunner.fetchNoTask(t) + r1Job2Task := customRunner.fetchTask(t) + _, r1Job2, _ := getTaskAndJobAndRunByTaskID(t, r1Job2Task.Id) + assert.Equal(t, "reusable1_job2", r1Job2.JobID) + assert.Equal(t, callerJob2.ID, r1Job2.ParentJobID) + assert.Equal(t, r1Job2AttemptJobID, r1Job2.AttemptJobID) + assert.Equal(t, actions_model.StatusRunning, r1Job2.Status) + run = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{ID: runID}) + assert.Equal(t, actions_model.StatusRunning, run.Status) + customRunner.execTask(t, r1Job2Task, &mockTaskOutcome{ + result: runnerv1.Result_RESULT_SUCCESS, + outputs: map[string]string{ + "r1j2_out": "r1j2_out_data_updated", + }, + }) + + // r1j3 expands again. Its child reuses the AttemptJobID from attempt 1 + r1Job3Attempt2 = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{RunID: runID, RunAttemptID: attempt2.ID, AttemptJobID: r1Job3AttemptJobID}) + assert.True(t, r1Job3Attempt2.IsExpanded) + r2Job1Attempt2 := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{RunID: runID, RunAttemptID: attempt2.ID, JobID: "reusable2_job1"}) + assert.Equal(t, r2Job1AttemptJobID, r2Job1Attempt2.AttemptJobID) + assert.Equal(t, r1Job3Attempt2.ID, r2Job1Attempt2.ParentJobID) + + r2Job1Task := defaultRunner.fetchTask(t) + _, fetchedR2Job1, _ := getTaskAndJobAndRunByTaskID(t, r2Job1Task.Id) + assert.Equal(t, "reusable2_job1", fetchedR2Job1.JobID) + defaultRunner.execTask(t, r2Job1Task, &mockTaskOutcome{ + result: runnerv1.Result_RESULT_SUCCESS, + }) + + callerJob2 = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{ID: callerJob2.ID}) + assert.Equal(t, actions_model.StatusSuccess, callerJob2.Status) + + callerJob3Task := defaultRunner.fetchTask(t) + _, callerJob3, _ = getTaskAndJobAndRunByTaskID(t, callerJob3Task.Id) + assert.Equal(t, "caller_job3", callerJob3.JobID) + if assert.Len(t, callerJob3Task.Needs, 1) { + assert.Contains(t, callerJob3Task.Needs, "caller_job2") + assert.Equal(t, runnerv1.Result_RESULT_SUCCESS, callerJob3Task.Needs["caller_job2"].Result) + if assert.Len(t, callerJob3Task.Needs["caller_job2"].Outputs, 1) { + assert.Equal(t, "r1j2_out_data_updated", callerJob3Task.Needs["caller_job2"].Outputs["r1_out"]) + } + } + defaultRunner.execTask(t, callerJob3Task, &mockTaskOutcome{ + result: runnerv1.Result_RESULT_SUCCESS, + }) + attempt2 = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunAttempt{RunID: runID, Attempt: 2}) + assert.Equal(t, actions_model.StatusSuccess, attempt2.Status) + run = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{ID: runID}) + assert.Equal(t, actions_model.StatusSuccess, run.Status) + }) + }) + + t.Run("Cross-repo reusable workflow with collaborative owner", func(t *testing.T) { + // libRepo: private, owned by user2. + libAPIRepo := createActionsTestRepo(t, user2Token, "reusable-lib-private", true) + libRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: libAPIRepo.ID}) + createRepoWorkflowFile(t, user2, user2Token, libRepo, ".gitea/workflows/reusable_lib.yaml", + `name: ReusableLib +on: + workflow_call: + inputs: + from: + type: string + +jobs: + lib_job: + runs-on: ubuntu-latest + steps: + - run: echo hello-${{ inputs.from }} +`) + + // consumerRepo: private, owned by user4. + consumerAPIRepo := createActionsTestRepo(t, user4Token, "workflow-call-cross-repo", true) + consumerRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: consumerAPIRepo.ID}) + + runner := newMockRunner() + runner.registerAsRepoRunner(t, consumerRepo.OwnerName, consumerRepo.Name, "mock-cross-runner", []string{"ubuntu-latest"}, false) + + createRepoWorkflowFile(t, user4, user4Token, consumerRepo, ".gitea/workflows/cross-caller.yaml", + `name: CrossCaller +on: push +jobs: + cross_job: + uses: user2/reusable-lib-private/.gitea/workflows/reusable_lib.yaml@main + with: + from: 'consumer' +`) + + // Phase 1: no grant. The cross-repo read check fails, and NO ActionRun row gets persisted. + assert.Equal(t, 0, unittest.GetCount(t, &actions_model.ActionRun{RepoID: consumerRepo.ID})) + runner.fetchNoTask(t) + + // Phase 2: user2 (libRepo owner) adds user4 (consumer owner) as a Collaborative Owner of libRepo. + addCollabReq := NewRequestWithValues(t, "POST", + fmt.Sprintf("/%s/%s/settings/actions/general/collaborative_owner/add", libRepo.OwnerName, libRepo.Name), + map[string]string{"collaborative_owner": user4.Name}) + user2Session.MakeRequest(t, addCollabReq, http.StatusOK) + + // Phase 3: trigger the workflow again + createRepoWorkflowFile(t, user4, user4Token, consumerRepo, "marker.txt", "trigger after grant") + + run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{RepoID: consumerRepo.ID}) + crossJob := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{RunID: run.ID, JobID: "cross_job"}) + assert.True(t, crossJob.IsReusableCaller) + assert.True(t, crossJob.IsExpanded) + assert.Equal(t, actions_model.StatusWaiting, crossJob.Status) + + libJobTask := runner.fetchTask(t) + _, fetchedLibJob, _ := getTaskAndJobAndRunByTaskID(t, libJobTask.Id) + assert.Equal(t, "lib_job", fetchedLibJob.JobID) + assert.Equal(t, crossJob.ID, fetchedLibJob.ParentJobID) + assert.Equal(t, consumerRepo.ID, fetchedLibJob.RepoID) + payload := getWorkflowCallPayloadFromTask(t, libJobTask) + if assert.Len(t, payload.Inputs, 1) { + assert.Equal(t, "consumer", payload.Inputs["from"]) + } + crossJob = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{ID: crossJob.ID}) + assert.Equal(t, actions_model.StatusRunning, crossJob.Status) + runner.execTask(t, libJobTask, &mockTaskOutcome{result: runnerv1.Result_RESULT_SUCCESS}) + + crossJob = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{ID: crossJob.ID}) + assert.Equal(t, actions_model.StatusSuccess, crossJob.Status) + run = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{ID: run.ID}) + assert.Equal(t, actions_model.StatusSuccess, run.Status) + }) + + t.Run("Public caller denied private target even with collaborative owner", func(t *testing.T) { + // Isolates the run.Repo.IsPrivate gate: a public caller must be denied a private target even with a + // collaborative-owner grant, since allowing it would expose private workflow content in a public run. + + // libRepo: private, owned by user2. + libAPIRepo := createActionsTestRepo(t, user2Token, "reusable-lib-public-denied", true) + libRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: libAPIRepo.ID}) + createRepoWorkflowFile(t, user2, user2Token, libRepo, ".gitea/workflows/reusable_lib.yaml", + `name: ReusableLib +on: + workflow_call: + +jobs: + lib_job: + runs-on: ubuntu-latest + steps: + - run: echo hello +`) + + // Grant first: user2 adds user4 as a collaborative owner of the private libRepo, so the grant is + // satisfied and the public-caller gate is the only thing that can deny access. + addCollabReq := NewRequestWithValues(t, "POST", + fmt.Sprintf("/%s/%s/settings/actions/general/collaborative_owner/add", libRepo.OwnerName, libRepo.Name), + map[string]string{"collaborative_owner": user4.Name}) + user2Session.MakeRequest(t, addCollabReq, http.StatusOK) + + // consumerRepo: public, owned by user4. + consumerAPIRepo := createActionsTestRepo(t, user4Token, "workflow-call-public-denied", false) + consumerRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: consumerAPIRepo.ID}) + + runner := newMockRunner() + runner.registerAsRepoRunner(t, consumerRepo.OwnerName, consumerRepo.Name, "mock-public-denied-runner", []string{"ubuntu-latest"}, false) + + createRepoWorkflowFile(t, user4, user4Token, consumerRepo, ".gitea/workflows/cross-caller.yaml", + `name: CrossCaller +on: push +jobs: + cross_job: + uses: user2/reusable-lib-public-denied/.gitea/workflows/reusable_lib.yaml@main +`) + + // Denied: the cross-repo read check fails for the public caller, so NO ActionRun is persisted and no task is dispatched. + assert.Equal(t, 0, unittest.GetCount(t, &actions_model.ActionRun{RepoID: consumerRepo.ID})) + runner.fetchNoTask(t) + }) + + t.Run("Cross-repo callee with same-repo nested uses", func(t *testing.T) { + // A same-repo `uses: ./...` inside a cross-repo reusable callee must resolve relative to the callee's own repo (matching GitHub's behavior), not the original triggering repo. + + // Place a util.yaml with a distinguishable job name in BOTH repos to detect mis-resolution. + + libAPIRepo := createActionsTestRepo(t, user2Token, "reusable-lib-nested", false) + libRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: libAPIRepo.ID}) + createRepoWorkflowFile(t, user2, user2Token, libRepo, ".gitea/workflows/util.yaml", + `name: UtilLib +on: + workflow_call: + +jobs: + util_lib_job: + runs-on: ubuntu-latest + steps: + - run: echo from-lib +`) + createRepoWorkflowFile(t, user2, user2Token, libRepo, ".gitea/workflows/lib.yaml", + `name: LibNested +on: + workflow_call: + +jobs: + call_util_in_lib: + uses: ./.gitea/workflows/util.yaml +`) + + consumerAPIRepo := createActionsTestRepo(t, user4Token, "consumer-nested-uses", false) + consumerRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: consumerAPIRepo.ID}) + + // A *different* util.yaml in the consumer repo: if `./` mis-resolves we'd see this job's name. + createRepoWorkflowFile(t, user4, user4Token, consumerRepo, ".gitea/workflows/util.yaml", + `name: UtilConsumer +on: + workflow_call: + +jobs: + util_consumer_job: + runs-on: ubuntu-latest + steps: + - run: echo from-consumer +`) + + runner := newMockRunner() + runner.registerAsRepoRunner(t, consumerRepo.OwnerName, consumerRepo.Name, "mock-nested-runner", []string{"ubuntu-latest"}, false) + + createRepoWorkflowFile(t, user4, user4Token, consumerRepo, ".gitea/workflows/caller.yaml", + `name: NestedCaller +on: push +jobs: + cross_job: + uses: user2/reusable-lib-nested/.gitea/workflows/lib.yaml@main +`) + + run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{RepoID: consumerRepo.ID}) + crossJob := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{RunID: run.ID, JobID: "cross_job"}) + assert.True(t, crossJob.IsReusableCaller) + assert.True(t, crossJob.IsExpanded) + + // cross_job's children come from libRepo/lib.yaml - their source must be libRepo + libRepo's commit. + libHead, err := gitrepo.GetBranchCommitID(t.Context(), libRepo, libRepo.DefaultBranch) + require.NoError(t, err) + callUtilJob := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{RunID: run.ID, JobID: "call_util_in_lib", ParentJobID: crossJob.ID}) + assert.True(t, callUtilJob.IsReusableCaller) + assert.Equal(t, libRepo.ID, callUtilJob.WorkflowSourceRepoID) + assert.Equal(t, libHead, callUtilJob.WorkflowSourceCommitSHA) + + // call_util_in_lib has `uses: ./.gitea/workflows/util.yaml`, so its children should come from libRepo/util.yaml + assert.True(t, callUtilJob.IsExpanded) + unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{RunID: run.ID, JobID: "util_lib_job", ParentJobID: callUtilJob.ID}) + unittest.AssertNotExistsBean(t, &actions_model.ActionRunJob{RunID: run.ID, JobID: "util_consumer_job"}) + }) + + t.Run("Missing callee file", func(t *testing.T) { + // A caller workflow references a callee path that does not exist in the repo. + + apiRepo := createActionsTestRepo(t, user2Token, "caller-missing-callee", false) + repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: apiRepo.ID}) + + createRepoWorkflowFile(t, user2, user2Token, repo, ".gitea/workflows/caller.yaml", + `name: Caller +on: push +jobs: + plain_job: + runs-on: ubuntu-latest + steps: + - run: echo 'job' + call_missing: + uses: ./.gitea/workflows/does-not-exist.yml +`) + + assert.Equal(t, 0, unittest.GetCount(t, &actions_model.ActionRun{RepoID: repo.ID})) + }) + + t.Run("Fork PR with secrets: inherit does not leak base repo secrets", func(t *testing.T) { + // user2 owns the base repo, configures a secret, and registers a reusable workflow that declares a required secret. + // The caller workflow uses `secrets: inherit`. + + apiBaseRepo := createActionsTestRepo(t, user2Token, "fork-pr-inherit-test", false) + baseRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: apiBaseRepo.ID}) + user2APICtx := NewAPITestContext(t, baseRepo.OwnerName, baseRepo.Name, auth_model.AccessTokenScopeWriteRepository) + defer doAPIDeleteRepository(user2APICtx)(t) + + // Real secret that must never reach a fork PR task. + req := NewRequestWithJSON(t, "PUT", + fmt.Sprintf("/api/v1/repos/%s/%s/actions/secrets/leaked_secret", baseRepo.OwnerName, baseRepo.Name), + api.CreateOrUpdateSecretOption{Data: "MUST-NOT-LEAK"}).AddTokenAuth(user2Token) + MakeRequest(t, req, http.StatusCreated) + + runner := newMockRunner() + runner.registerAsRepoRunner(t, baseRepo.OwnerName, baseRepo.Name, "mock-fork-runner", []string{"ubuntu-latest"}, false) + + createRepoWorkflowFile(t, user2, user2Token, baseRepo, ".gitea/workflows/reusable.yaml", + `name: Reusable +on: + workflow_call: + secrets: + leaked_secret: + +jobs: + callee: + runs-on: ubuntu-latest + steps: + - run: echo +`) + createRepoWorkflowFile(t, user2, user2Token, baseRepo, ".gitea/workflows/caller.yaml", + `name: Caller +on: pull_request +jobs: + call_reusable: + uses: ./.gitea/workflows/reusable.yaml + secrets: inherit +`) + + // user4 forks + req = NewRequestWithJSON(t, "POST", + fmt.Sprintf("/api/v1/repos/%s/%s/forks", baseRepo.OwnerName, baseRepo.Name), + &api.CreateForkOption{Name: new("fork-pr-inherit-test-fork")}).AddTokenAuth(user4Token) + resp := MakeRequest(t, req, http.StatusAccepted) + apiForkRepo := DecodeJSON(t, resp, &api.Repository{}) + forkRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: apiForkRepo.ID}) + user4APICtx := NewAPITestContext(t, user4.Name, forkRepo.Name, auth_model.AccessTokenScopeWriteRepository) + defer doAPIDeleteRepository(user4APICtx)(t) + + // user4 pushes a change on the fork and opens a PR to base + doAPICreateFile(user4APICtx, "user4-fix.txt", &api.CreateFileOptions{ + FileOptions: api.FileOptions{ + NewBranchName: "user4/branch", + Message: "create user4-fix.txt", + Author: api.Identity{Name: user4.Name, Email: user4.Email}, + Committer: api.Identity{Name: user4.Name, Email: user4.Email}, + Dates: api.CommitDateOptions{Author: time.Now(), Committer: time.Now()}, + }, + ContentBase64: base64.StdEncoding.EncodeToString([]byte("fix")), + })(t) + doAPICreatePullRequest(user4APICtx, baseRepo.OwnerName, baseRepo.Name, baseRepo.DefaultBranch, user4.Name+":user4/branch")(t) + + // Approve the fork PR run. + forkRun := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{RepoID: baseRepo.ID, TriggerUserID: user4.ID}) + assert.True(t, forkRun.IsForkPullRequest) + req = NewRequest(t, "POST", fmt.Sprintf("/%s/%s/actions/runs/%d/approve", baseRepo.OwnerName, baseRepo.Name, forkRun.ID)) + user2Session.MakeRequest(t, req, http.StatusOK) + + task := runner.fetchTask(t) + _, taskJob, taskRun := getTaskAndJobAndRunByTaskID(t, task.Id) + assert.Equal(t, "callee", taskJob.JobID) + assert.Equal(t, forkRun.ID, taskRun.ID) + + // Only the auto-issued tokens should be present. The user-defined `leaked_secret` must not appear. + assert.Contains(t, task.Secrets, "GITEA_TOKEN") + assert.Contains(t, task.Secrets, "GITHUB_TOKEN") + assert.NotContains(t, task.Secrets, "leaked_secret") + for name, value := range task.Secrets { + assert.NotEqual(t, "MUST-NOT-LEAK", value, "secret %q leaked the base repo's secret value into a fork PR task", name) + } + + runner.execTask(t, task, &mockTaskOutcome{result: runnerv1.Result_RESULT_SUCCESS}) + }) + + t.Run("Caller alternates expanding across attempts", func(t *testing.T) { + apiRepo := createActionsTestRepo(t, user2Token, "caller-walkback-test", false) + repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: apiRepo.ID}) + + runner := newMockRunner() + runner.registerAsRepoRunner(t, repo.OwnerName, repo.Name, "mock-walkback-runner", []string{"ubuntu-latest"}, false) + + // Scenario: + // attempt 1: gate succeeds -> caller expands -> inner runs (records inner.AttemptJobID = N) + // attempt 2: rerun gate, mock Failure -> caller is Skipped without expanding (no children inserted) + // attempt 3: rerun gate, mock Success -> caller expands again -> inner.AttemptJobID must equal N + + createRepoWorkflowFile(t, user2, user2Token, repo, ".gitea/workflows/lib.yaml", + `name: Lib +on: + workflow_call: + +jobs: + inner: + runs-on: ubuntu-latest + steps: + - run: echo inner +`) + createRepoWorkflowFile(t, user2, user2Token, repo, ".gitea/workflows/main.yaml", + `name: Main +on: + push: + paths: + - '.gitea/workflows/main.yaml' +jobs: + gate: + runs-on: ubuntu-latest + steps: + - run: echo gate + + caller: + needs: [gate] + uses: ./.gitea/workflows/lib.yaml +`) + + run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{RepoID: repo.ID}) + runID := run.ID + + latestAttempt := func() *actions_model.ActionRunAttempt { + r := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{ID: runID}) + return unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunAttempt{ID: r.LatestAttemptID}) + } + jobInLatest := func(jobID string) *actions_model.ActionRunJob { + a := latestAttempt() + return unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{RunID: runID, RunAttemptID: a.ID, JobID: jobID}) + } + + // attempt 1: gate Success -> caller expands -> inner runs + gate1Task := runner.fetchTask(t) + _, gate1, _ := getTaskAndJobAndRunByTaskID(t, gate1Task.Id) + assert.Equal(t, "gate", gate1.JobID) + runner.execTask(t, gate1Task, &mockTaskOutcome{result: runnerv1.Result_RESULT_SUCCESS}) + + inner1Task := runner.fetchTask(t) + _, inner1, _ := getTaskAndJobAndRunByTaskID(t, inner1Task.Id) + assert.Equal(t, "inner", inner1.JobID) + innerAttemptJobID := inner1.AttemptJobID + callerAttempt1 := jobInLatest("caller") + assert.True(t, callerAttempt1.IsExpanded) + assert.Equal(t, callerAttempt1.ID, inner1.ParentJobID) + runner.execTask(t, inner1Task, &mockTaskOutcome{result: runnerv1.Result_RESULT_SUCCESS}) + + run = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{ID: runID}) + assert.Equal(t, actions_model.StatusSuccess, run.Status) + + // attempt 2: rerun gate, mock Failure -> caller stays unexpanded (Skipped) + gateLatest := jobInLatest("gate") + req := NewRequest(t, "POST", fmt.Sprintf("/%s/%s/actions/runs/%d/jobs/%d/rerun", repo.OwnerName, repo.Name, runID, gateLatest.ID)) + user2Session.MakeRequest(t, req, http.StatusOK) + + gate2Task := runner.fetchTask(t) + _, gate2, _ := getTaskAndJobAndRunByTaskID(t, gate2Task.Id) + assert.Equal(t, "gate", gate2.JobID) + runner.execTask(t, gate2Task, &mockTaskOutcome{result: runnerv1.Result_RESULT_FAILURE}) + + runner.fetchNoTask(t) // no inner because caller did not expand + attempt2 := latestAttempt() + assert.Equal(t, actions_model.StatusFailure, attempt2.Status) + callerAttempt2 := jobInLatest("caller") + assert.Equal(t, actions_model.StatusSkipped, callerAttempt2.Status) + assert.False(t, callerAttempt2.IsExpanded) + assert.Equal(t, 0, unittest.GetCount(t, &actions_model.ActionRunJob{RunID: runID, RunAttemptID: attempt2.ID, JobID: "inner"})) + + // attempt 3: rerun gate, mock Success -> caller expands and inner reuses attempt 1's AttemptJobID + gateLatest = jobInLatest("gate") + req = NewRequest(t, "POST", fmt.Sprintf("/%s/%s/actions/runs/%d/jobs/%d/rerun", repo.OwnerName, repo.Name, runID, gateLatest.ID)) + user2Session.MakeRequest(t, req, http.StatusOK) + + gate3Task := runner.fetchTask(t) + runner.execTask(t, gate3Task, &mockTaskOutcome{result: runnerv1.Result_RESULT_SUCCESS}) + + inner3Task := runner.fetchTask(t) + _, inner3, _ := getTaskAndJobAndRunByTaskID(t, inner3Task.Id) + assert.Equal(t, "inner", inner3.JobID) + assert.Equal(t, innerAttemptJobID, inner3.AttemptJobID) + runner.execTask(t, inner3Task, &mockTaskOutcome{result: runnerv1.Result_RESULT_SUCCESS}) + + run = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{ID: runID}) + assert.Equal(t, actions_model.StatusSuccess, run.Status) + }) + }) +} + +// token must belong to u (the commit identity) and have write access to repo. Reuse the caller's +// existing token rather than logging in per call, which would re-run bcrypt password verification each time. +func createRepoWorkflowFile(t *testing.T, u *user_model.User, token string, repo *repo_model.Repository, treePath, content string) { + opts := getWorkflowCreateFileOptions(u, repo.DefaultBranch, "create "+treePath, content) + createWorkflowFile(t, token, repo.OwnerName, repo.Name, treePath, opts) +} + +func getWorkflowCallPayloadFromTask(t *testing.T, runnerTask *runnerv1.Task) *api.WorkflowCallPayload { + eventJSON, err := runnerTask.GetContext().Fields["event"].GetStructValue().MarshalJSON() + assert.NoError(t, err) + var payload api.WorkflowCallPayload + assert.NoError(t, json.Unmarshal(eventJSON, &payload)) + return &payload +} diff --git a/tests/integration/actions_route_test.go b/tests/integration/actions_route_test.go index 32903afa24..1591a17ae0 100644 --- a/tests/integration/actions_route_test.go +++ b/tests/integration/actions_route_test.go @@ -9,15 +9,15 @@ import ( "net/url" "testing" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - actions_web "code.gitea.io/gitea/routers/web/repo/actions" + runnerv1 "gitea.dev/actions-proto-go/runner/v1" + actions_model "gitea.dev/models/actions" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + actions_web "gitea.dev/routers/web/repo/actions" - runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/tests/integration/actions_runner_modify_test.go b/tests/integration/actions_runner_modify_test.go index eb5206f73d..f9614d6987 100644 --- a/tests/integration/actions_runner_modify_test.go +++ b/tests/integration/actions_runner_modify_test.go @@ -6,14 +6,16 @@ package integration import ( "fmt" "net/http" + "strings" "testing" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + actions_model "gitea.dev/models/actions" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/base" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -163,4 +165,55 @@ func TestActionsRunnerModify(t *testing.T) { assertSuccess(t, sessionAdmin, adminWebURL, globalRunner.ID) }) }) + + t.Run("BulkAction", func(t *testing.T) { + // Previous subtests deleted all runners; create a fresh set scoped to this subtest. + require.NoError(t, actions_model.CreateRunner(ctx, &actions_model.ActionRunner{Name: "bulk-runner-1", TokenHash: "e", UUID: "e"})) + require.NoError(t, actions_model.CreateRunner(ctx, &actions_model.ActionRunner{Name: "bulk-runner-2", TokenHash: "f", UUID: "f"})) + require.NoError(t, actions_model.CreateRunner(ctx, &actions_model.ActionRunner{Name: "bulk-runner-3", TokenHash: "g", UUID: "g"})) + r1 := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunner{Name: "bulk-runner-1"}) + r2 := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunner{Name: "bulk-runner-2"}) + r3 := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunner{Name: "bulk-runner-3"}) + allIDs := []int64{r1.ID, r2.ID, r3.ID} + bulkURL := adminWebURL + "/bulk" + doBulk := func(t *testing.T, sess *TestSession, action string, ids []int64, expectedStatus int) { + req := NewRequestWithValues(t, "POST", bulkURL, map[string]string{ + "action": action, + "ids": strings.Join(base.Int64sToStrings(ids), ","), + }) + sess.MakeRequest(t, req, expectedStatus) + } + + t.Run("NonAdminForbidden", func(t *testing.T) { + doBulk(t, sessionUser2, "disable", allIDs, http.StatusForbidden) + for _, id := range allIDs { + v := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunner{ID: id}) + assert.False(t, v.IsDisabled, "runner %d should not have been disabled", id) + } + }) + + t.Run("InvalidAction", func(t *testing.T) { + doBulk(t, sessionAdmin, "evict", allIDs, http.StatusBadRequest) + }) + + t.Run("DisableEnable", func(t *testing.T) { + doBulk(t, sessionAdmin, "disable", allIDs, http.StatusOK) + for _, id := range allIDs { + v := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunner{ID: id}) + assert.True(t, v.IsDisabled, "runner %d should be disabled", id) + } + doBulk(t, sessionAdmin, "enable", allIDs, http.StatusOK) + for _, id := range allIDs { + v := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunner{ID: id}) + assert.False(t, v.IsDisabled, "runner %d should be enabled", id) + } + }) + + t.Run("Delete", func(t *testing.T) { + doBulk(t, sessionAdmin, "delete", allIDs, http.StatusOK) + for _, id := range allIDs { + unittest.AssertNotExistsBean(t, &actions_model.ActionRunner{ID: id}) + } + }) + }) } diff --git a/tests/integration/actions_runner_test.go b/tests/integration/actions_runner_test.go index e9a0a96ca8..017b3a3f1b 100644 --- a/tests/integration/actions_runner_test.go +++ b/tests/integration/actions_runner_test.go @@ -10,13 +10,13 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/setting" + pingv1 "gitea.dev/actions-proto-go/ping/v1" + "gitea.dev/actions-proto-go/ping/v1/pingv1connect" + runnerv1 "gitea.dev/actions-proto-go/runner/v1" + "gitea.dev/actions-proto-go/runner/v1/runnerv1connect" + auth_model "gitea.dev/models/auth" + "gitea.dev/modules/setting" - pingv1 "code.gitea.io/actions-proto-go/ping/v1" - "code.gitea.io/actions-proto-go/ping/v1/pingv1connect" - runnerv1 "code.gitea.io/actions-proto-go/runner/v1" - "code.gitea.io/actions-proto-go/runner/v1/runnerv1connect" "connectrpc.com/connect" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/actions_schedule_test.go b/tests/integration/actions_schedule_test.go index 43c44ede55..438e6307fb 100644 --- a/tests/integration/actions_schedule_test.go +++ b/tests/integration/actions_schedule_test.go @@ -9,19 +9,19 @@ import ( "strings" "testing" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/migration" - api "code.gitea.io/gitea/modules/structs" - mirror_service "code.gitea.io/gitea/services/mirror" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" + actions_model "gitea.dev/models/actions" + auth_model "gitea.dev/models/auth" + git_model "gitea.dev/models/git" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + unit_model "gitea.dev/models/unit" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/migration" + api "gitea.dev/modules/structs" + mirror_service "gitea.dev/services/mirror" + repo_service "gitea.dev/services/repository" + files_service "gitea.dev/services/repository/files" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/actions_settings_test.go b/tests/integration/actions_settings_test.go index bf4d8cb748..dd39ed2860 100644 --- a/tests/integration/actions_settings_test.go +++ b/tests/integration/actions_settings_test.go @@ -9,10 +9,10 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/actions_trigger_test.go b/tests/integration/actions_trigger_test.go index e7a3cd7b4f..cd87bc8b1a 100644 --- a/tests/integration/actions_trigger_test.go +++ b/tests/integration/actions_trigger_test.go @@ -12,30 +12,30 @@ import ( "testing" "time" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - actions_module "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/commitstatus" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/timeutil" - webhook_module "code.gitea.io/gitea/modules/webhook" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" - release_service "code.gitea.io/gitea/services/release" - repo_service "code.gitea.io/gitea/services/repository" - commitstatus_service "code.gitea.io/gitea/services/repository/commitstatus" - files_service "code.gitea.io/gitea/services/repository/files" + actions_model "gitea.dev/models/actions" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + git_model "gitea.dev/models/git" + issues_model "gitea.dev/models/issues" + "gitea.dev/models/perm" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + actions_module "gitea.dev/modules/actions" + "gitea.dev/modules/commitstatus" + "gitea.dev/modules/gitrepo" + "gitea.dev/modules/json" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/modules/timeutil" + webhook_module "gitea.dev/modules/webhook" + issue_service "gitea.dev/services/issue" + pull_service "gitea.dev/services/pull" + release_service "gitea.dev/services/release" + repo_service "gitea.dev/services/repository" + commitstatus_service "gitea.dev/services/repository/commitstatus" + files_service "gitea.dev/services/repository/files" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -931,6 +931,76 @@ jobs: }) } +func TestWorkflowDispatchPublicApiRequiresWorkflowDispatchTrigger(t *testing.T) { + onGiteaRun(t, func(t *testing.T, u *url.URL) { + user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) + session := loginUser(t, user2.Name) + token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) + + repo, err := repo_service.CreateRepository(t.Context(), user2, user2, repo_service.CreateRepoOptions{ + Name: "workflow-dispatch-requires-trigger", + Description: "test workflow dispatch requires workflow_dispatch", + AutoInit: true, + Gitignores: "Go", + License: "MIT", + Readme: "Default", + DefaultBranch: "main", + IsPrivate: false, + }) + require.NoError(t, err) + require.NotNil(t, repo) + + addWorkflowToBaseResp, err := files_service.ChangeRepoFiles(t.Context(), repo, user2, &files_service.ChangeRepoFilesOptions{ + Files: []*files_service.ChangeRepoFile{ + { + Operation: "create", + TreePath: ".gitea/workflows/push-only.yml", + ContentReader: strings.NewReader(` +on: + push: +jobs: + test: + runs-on: ubuntu-latest + steps: + - run: echo helloworld +`), + }, + }, + Message: "add workflow", + OldBranch: "main", + NewBranch: "main", + Author: &files_service.IdentityOptions{ + GitUserName: user2.Name, + GitUserEmail: user2.Email, + }, + Committer: &files_service.IdentityOptions{ + GitUserName: user2.Name, + GitUserEmail: user2.Email, + }, + Dates: &files_service.CommitDateOptions{ + Author: time.Now(), + Committer: time.Now(), + }, + }) + require.NoError(t, err) + require.NotNil(t, addWorkflowToBaseResp) + + values := url.Values{} + values.Set("ref", "main") + req := NewRequestWithURLValues(t, "POST", fmt.Sprintf("/api/v1/repos/%s/actions/workflows/push-only.yml/dispatches", repo.FullName()), values). + AddTokenAuth(token) + resp := MakeRequest(t, req, http.StatusUnprocessableEntity) + apiError := DecodeJSON(t, resp, &api.APIError{}) + assert.Contains(t, apiError.Message, "has no workflow_dispatch event trigger") + + unittest.AssertNotExistsBean(t, &actions_model.ActionRun{ + RepoID: repo.ID, + Event: "workflow_dispatch", + WorkflowID: "push-only.yml", + }) + }) +} + func TestWorkflowDispatchPublicApiWithInputs(t *testing.T) { onGiteaRun(t, func(t *testing.T, u *url.URL) { user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) diff --git a/tests/integration/actions_variables_test.go b/tests/integration/actions_variables_test.go index b884b32ebf..85ec717e52 100644 --- a/tests/integration/actions_variables_test.go +++ b/tests/integration/actions_variables_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + actions_model "gitea.dev/models/actions" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/admin_config_test.go b/tests/integration/admin_config_test.go index 5f882e8a55..f077b3a84e 100644 --- a/tests/integration/admin_config_test.go +++ b/tests/integration/admin_config_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/setting/config" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "gitea.dev/models/system" + "gitea.dev/modules/setting" + "gitea.dev/modules/setting/config" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/admin_user_test.go b/tests/integration/admin_user_test.go index 82db96c694..64bb04f03f 100644 --- a/tests/integration/admin_user_test.go +++ b/tests/integration/admin_user_test.go @@ -9,9 +9,9 @@ import ( "strconv" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_actions_artifact_test.go b/tests/integration/api_actions_artifact_test.go index 4670bb0704..9e8444525f 100644 --- a/tests/integration/api_actions_artifact_test.go +++ b/tests/integration/api_actions_artifact_test.go @@ -16,13 +16,13 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + runnerv1 "gitea.dev/actions-proto-go/runner/v1" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/tests" - runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/tests/integration/api_actions_artifact_v4_test.go b/tests/integration/api_actions_artifact_v4_test.go index a8ed72b612..acefc9eeb8 100644 --- a/tests/integration/api_actions_artifact_v4_test.go +++ b/tests/integration/api_actions_artifact_v4_test.go @@ -18,21 +18,21 @@ import ( "testing" "time" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/actions" - actions_service "code.gitea.io/gitea/services/actions" + runnerv1 "gitea.dev/actions-proto-go/runner/v1" + actions_model "gitea.dev/models/actions" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/json" + "gitea.dev/modules/setting" + "gitea.dev/modules/storage" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/modules/util" + "gitea.dev/routers/api/actions" + actions_service "gitea.dev/services/actions" - runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/encoding/protojson" diff --git a/tests/integration/api_actions_permission_test.go b/tests/integration/api_actions_permission_test.go index 2c0aaa43e8..9090866296 100644 --- a/tests/integration/api_actions_permission_test.go +++ b/tests/integration/api_actions_permission_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_actions_run_test.go b/tests/integration/api_actions_run_test.go index 88a9c50f72..fbb34ca4a7 100644 --- a/tests/integration/api_actions_run_test.go +++ b/tests/integration/api_actions_run_test.go @@ -9,15 +9,15 @@ import ( "slices" "testing" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/tests" + actions_model "gitea.dev/models/actions" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/modules/timeutil" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_actions_runner_test.go b/tests/integration/api_actions_runner_test.go index f32e2af890..216511795b 100644 --- a/tests/integration/api_actions_runner_test.go +++ b/tests/integration/api_actions_runner_test.go @@ -9,9 +9,9 @@ import ( "slices" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_admin_org_test.go b/tests/integration/api_admin_org_test.go index 6019be70c6..8fefe51ba9 100644 --- a/tests/integration/api_admin_org_test.go +++ b/tests/integration/api_admin_org_test.go @@ -8,11 +8,11 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_admin_test.go b/tests/integration/api_admin_test.go index e3abc4d0b3..c02137a326 100644 --- a/tests/integration/api_admin_test.go +++ b/tests/integration/api_admin_test.go @@ -9,16 +9,16 @@ import ( "testing" "time" - asymkey_model "code.gitea.io/gitea/models/asymkey" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/glob" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + asymkey_model "gitea.dev/models/asymkey" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/glob" + "gitea.dev/modules/json" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_auth_test.go b/tests/integration/api_auth_test.go index a6ff6a6519..1d0aec6b23 100644 --- a/tests/integration/api_auth_test.go +++ b/tests/integration/api_auth_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_branch_test.go b/tests/integration/api_branch_test.go index d6f3f6a9a1..c4946f05e3 100644 --- a/tests/integration/api_branch_test.go +++ b/tests/integration/api_branch_test.go @@ -11,11 +11,11 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + git_model "gitea.dev/models/git" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_comment_attachment_test.go b/tests/integration/api_comment_attachment_test.go index 657b1637ac..302b6f58fe 100644 --- a/tests/integration/api_comment_attachment_test.go +++ b/tests/integration/api_comment_attachment_test.go @@ -10,14 +10,14 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/services/convert" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_comment_test.go b/tests/integration/api_comment_test.go index 138d1d2e9b..8ef14256d6 100644 --- a/tests/integration/api_comment_test.go +++ b/tests/integration/api_comment_test.go @@ -9,14 +9,14 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/services/convert" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_fork_test.go b/tests/integration/api_fork_test.go index f99cc29fab..cf0a2e4384 100644 --- a/tests/integration/api_fork_test.go +++ b/tests/integration/api_fork_test.go @@ -7,14 +7,14 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - org_model "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - org_service "code.gitea.io/gitea/services/org" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + org_model "gitea.dev/models/organization" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + org_service "gitea.dev/services/org" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_gitignore_templates_test.go b/tests/integration/api_gitignore_templates_test.go index a6e4765ca3..50e224bf67 100644 --- a/tests/integration/api_gitignore_templates_test.go +++ b/tests/integration/api_gitignore_templates_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/options" - repo_module "code.gitea.io/gitea/modules/repository" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + "gitea.dev/modules/options" + repo_module "gitea.dev/modules/repository" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_gpg_keys_test.go b/tests/integration/api_gpg_keys_test.go index a5cee1d8a7..a2a19d5888 100644 --- a/tests/integration/api_gpg_keys_test.go +++ b/tests/integration/api_gpg_keys_test.go @@ -9,9 +9,9 @@ import ( "strconv" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_helper_for_declarative_test.go b/tests/integration/api_helper_for_declarative_test.go index 77ce392b4b..f9d36d2998 100644 --- a/tests/integration/api_helper_for_declarative_test.go +++ b/tests/integration/api_helper_for_declarative_test.go @@ -12,13 +12,13 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/queue" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/forms" + "gitea.dev/models/auth" + "gitea.dev/models/perm" + repo_model "gitea.dev/models/repo" + "gitea.dev/modules/json" + "gitea.dev/modules/queue" + api "gitea.dev/modules/structs" + "gitea.dev/services/forms" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_httpsig_test.go b/tests/integration/api_httpsig_test.go index 284307597b..a011a55c54 100644 --- a/tests/integration/api_httpsig_test.go +++ b/tests/integration/api_httpsig_test.go @@ -9,11 +9,11 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/42wim/httpsig" "golang.org/x/crypto/ssh" diff --git a/tests/integration/api_issue_attachment_test.go b/tests/integration/api_issue_attachment_test.go index 3475c37ee4..eb0db16007 100644 --- a/tests/integration/api_issue_attachment_test.go +++ b/tests/integration/api_issue_attachment_test.go @@ -10,13 +10,13 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_config_test.go b/tests/integration/api_issue_config_test.go index 06b972d7ee..4227f33237 100644 --- a/tests/integration/api_issue_config_test.go +++ b/tests/integration/api_issue_config_test.go @@ -8,15 +8,15 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" ) func createIssueConfig(t *testing.T, user *user_model.User, repo *repo_model.Repository, issueConfig map[string]any) { diff --git a/tests/integration/api_issue_dependency_test.go b/tests/integration/api_issue_dependency_test.go index fc2615be42..a6a9be34bc 100644 --- a/tests/integration/api_issue_dependency_test.go +++ b/tests/integration/api_issue_dependency_test.go @@ -8,18 +8,18 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + issues_model "gitea.dev/models/issues" + "gitea.dev/models/perm" + access_model "gitea.dev/models/perm/access" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unit" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + repo_service "gitea.dev/services/repository" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_label_test.go b/tests/integration/api_issue_label_test.go index 0e522d3e83..611b5da6cc 100644 --- a/tests/integration/api_issue_label_test.go +++ b/tests/integration/api_issue_label_test.go @@ -9,12 +9,12 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + auth_model "gitea.dev/models/auth" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_lock_test.go b/tests/integration/api_issue_lock_test.go index 47b1f2cf0d..86f7b0eab2 100644 --- a/tests/integration/api_issue_lock_test.go +++ b/tests/integration/api_issue_lock_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_milestone_test.go b/tests/integration/api_issue_milestone_test.go index 7f16db163d..b5526bf0d0 100644 --- a/tests/integration/api_issue_milestone_test.go +++ b/tests/integration/api_issue_milestone_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_pin_test.go b/tests/integration/api_issue_pin_test.go index 47026449d7..3b10ee4087 100644 --- a/tests/integration/api_issue_pin_test.go +++ b/tests/integration/api_issue_pin_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_reaction_test.go b/tests/integration/api_issue_reaction_test.go index 503caf8a72..daa7bb4d17 100644 --- a/tests/integration/api_issue_reaction_test.go +++ b/tests/integration/api_issue_reaction_test.go @@ -9,14 +9,14 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/services/convert" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_stopwatch_test.go b/tests/integration/api_issue_stopwatch_test.go index 970597bd8f..225c64e594 100644 --- a/tests/integration/api_issue_stopwatch_test.go +++ b/tests/integration/api_issue_stopwatch_test.go @@ -7,13 +7,13 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_subscription_test.go b/tests/integration/api_issue_subscription_test.go index b257c5336a..34fe8c2a69 100644 --- a/tests/integration/api_issue_subscription_test.go +++ b/tests/integration/api_issue_subscription_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_templates_test.go b/tests/integration/api_issue_templates_test.go index e9b28f65ec..5ed4023b72 100644 --- a/tests/integration/api_issue_templates_test.go +++ b/tests/integration/api_issue_templates_test.go @@ -8,12 +8,12 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_test.go b/tests/integration/api_issue_test.go index b8728ef09f..67a7e2b590 100644 --- a/tests/integration/api_issue_test.go +++ b/tests/integration/api_issue_test.go @@ -12,15 +12,15 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_tracked_time_test.go b/tests/integration/api_issue_tracked_time_test.go index 2bb9d765a6..fcbe4dfa51 100644 --- a/tests/integration/api_issue_tracked_time_test.go +++ b/tests/integration/api_issue_tracked_time_test.go @@ -9,12 +9,12 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + issues_model "gitea.dev/models/issues" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_keys_test.go b/tests/integration/api_keys_test.go index 7ea273ac16..d2c5d38928 100644 --- a/tests/integration/api_keys_test.go +++ b/tests/integration/api_keys_test.go @@ -9,14 +9,14 @@ import ( "net/url" "testing" - asymkey_model "code.gitea.io/gitea/models/asymkey" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + asymkey_model "gitea.dev/models/asymkey" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/perm" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_label_templates_test.go b/tests/integration/api_label_templates_test.go index bb070fc159..66d4b86426 100644 --- a/tests/integration/api_label_templates_test.go +++ b/tests/integration/api_label_templates_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - repo_module "code.gitea.io/gitea/modules/repository" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + repo_module "gitea.dev/modules/repository" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_license_templates_test.go b/tests/integration/api_license_templates_test.go index f4be227693..2f3d3b0830 100644 --- a/tests/integration/api_license_templates_test.go +++ b/tests/integration/api_license_templates_test.go @@ -8,11 +8,11 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/modules/options" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + "gitea.dev/modules/options" + repo_module "gitea.dev/modules/repository" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_notification_test.go b/tests/integration/api_notification_test.go index 4b3147ec01..2a856d4da4 100644 --- a/tests/integration/api_notification_test.go +++ b/tests/integration/api_notification_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - activities_model "code.gitea.io/gitea/models/activities" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + activities_model "gitea.dev/models/activities" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_oauth2_apps_test.go b/tests/integration/api_oauth2_apps_test.go index 32b732b2a8..fde89dd303 100644 --- a/tests/integration/api_oauth2_apps_test.go +++ b/tests/integration/api_oauth2_apps_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_org_avatar_test.go b/tests/integration/api_org_avatar_test.go index 62c54e6706..e6137a342e 100644 --- a/tests/integration/api_org_avatar_test.go +++ b/tests/integration/api_org_avatar_test.go @@ -10,10 +10,10 @@ import ( "path/filepath" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_org_test.go b/tests/integration/api_org_test.go index fb2e1712c6..3306c6539c 100644 --- a/tests/integration/api_org_test.go +++ b/tests/integration/api_org_test.go @@ -10,17 +10,17 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - org_model "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + org_model "gitea.dev/models/organization" + "gitea.dev/models/perm" + repo_model "gitea.dev/models/repo" + unit_model "gitea.dev/models/unit" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_alpine_test.go b/tests/integration/api_packages_alpine_test.go index 3395fad213..0fe158e7f0 100644 --- a/tests/integration/api_packages_alpine_test.go +++ b/tests/integration/api_packages_alpine_test.go @@ -14,12 +14,12 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - alpine_module "code.gitea.io/gitea/modules/packages/alpine" - alpine_service "code.gitea.io/gitea/services/packages/alpine" - "code.gitea.io/gitea/tests" + "gitea.dev/models/packages" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + alpine_module "gitea.dev/modules/packages/alpine" + alpine_service "gitea.dev/services/packages/alpine" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_arch_test.go b/tests/integration/api_packages_arch_test.go index 4acb745156..ece8b27f4c 100644 --- a/tests/integration/api_packages_arch_test.go +++ b/tests/integration/api_packages_arch_test.go @@ -12,13 +12,13 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - arch_module "code.gitea.io/gitea/modules/packages/arch" - "code.gitea.io/gitea/modules/test" - arch_service "code.gitea.io/gitea/services/packages/arch" - "code.gitea.io/gitea/tests" + "gitea.dev/models/packages" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + arch_module "gitea.dev/modules/packages/arch" + "gitea.dev/modules/test" + arch_service "gitea.dev/services/packages/arch" + "gitea.dev/tests" "github.com/klauspost/compress/zstd" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_packages_cargo_test.go b/tests/integration/api_packages_cargo_test.go index 055d56fe79..37693ecfdc 100644 --- a/tests/integration/api_packages_cargo_test.go +++ b/tests/integration/api_packages_cargo_test.go @@ -12,17 +12,17 @@ import ( neturl "net/url" "testing" - "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - cargo_module "code.gitea.io/gitea/modules/packages/cargo" - "code.gitea.io/gitea/modules/setting" - cargo_router "code.gitea.io/gitea/routers/api/packages/cargo" - cargo_service "code.gitea.io/gitea/services/packages/cargo" - "code.gitea.io/gitea/tests" + "gitea.dev/models/packages" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/gitrepo" + "gitea.dev/modules/json" + cargo_module "gitea.dev/modules/packages/cargo" + "gitea.dev/modules/setting" + cargo_router "gitea.dev/routers/api/packages/cargo" + cargo_service "gitea.dev/services/packages/cargo" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_chef_test.go b/tests/integration/api_packages_chef_test.go index cceed8566b..f179baac3d 100644 --- a/tests/integration/api_packages_chef_test.go +++ b/tests/integration/api_packages_chef_test.go @@ -25,13 +25,13 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - chef_module "code.gitea.io/gitea/modules/packages/chef" - "code.gitea.io/gitea/modules/setting" - chef_router "code.gitea.io/gitea/routers/api/packages/chef" - "code.gitea.io/gitea/tests" + "gitea.dev/models/packages" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + chef_module "gitea.dev/modules/packages/chef" + "gitea.dev/modules/setting" + chef_router "gitea.dev/routers/api/packages/chef" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_composer_test.go b/tests/integration/api_packages_composer_test.go index f8af50b070..cfc42f9e18 100644 --- a/tests/integration/api_packages_composer_test.go +++ b/tests/integration/api_packages_composer_test.go @@ -10,15 +10,15 @@ import ( neturl "net/url" "testing" - "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - composer_module "code.gitea.io/gitea/modules/packages/composer" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers/api/packages/composer" - "code.gitea.io/gitea/tests" + "gitea.dev/models/packages" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + composer_module "gitea.dev/modules/packages/composer" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/routers/api/packages/composer" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_conan_test.go b/tests/integration/api_packages_conan_test.go index 7422e8f518..27d57fc479 100644 --- a/tests/integration/api_packages_conan_test.go +++ b/tests/integration/api_packages_conan_test.go @@ -11,16 +11,16 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/packages" - conan_model "code.gitea.io/gitea/models/packages/conan" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - conan_module "code.gitea.io/gitea/modules/packages/conan" - "code.gitea.io/gitea/modules/setting" - conan_router "code.gitea.io/gitea/routers/api/packages/conan" - package_service "code.gitea.io/gitea/services/packages" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/packages" + conan_model "gitea.dev/models/packages/conan" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + conan_module "gitea.dev/modules/packages/conan" + "gitea.dev/modules/setting" + conan_router "gitea.dev/routers/api/packages/conan" + package_service "gitea.dev/services/packages" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_conda_test.go b/tests/integration/api_packages_conda_test.go index 874fc4657f..23f88abff4 100644 --- a/tests/integration/api_packages_conda_test.go +++ b/tests/integration/api_packages_conda_test.go @@ -11,13 +11,13 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - conda_module "code.gitea.io/gitea/modules/packages/conda" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/zstd" - "code.gitea.io/gitea/tests" + "gitea.dev/models/packages" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + conda_module "gitea.dev/modules/packages/conda" + "gitea.dev/modules/test" + "gitea.dev/modules/zstd" + "gitea.dev/tests" "github.com/dsnet/compress/bzip2" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_packages_container_test.go b/tests/integration/api_packages_container_test.go index c327f76305..298064de57 100644 --- a/tests/integration/api_packages_container_test.go +++ b/tests/integration/api_packages_container_test.go @@ -15,16 +15,16 @@ import ( "sync" "testing" - auth_model "code.gitea.io/gitea/models/auth" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - container_module "code.gitea.io/gitea/modules/packages/container" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - package_service "code.gitea.io/gitea/services/packages" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + packages_model "gitea.dev/models/packages" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + container_module "gitea.dev/modules/packages/container" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + package_service "gitea.dev/services/packages" + "gitea.dev/tests" oci "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_packages_cran_test.go b/tests/integration/api_packages_cran_test.go index d21ffb8879..f1c2c63ce3 100644 --- a/tests/integration/api_packages_cran_test.go +++ b/tests/integration/api_packages_cran_test.go @@ -11,12 +11,12 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - cran_module "code.gitea.io/gitea/modules/packages/cran" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "gitea.dev/models/packages" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + cran_module "gitea.dev/modules/packages/cran" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_debian_test.go b/tests/integration/api_packages_debian_test.go index 663bfb9e67..76b59199d3 100644 --- a/tests/integration/api_packages_debian_test.go +++ b/tests/integration/api_packages_debian_test.go @@ -14,13 +14,13 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - debian_module "code.gitea.io/gitea/modules/packages/debian" - packages_cleanup_service "code.gitea.io/gitea/services/packages/cleanup" - "code.gitea.io/gitea/tests" + "gitea.dev/models/packages" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/base" + debian_module "gitea.dev/modules/packages/debian" + packages_cleanup_service "gitea.dev/services/packages/cleanup" + "gitea.dev/tests" "github.com/blakesmith/ar" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_packages_generic_test.go b/tests/integration/api_packages_generic_test.go index 8ff51033c7..f9a933b09f 100644 --- a/tests/integration/api_packages_generic_test.go +++ b/tests/integration/api_packages_generic_test.go @@ -12,12 +12,12 @@ import ( neturl "net/url" "testing" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "gitea.dev/models/packages" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_goproxy_test.go b/tests/integration/api_packages_goproxy_test.go index a91a665545..615aaed532 100644 --- a/tests/integration/api_packages_goproxy_test.go +++ b/tests/integration/api_packages_goproxy_test.go @@ -10,11 +10,11 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "gitea.dev/models/packages" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_helm_test.go b/tests/integration/api_packages_helm_test.go index 02df4ae906..f66676b81d 100644 --- a/tests/integration/api_packages_helm_test.go +++ b/tests/integration/api_packages_helm_test.go @@ -12,15 +12,15 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - helm_module "code.gitea.io/gitea/modules/packages/helm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "gitea.dev/models/packages" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + helm_module "gitea.dev/modules/packages/helm" + "gitea.dev/modules/setting" + "gitea.dev/tests" "github.com/stretchr/testify/assert" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" ) func TestPackageHelm(t *testing.T) { diff --git a/tests/integration/api_packages_maven_test.go b/tests/integration/api_packages_maven_test.go index bad74dc597..65d6844bbd 100644 --- a/tests/integration/api_packages_maven_test.go +++ b/tests/integration/api_packages_maven_test.go @@ -12,12 +12,12 @@ import ( "sync" "testing" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/packages/maven" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "gitea.dev/models/packages" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/packages/maven" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_npm_test.go b/tests/integration/api_packages_npm_test.go index 8fb892cc86..1159b64da8 100644 --- a/tests/integration/api_packages_npm_test.go +++ b/tests/integration/api_packages_npm_test.go @@ -11,14 +11,14 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/packages/npm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/packages" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/packages/npm" + "gitea.dev/modules/setting" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -304,7 +304,7 @@ func TestPackageNpm(t *testing.T) { resp := MakeRequest(t, req, http.StatusOK) doc := NewHTMLParser(t, resp.Body) rendered, _ := doc.Find(".markup.markdown").Html() - assert.Equal(t, `

docs + assertHTMLEq(t, `

docs logo

`, rendered) }) diff --git a/tests/integration/api_packages_nuget_test.go b/tests/integration/api_packages_nuget_test.go index 47aa069f79..be5b446306 100644 --- a/tests/integration/api_packages_nuget_test.go +++ b/tests/integration/api_packages_nuget_test.go @@ -18,17 +18,17 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - nuget_module "code.gitea.io/gitea/modules/packages/nuget" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers/api/packages/nuget" - packageService "code.gitea.io/gitea/services/packages" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/packages" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + nuget_module "gitea.dev/modules/packages/nuget" + "gitea.dev/modules/setting" + "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/routers/api/packages/nuget" + packageService "gitea.dev/services/packages" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_pub_test.go b/tests/integration/api_packages_pub_test.go index 9873248a43..b5829b6832 100644 --- a/tests/integration/api_packages_pub_test.go +++ b/tests/integration/api_packages_pub_test.go @@ -15,12 +15,12 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - pub_module "code.gitea.io/gitea/modules/packages/pub" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/packages" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + pub_module "gitea.dev/modules/packages/pub" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_pypi_test.go b/tests/integration/api_packages_pypi_test.go index 67786b3e03..cae33f55c6 100644 --- a/tests/integration/api_packages_pypi_test.go +++ b/tests/integration/api_packages_pypi_test.go @@ -13,11 +13,11 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/packages/pypi" - "code.gitea.io/gitea/tests" + "gitea.dev/models/packages" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/packages/pypi" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_rpm_test.go b/tests/integration/api_packages_rpm_test.go index 493964ebbc..5b2b5bb0c6 100644 --- a/tests/integration/api_packages_rpm_test.go +++ b/tests/integration/api_packages_rpm_test.go @@ -16,13 +16,13 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - rpm_module "code.gitea.io/gitea/modules/packages/rpm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "gitea.dev/models/packages" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/json" + rpm_module "gitea.dev/modules/packages/rpm" + "gitea.dev/modules/setting" + "gitea.dev/tests" "github.com/ProtonMail/go-crypto/openpgp" "github.com/sassoftware/go-rpmutils" diff --git a/tests/integration/api_packages_rubygems_test.go b/tests/integration/api_packages_rubygems_test.go index 6236f13714..252cdf6b05 100644 --- a/tests/integration/api_packages_rubygems_test.go +++ b/tests/integration/api_packages_rubygems_test.go @@ -15,11 +15,11 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/packages/rubygems" - "code.gitea.io/gitea/tests" + "gitea.dev/models/packages" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/packages/rubygems" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_swift_test.go b/tests/integration/api_packages_swift_test.go index aa5b93f67b..83452244e3 100644 --- a/tests/integration/api_packages_swift_test.go +++ b/tests/integration/api_packages_swift_test.go @@ -12,14 +12,14 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - swift_module "code.gitea.io/gitea/modules/packages/swift" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - swift_router "code.gitea.io/gitea/routers/api/packages/swift" - "code.gitea.io/gitea/tests" + "gitea.dev/models/packages" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + swift_module "gitea.dev/modules/packages/swift" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + swift_router "gitea.dev/routers/api/packages/swift" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_terraform_test.go b/tests/integration/api_packages_terraform_test.go index 3f39aa5bfc..c823923692 100644 --- a/tests/integration/api_packages_terraform_test.go +++ b/tests/integration/api_packages_terraform_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + "gitea.dev/models/packages" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/tests" "github.com/google/uuid" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_packages_test.go b/tests/integration/api_packages_test.go index f49cbb9a25..6dba3e125e 100644 --- a/tests/integration/api_packages_test.go +++ b/tests/integration/api_packages_test.go @@ -12,19 +12,19 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - container_module "code.gitea.io/gitea/modules/packages/container" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - packages_service "code.gitea.io/gitea/services/packages" - packages_cleanup_service "code.gitea.io/gitea/services/packages/cleanup" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + packages_model "gitea.dev/models/packages" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + container_module "gitea.dev/modules/packages/container" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/util" + packages_service "gitea.dev/services/packages" + packages_cleanup_service "gitea.dev/services/packages/cleanup" + repo_service "gitea.dev/services/repository" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_vagrant_test.go b/tests/integration/api_packages_vagrant_test.go index 86c1f06611..ebdfd078c7 100644 --- a/tests/integration/api_packages_vagrant_test.go +++ b/tests/integration/api_packages_vagrant_test.go @@ -12,13 +12,13 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - vagrant_module "code.gitea.io/gitea/modules/packages/vagrant" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/packages" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/json" + vagrant_module "gitea.dev/modules/packages/vagrant" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_private_serv_test.go b/tests/integration/api_private_serv_test.go index 43bf9c02ad..fcac2174af 100644 --- a/tests/integration/api_private_serv_test.go +++ b/tests/integration/api_private_serv_test.go @@ -8,9 +8,9 @@ import ( "net/url" "testing" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/modules/private" + asymkey_model "gitea.dev/models/asymkey" + "gitea.dev/models/perm" + "gitea.dev/modules/private" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_public_only_test.go b/tests/integration/api_public_only_test.go index 40cda8cbaf..13a764fcc5 100644 --- a/tests/integration/api_public_only_test.go +++ b/tests/integration/api_public_only_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_pull_commits_test.go b/tests/integration/api_pull_commits_test.go index fd077b1e7c..3c32604622 100644 --- a/tests/integration/api_pull_commits_test.go +++ b/tests/integration/api_pull_commits_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_pull_review_test.go b/tests/integration/api_pull_review_test.go index 8107b7fd19..f7c7bdde16 100644 --- a/tests/integration/api_pull_review_test.go +++ b/tests/integration/api_pull_review_test.go @@ -8,19 +8,19 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + issues_model "gitea.dev/models/issues" + access_model "gitea.dev/models/perm/access" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/gitrepo" + "gitea.dev/modules/json" + api "gitea.dev/modules/structs" + issue_service "gitea.dev/services/issue" + pull_service "gitea.dev/services/pull" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_pull_test.go b/tests/integration/api_pull_test.go index 9d3a25642a..e9ccbe4583 100644 --- a/tests/integration/api_pull_test.go +++ b/tests/integration/api_pull_test.go @@ -13,24 +13,24 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/gitdiff" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + issues_model "gitea.dev/models/issues" + "gitea.dev/models/perm" + repo_model "gitea.dev/models/repo" + unit_model "gitea.dev/models/unit" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/util" + "gitea.dev/services/convert" + "gitea.dev/services/forms" + "gitea.dev/services/gitdiff" + issue_service "gitea.dev/services/issue" + pull_service "gitea.dev/services/pull" + repo_service "gitea.dev/services/repository" + files_service "gitea.dev/services/repository/files" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_releases_attachment_test.go b/tests/integration/api_releases_attachment_test.go index f6698fbb5e..c94ece4386 100644 --- a/tests/integration/api_releases_attachment_test.go +++ b/tests/integration/api_releases_attachment_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_releases_test.go b/tests/integration/api_releases_test.go index 7135f2ca36..51cf3e2364 100644 --- a/tests/integration/api_releases_test.go +++ b/tests/integration/api_releases_test.go @@ -14,17 +14,17 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + access_model "gitea.dev/models/perm/access" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/gitrepo" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_archive_test.go b/tests/integration/api_repo_archive_test.go index 97c2c0d54b..6e12c55ac7 100644 --- a/tests/integration/api_repo_archive_test.go +++ b/tests/integration/api_repo_archive_test.go @@ -11,13 +11,13 @@ import ( "regexp" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/perm" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unit" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_avatar_test.go b/tests/integration/api_repo_avatar_test.go index e4d0e06d00..cab8258449 100644 --- a/tests/integration/api_repo_avatar_test.go +++ b/tests/integration/api_repo_avatar_test.go @@ -11,13 +11,13 @@ import ( "path/filepath" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_branch_test.go b/tests/integration/api_repo_branch_test.go index c5822456e8..188da619fb 100644 --- a/tests/integration/api_repo_branch_test.go +++ b/tests/integration/api_repo_branch_test.go @@ -11,14 +11,14 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/json" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_collaborator_test.go b/tests/integration/api_repo_collaborator_test.go index f5474b1ed8..00afa3ea47 100644 --- a/tests/integration/api_repo_collaborator_test.go +++ b/tests/integration/api_repo_collaborator_test.go @@ -7,13 +7,13 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/perm" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_compare_test.go b/tests/integration/api_repo_compare_test.go index 8aa0035b0a..0d8cec7776 100644 --- a/tests/integration/api_repo_compare_test.go +++ b/tests/integration/api_repo_compare_test.go @@ -8,12 +8,12 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_edit_test.go b/tests/integration/api_repo_edit_test.go index b1d0d64f80..d30063bdf9 100644 --- a/tests/integration/api_repo_edit_test.go +++ b/tests/integration/api_repo_edit_test.go @@ -10,15 +10,15 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - api "code.gitea.io/gitea/modules/structs" - mirror_service "code.gitea.io/gitea/services/mirror" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + unit_model "gitea.dev/models/unit" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/gitrepo" + api "gitea.dev/modules/structs" + mirror_service "gitea.dev/services/mirror" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_file_create_test.go b/tests/integration/api_repo_file_create_test.go index 26cc0aad0e..107a039e9d 100644 --- a/tests/integration/api_repo_file_create_test.go +++ b/tests/integration/api_repo_file_create_test.go @@ -12,14 +12,14 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/gitrepo" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/services/context" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_file_delete_test.go b/tests/integration/api_repo_file_delete_test.go index 96ca39dab9..293977f6bf 100644 --- a/tests/integration/api_repo_file_delete_test.go +++ b/tests/integration/api_repo_file_delete_test.go @@ -9,11 +9,11 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_file_diffpatch_test.go b/tests/integration/api_repo_file_diffpatch_test.go index 928ea3bfb8..fdae6c910a 100644 --- a/tests/integration/api_repo_file_diffpatch_test.go +++ b/tests/integration/api_repo_file_diffpatch_test.go @@ -9,11 +9,11 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_file_get_test.go b/tests/integration/api_repo_file_get_test.go index 0f9e57cee4..267983409d 100644 --- a/tests/integration/api_repo_file_get_test.go +++ b/tests/integration/api_repo_file_get_test.go @@ -8,8 +8,8 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_file_helpers.go b/tests/integration/api_repo_file_helpers.go index 9a4c448664..e5cf8b9228 100644 --- a/tests/integration/api_repo_file_helpers.go +++ b/tests/integration/api_repo_file_helpers.go @@ -9,11 +9,11 @@ import ( "strings" "testing" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - files_service "code.gitea.io/gitea/services/repository/files" + repo_model "gitea.dev/models/repo" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/modules/util" + files_service "gitea.dev/services/repository/files" "github.com/stretchr/testify/require" ) diff --git a/tests/integration/api_repo_file_update_test.go b/tests/integration/api_repo_file_update_test.go index 4098beeefd..d2a191e12a 100644 --- a/tests/integration/api_repo_file_update_test.go +++ b/tests/integration/api_repo_file_update_test.go @@ -11,14 +11,14 @@ import ( "path" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/gitrepo" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/services/context" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_files_change_test.go b/tests/integration/api_repo_files_change_test.go index d518944083..c0306feae3 100644 --- a/tests/integration/api_repo_files_change_test.go +++ b/tests/integration/api_repo_files_change_test.go @@ -10,14 +10,14 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/gitrepo" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/services/context" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_files_get_test.go b/tests/integration/api_repo_files_get_test.go index 3d299cd655..3fbdce9f68 100644 --- a/tests/integration/api_repo_files_get_test.go +++ b/tests/integration/api_repo_files_get_test.go @@ -9,17 +9,17 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/gitrepo" + "gitea.dev/modules/json" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/modules/util" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_get_contents_list_test.go b/tests/integration/api_repo_get_contents_list_test.go index 0b8bc5a8dc..52a3a163f1 100644 --- a/tests/integration/api_repo_get_contents_list_test.go +++ b/tests/integration/api_repo_get_contents_list_test.go @@ -10,14 +10,14 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - repo_service "code.gitea.io/gitea/services/repository" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/gitrepo" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + repo_service "gitea.dev/services/repository" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_get_contents_test.go b/tests/integration/api_repo_get_contents_test.go index bc9a17ff8d..61d4bba1a4 100644 --- a/tests/integration/api_repo_get_contents_test.go +++ b/tests/integration/api_repo_get_contents_test.go @@ -11,14 +11,14 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - repo_service "code.gitea.io/gitea/services/repository" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/gitrepo" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + repo_service "gitea.dev/services/repository" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_git_blobs_test.go b/tests/integration/api_repo_git_blobs_test.go index d8270ad9f3..887a736684 100644 --- a/tests/integration/api_repo_git_blobs_test.go +++ b/tests/integration/api_repo_git_blobs_test.go @@ -7,12 +7,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_git_commits_test.go b/tests/integration/api_repo_git_commits_test.go index 2c09026c90..504d8e933c 100644 --- a/tests/integration/api_repo_git_commits_test.go +++ b/tests/integration/api_repo_git_commits_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_git_hook_test.go b/tests/integration/api_repo_git_hook_test.go index d8254c6c61..01a17c7b08 100644 --- a/tests/integration/api_repo_git_hook_test.go +++ b/tests/integration/api_repo_git_hook_test.go @@ -8,14 +8,14 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_git_notes_test.go b/tests/integration/api_repo_git_notes_test.go index 912b4f75c7..8cb531e792 100644 --- a/tests/integration/api_repo_git_notes_test.go +++ b/tests/integration/api_repo_git_notes_test.go @@ -8,10 +8,10 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_git_ref_test.go b/tests/integration/api_repo_git_ref_test.go index 875752ae3f..fc43c4eac6 100644 --- a/tests/integration/api_repo_git_ref_test.go +++ b/tests/integration/api_repo_git_ref_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/tests" ) func TestAPIReposGitRefs(t *testing.T) { diff --git a/tests/integration/api_repo_git_tags_test.go b/tests/integration/api_repo_git_tags_test.go index 9ce1fb6fc1..33a2d6c7e8 100644 --- a/tests/integration/api_repo_git_tags_test.go +++ b/tests/integration/api_repo_git_tags_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/gitrepo" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_git_trees_test.go b/tests/integration/api_repo_git_trees_test.go index 5cfce1044d..f452892779 100644 --- a/tests/integration/api_repo_git_trees_test.go +++ b/tests/integration/api_repo_git_trees_test.go @@ -7,12 +7,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_hook_test.go b/tests/integration/api_repo_hook_test.go index e34b3f80f9..72972aa8cd 100644 --- a/tests/integration/api_repo_hook_test.go +++ b/tests/integration/api_repo_hook_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_languages_test.go b/tests/integration/api_repo_languages_test.go index 89744067d7..7d16fe4a9d 100644 --- a/tests/integration/api_repo_languages_test.go +++ b/tests/integration/api_repo_languages_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/test" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_lfs_locks_test.go b/tests/integration/api_repo_lfs_locks_test.go index 0b48bd00cc..f1a38334c1 100644 --- a/tests/integration/api_repo_lfs_locks_test.go +++ b/tests/integration/api_repo_lfs_locks_test.go @@ -9,14 +9,14 @@ import ( "testing" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/lfs" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_lfs_migrate_test.go b/tests/integration/api_repo_lfs_migrate_test.go index 7036c6dfbe..5a92d6dea6 100644 --- a/tests/integration/api_repo_lfs_migrate_test.go +++ b/tests/integration/api_repo_lfs_migrate_test.go @@ -8,15 +8,15 @@ import ( "path" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/services/migrations" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/lfs" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/services/migrations" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_lfs_test.go b/tests/integration/api_repo_lfs_test.go index 0f13bb23a8..5dc8671e2a 100644 --- a/tests/integration/api_repo_lfs_test.go +++ b/tests/integration/api_repo_lfs_test.go @@ -11,16 +11,16 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + git_model "gitea.dev/models/git" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/json" + "gitea.dev/modules/lfs" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_license_test.go b/tests/integration/api_repo_license_test.go index 31358a1e3f..33a0444a36 100644 --- a/tests/integration/api_repo_license_test.go +++ b/tests/integration/api_repo_license_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" + auth_model "gitea.dev/models/auth" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_raw_test.go b/tests/integration/api_repo_raw_test.go index e9d741925f..106ed001fe 100644 --- a/tests/integration/api_repo_raw_test.go +++ b/tests/integration/api_repo_raw_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_secrets_test.go b/tests/integration/api_repo_secrets_test.go index dc37e2beb6..580b4736b1 100644 --- a/tests/integration/api_repo_secrets_test.go +++ b/tests/integration/api_repo_secrets_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/tests" ) func TestAPIRepoSecrets(t *testing.T) { diff --git a/tests/integration/api_repo_tags_test.go b/tests/integration/api_repo_tags_test.go index 13718040ce..55b25c4034 100644 --- a/tests/integration/api_repo_tags_test.go +++ b/tests/integration/api_repo_tags_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_teams_test.go b/tests/integration/api_repo_teams_test.go index 042712165b..506270e3ac 100644 --- a/tests/integration/api_repo_teams_test.go +++ b/tests/integration/api_repo_teams_test.go @@ -8,14 +8,14 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unit" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/modules/util" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_test.go b/tests/integration/api_repo_test.go index 406c82e475..45d904c261 100644 --- a/tests/integration/api_repo_test.go +++ b/tests/integration/api_repo_test.go @@ -9,18 +9,18 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/services/migrations" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + access_model "gitea.dev/models/perm/access" + repo_model "gitea.dev/models/repo" + unit_model "gitea.dev/models/unit" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/services/migrations" + repo_service "gitea.dev/services/repository" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_topic_test.go b/tests/integration/api_repo_topic_test.go index d0e490d0c9..650e9df4e9 100644 --- a/tests/integration/api_repo_topic_test.go +++ b/tests/integration/api_repo_topic_test.go @@ -9,12 +9,12 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_variables_test.go b/tests/integration/api_repo_variables_test.go index b5c88af279..bedde0aa71 100644 --- a/tests/integration/api_repo_variables_test.go +++ b/tests/integration/api_repo_variables_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/tests" ) func TestAPIRepoVariables(t *testing.T) { diff --git a/tests/integration/api_settings_test.go b/tests/integration/api_settings_test.go index 89b9ae7509..e5c7b9ad5c 100644 --- a/tests/integration/api_settings_test.go +++ b/tests/integration/api_settings_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_team_test.go b/tests/integration/api_team_test.go index baf41ef460..7f35d59669 100644 --- a/tests/integration/api_team_test.go +++ b/tests/integration/api_team_test.go @@ -9,16 +9,16 @@ import ( "sort" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/organization" + "gitea.dev/models/perm" + "gitea.dev/models/repo" + "gitea.dev/models/unit" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/services/convert" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_team_user_test.go b/tests/integration/api_team_user_test.go index c5aad98b5b..46e7d9ad60 100644 --- a/tests/integration/api_team_user_test.go +++ b/tests/integration/api_team_user_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/services/convert" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_token_test.go b/tests/integration/api_token_test.go index 5535495841..a96fae2399 100644 --- a/tests/integration/api_token_test.go +++ b/tests/integration/api_token_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/log" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_twofa_test.go b/tests/integration/api_twofa_test.go index ae23d2b8ff..d8d8fa4497 100644 --- a/tests/integration/api_twofa_test.go +++ b/tests/integration/api_twofa_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/tests" "github.com/pquerna/otp/totp" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_user_avatar_test.go b/tests/integration/api_user_avatar_test.go index 8c002d7a33..8d82e7e1cb 100644 --- a/tests/integration/api_user_avatar_test.go +++ b/tests/integration/api_user_avatar_test.go @@ -10,10 +10,10 @@ import ( "path/filepath" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_block_test.go b/tests/integration/api_user_block_test.go index 5e0f06c26d..56dc81cc0f 100644 --- a/tests/integration/api_user_block_test.go +++ b/tests/integration/api_user_block_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_email_test.go b/tests/integration/api_user_email_test.go index 804f35aff3..74b4d22a38 100644 --- a/tests/integration/api_user_email_test.go +++ b/tests/integration/api_user_email_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_follow_test.go b/tests/integration/api_user_follow_test.go index 39aae37e6f..6a7b135b80 100644 --- a/tests/integration/api_user_follow_test.go +++ b/tests/integration/api_user_follow_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_heatmap_test.go b/tests/integration/api_user_heatmap_test.go index ed7113bf46..ebf6548a63 100644 --- a/tests/integration/api_user_heatmap_test.go +++ b/tests/integration/api_user_heatmap_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - activities_model "code.gitea.io/gitea/models/activities" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/tests" + activities_model "gitea.dev/models/activities" + auth_model "gitea.dev/models/auth" + "gitea.dev/modules/timeutil" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_info_test.go b/tests/integration/api_user_info_test.go index 93903eac74..7ca2a3fbf3 100644 --- a/tests/integration/api_user_info_test.go +++ b/tests/integration/api_user_info_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_org_perm_test.go b/tests/integration/api_user_org_perm_test.go index 4dc369d135..d31abdfeb3 100644 --- a/tests/integration/api_user_org_perm_test.go +++ b/tests/integration/api_user_org_perm_test.go @@ -8,9 +8,9 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_orgs_test.go b/tests/integration/api_user_orgs_test.go index 30e2578152..54291f4272 100644 --- a/tests/integration/api_user_orgs_test.go +++ b/tests/integration/api_user_orgs_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_public_only_test.go b/tests/integration/api_user_public_only_test.go index 5404477cda..be315072d7 100644 --- a/tests/integration/api_user_public_only_test.go +++ b/tests/integration/api_user_public_only_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/require" ) diff --git a/tests/integration/api_user_search_test.go b/tests/integration/api_user_search_test.go index 4b0fbcae20..2e8e552a1a 100644 --- a/tests/integration/api_user_search_test.go +++ b/tests/integration/api_user_search_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_secrets_test.go b/tests/integration/api_user_secrets_test.go index 0d2439c3cb..cfc42f3b6a 100644 --- a/tests/integration/api_user_secrets_test.go +++ b/tests/integration/api_user_secrets_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + api "gitea.dev/modules/structs" + "gitea.dev/tests" ) func TestAPIUserSecrets(t *testing.T) { diff --git a/tests/integration/api_user_star_test.go b/tests/integration/api_user_star_test.go index f6b43da4c4..056d4cd70f 100644 --- a/tests/integration/api_user_star_test.go +++ b/tests/integration/api_user_star_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_user_update_test.go b/tests/integration/api_user_update_test.go index af5481cfd5..a3cdc2558a 100644 --- a/tests/integration/api_user_update_test.go +++ b/tests/integration/api_user_update_test.go @@ -7,8 +7,8 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/tests" ) func TestAPIUpdateUser(t *testing.T) { diff --git a/tests/integration/api_user_variables_test.go b/tests/integration/api_user_variables_test.go index d430c9e21d..00805ae3fe 100644 --- a/tests/integration/api_user_variables_test.go +++ b/tests/integration/api_user_variables_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + api "gitea.dev/modules/structs" + "gitea.dev/tests" ) func TestAPIUserVariables(t *testing.T) { diff --git a/tests/integration/api_user_watch_test.go b/tests/integration/api_user_watch_test.go index 6916c5aa59..073eb0ed0b 100644 --- a/tests/integration/api_user_watch_test.go +++ b/tests/integration/api_user_watch_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_wiki_test.go b/tests/integration/api_wiki_test.go index 697a1a2ccb..2ae617c6cf 100644 --- a/tests/integration/api_wiki_test.go +++ b/tests/integration/api_wiki_test.go @@ -9,9 +9,9 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/attachment_test.go b/tests/integration/attachment_test.go index 7fee5d3b38..cb97d3c692 100644 --- a/tests/integration/attachment_test.go +++ b/tests/integration/attachment_test.go @@ -14,14 +14,14 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/web" - route_web "code.gitea.io/gitea/routers/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/modules/storage" + "gitea.dev/modules/test" + "gitea.dev/modules/web" + route_web "gitea.dev/routers/web" + "gitea.dev/services/context" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/auth_ldap_test.go b/tests/integration/auth_ldap_test.go index 43d593f16a..467d505943 100644 --- a/tests/integration/auth_ldap_test.go +++ b/tests/integration/auth_ldap_test.go @@ -11,19 +11,19 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/ldap" - org_service "code.gitea.io/gitea/services/org" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + "gitea.dev/models/organization" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/modules/translation" + "gitea.dev/modules/util" + "gitea.dev/services/auth" + "gitea.dev/services/auth/source/ldap" + org_service "gitea.dev/services/org" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/auth_oauth2_test.go b/tests/integration/auth_oauth2_test.go index e977a7dc48..bcd4981149 100644 --- a/tests/integration/auth_oauth2_test.go +++ b/tests/integration/auth_oauth2_test.go @@ -12,14 +12,14 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/services/auth/source/oauth2" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/json" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/services/auth/source/oauth2" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -130,8 +130,73 @@ func TestMigrateAzureADV2ToOIDC(t *testing.T) { }) } +func TestOIDCIgnoresStaleExternalLoginLinks(t *testing.T) { + defer tests.PrepareTestEnv(t)() + defer test.MockVariableValue(&setting.OAuth2Client.EnableAutoRegistration, true)() + defer test.MockVariableValue(&setting.OAuth2Client.AccountLinking, setting.OAuth2AccountLinkingAuto)() + defer test.MockVariableValue(&setting.OAuth2Client.Username, setting.OAuth2UsernameEmail)() + + setup := func(t *testing.T, sourceName, sub, userName, email string) (*auth_model.Source, *user_model.User) { + t.Helper() + srv := newFakeOIDCServerWithProfile(t, sub, sub+"-oid", email, "OIDC Test User") + addOAuth2Source(t, sourceName, oauth2.Source{ + Provider: "openidConnect", + ClientID: "test-client-id", + ClientSecret: "test-client-secret", + OpenIDConnectAutoDiscoveryURL: srv.URL + "/.well-known/openid-configuration", + }) + authSource, err := auth_model.GetActiveOAuth2SourceByAuthName(t.Context(), sourceName) + require.NoError(t, err) + correctUser := &user_model.User{Name: userName, Email: email} + require.NoError(t, user_model.CreateUser(t.Context(), correctUser, &user_model.Meta{})) + return authSource, correctUser + } + + // assertRelinked signs in via OIDC and asserts the stale link now points at the correct individual user. + assertRelinked := func(t *testing.T, authSource *auth_model.Source, sub string, correctUser *user_model.User) { + t.Helper() + doOIDCSignIn(t, authSource.Name) + // external_login_user has no "id" column, so order by the primary key instead + externalLink := unittest.AssertExistsAndLoadBean(t, &user_model.ExternalLoginUser{ExternalID: sub, LoginSourceID: authSource.ID}, unittest.OrderBy("external_id ASC")) + assert.Equal(t, correctUser.ID, externalLink.UserID) + assert.Equal(t, correctUser.Email, externalLink.Email) + assert.Equal(t, "OIDC Test User", externalLink.Name) + } + + t.Run("organization", func(t *testing.T) { + const sub, userName, email = "oidc-stale-org-link-sub", "guizar_m", "guizar_m@example.com" + authSource, correctUser := setup(t, "test-oidc-stale-org-link", sub, userName, email) + org := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3, Type: user_model.UserTypeOrganization}) + require.NoError(t, user_model.LinkExternalToUser(t.Context(), org, &user_model.ExternalLoginUser{ + ExternalID: sub, + UserID: org.ID, + LoginSourceID: authSource.ID, + Provider: authSource.Name, + })) + assertRelinked(t, authSource, sub, correctUser) + }) + + t.Run("deleted user", func(t *testing.T) { + const sub, userName, email = "oidc-stale-deleted-link-sub", "guizar_d", "guizar_d@example.com" + const deletedUserID = 999999 + authSource, correctUser := setup(t, "test-oidc-stale-deleted", sub, userName, email) + // link the external account to a user id that does not exist, simulating a deleted user + require.NoError(t, user_model.LinkExternalToUser(t.Context(), &user_model.User{ID: deletedUserID}, &user_model.ExternalLoginUser{ + ExternalID: sub, + UserID: deletedUserID, + LoginSourceID: authSource.ID, + Provider: authSource.Name, + })) + assertRelinked(t, authSource, sub, correctUser) + }) +} + // newFakeOIDCServer starts an httptest.Server that implements the minimum OIDC endpoints needed to complete a sign-in flow: func newFakeOIDCServer(t *testing.T, sub, oid string) *httptest.Server { + return newFakeOIDCServerWithProfile(t, sub, oid, sub+"@example.com", "OIDC Test User") +} + +func newFakeOIDCServerWithProfile(t *testing.T, sub, oid, email, name string) *httptest.Server { t.Helper() var srv *httptest.Server @@ -169,8 +234,8 @@ func newFakeOIDCServer(t *testing.T, sub, oid string) *httptest.Server { // sub MUST match the id_token sub; goth rejects mismatches. _ = json.NewEncoder(w).Encode(map[string]any{ "sub": sub, - "email": sub + "@example.com", - "name": "OIDC Test User", + "email": email, + "name": name, }) default: http.NotFound(w, r) diff --git a/tests/integration/branches_test.go b/tests/integration/branches_test.go index d37e170d96..22b1549252 100644 --- a/tests/integration/branches_test.go +++ b/tests/integration/branches_test.go @@ -8,8 +8,8 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/tests" + "gitea.dev/modules/translation" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/change_default_branch_test.go b/tests/integration/change_default_branch_test.go index 4a9ba6c4b5..bcc517cbe9 100644 --- a/tests/integration/change_default_branch_test.go +++ b/tests/integration/change_default_branch_test.go @@ -9,11 +9,11 @@ import ( "strconv" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/tests" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/gitrepo" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/cmd_keys_test.go b/tests/integration/cmd_keys_test.go index b71d023f72..91b0d1eea0 100644 --- a/tests/integration/cmd_keys_test.go +++ b/tests/integration/cmd_keys_test.go @@ -8,9 +8,9 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/cmd" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "gitea.dev/cmd" + "gitea.dev/modules/setting" + "gitea.dev/modules/util" "github.com/stretchr/testify/assert" "github.com/urfave/cli/v3" diff --git a/tests/integration/compare_test.go b/tests/integration/compare_test.go index 5e50fcf043..6c00b3fa0e 100644 --- a/tests/integration/compare_test.go +++ b/tests/integration/compare_test.go @@ -10,13 +10,13 @@ import ( "strings" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/test" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/test" + repo_service "gitea.dev/services/repository" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/config_instance_test.go b/tests/integration/config_instance_test.go index c9aa7ab745..a5def9c3c7 100644 --- a/tests/integration/config_instance_test.go +++ b/tests/integration/config_instance_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - system_model "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/setting/config" - "code.gitea.io/gitea/tests" + system_model "gitea.dev/models/system" + "gitea.dev/modules/json" + "gitea.dev/modules/setting" + "gitea.dev/modules/setting/config" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/cors_test.go b/tests/integration/cors_test.go index 25dfbabf41..6904886abd 100644 --- a/tests/integration/cors_test.go +++ b/tests/integration/cors_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/routers" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/create_no_session_test.go b/tests/integration/create_no_session_test.go index deb3ea020e..a03e7e4da5 100644 --- a/tests/integration/create_no_session_test.go +++ b/tests/integration/create_no_session_test.go @@ -10,11 +10,11 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + "gitea.dev/modules/json" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/routers" + "gitea.dev/tests" "gitea.com/go-chi/session" "github.com/stretchr/testify/assert" diff --git a/tests/integration/db_collation_test.go b/tests/integration/db_collation_test.go index 4f922f8a39..5380b91b23 100644 --- a/tests/integration/db_collation_test.go +++ b/tests/integration/db_collation_test.go @@ -6,10 +6,10 @@ package integration import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "gitea.dev/models/db" + "gitea.dev/models/unittest" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/delete_user_test.go b/tests/integration/delete_user_test.go index 0c31e928a3..68b3f985dc 100644 --- a/tests/integration/delete_user_test.go +++ b/tests/integration/delete_user_test.go @@ -7,13 +7,13 @@ import ( "net/http" "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + issues_model "gitea.dev/models/issues" + "gitea.dev/models/organization" + access_model "gitea.dev/models/perm/access" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/tests" ) func assertUserDeleted(t *testing.T, userID int64) { diff --git a/tests/integration/download_test.go b/tests/integration/download_test.go index 7270178f1f..1ec2a67c7a 100644 --- a/tests/integration/download_test.go +++ b/tests/integration/download_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/dump_restore_test.go b/tests/integration/dump_restore_test.go index f18994e693..92e0ed4664 100644 --- a/tests/integration/dump_restore_test.go +++ b/tests/integration/dump_restore_test.go @@ -13,18 +13,18 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/services/migrations" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + base "gitea.dev/modules/migration" + "gitea.dev/modules/setting" + "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/services/migrations" "github.com/stretchr/testify/assert" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" ) func TestDumpRestore(t *testing.T) { diff --git a/tests/integration/editor_test.go b/tests/integration/editor_test.go index 1b2476f43e..ea4900b823 100644 --- a/tests/integration/editor_test.go +++ b/tests/integration/editor_test.go @@ -16,15 +16,15 @@ import ( "strings" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/git" + "gitea.dev/modules/gitrepo" + "gitea.dev/modules/test" + "gitea.dev/modules/translation" + "gitea.dev/modules/util" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/empty_repo_test.go b/tests/integration/empty_repo_test.go index de2a2b7374..24b30e69ff 100644 --- a/tests/integration/empty_repo_test.go +++ b/tests/integration/empty_repo_test.go @@ -13,17 +13,17 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/json" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/modules/util" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/ephemeral_actions_runner_deletion_test.go b/tests/integration/ephemeral_actions_runner_deletion_test.go index 40f8c643a8..4922ddf579 100644 --- a/tests/integration/ephemeral_actions_runner_deletion_test.go +++ b/tests/integration/ephemeral_actions_runner_deletion_test.go @@ -6,13 +6,13 @@ package integration import ( "testing" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/util" - repo_service "code.gitea.io/gitea/services/repository" - user_service "code.gitea.io/gitea/services/user" - "code.gitea.io/gitea/tests" + actions_model "gitea.dev/models/actions" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/util" + repo_service "gitea.dev/services/repository" + user_service "gitea.dev/services/user" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/eventsource_test.go b/tests/integration/eventsource_test.go index e0dbd0b23f..5800afb1dc 100644 --- a/tests/integration/eventsource_test.go +++ b/tests/integration/eventsource_test.go @@ -9,14 +9,14 @@ import ( "testing" "time" - activities_model "code.gitea.io/gitea/models/activities" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/eventsource" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + activities_model "gitea.dev/models/activities" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/eventsource" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/explore_repos_test.go b/tests/integration/explore_repos_test.go index 1e3ab314fd..c8348d9c39 100644 --- a/tests/integration/explore_repos_test.go +++ b/tests/integration/explore_repos_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/explore_user_test.go b/tests/integration/explore_user_test.go index 441d89cea5..e9fddc71cf 100644 --- a/tests/integration/explore_user_test.go +++ b/tests/integration/explore_user_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/feed_repo_test.go b/tests/integration/feed_repo_test.go index 2915b9b3f4..59189bf070 100644 --- a/tests/integration/feed_repo_test.go +++ b/tests/integration/feed_repo_test.go @@ -8,7 +8,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/feed_user_test.go b/tests/integration/feed_user_test.go index 4315c67f48..87068c2f54 100644 --- a/tests/integration/feed_user_test.go +++ b/tests/integration/feed_user_test.go @@ -8,7 +8,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/git_general_test.go b/tests/integration/git_general_test.go index 9e43e8b5cd..30ccff49ab 100644 --- a/tests/integration/git_general_test.go +++ b/tests/integration/git_general_test.go @@ -20,19 +20,19 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/commitstatus" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + issues_model "gitea.dev/models/issues" + "gitea.dev/models/perm" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/commitstatus" + "gitea.dev/modules/git" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/lfs" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/kballard/go-shellquote" "github.com/stretchr/testify/assert" diff --git a/tests/integration/git_helper_for_declarative_test.go b/tests/integration/git_helper_for_declarative_test.go index 8c58e59115..3b374a094e 100644 --- a/tests/integration/git_helper_for_declarative_test.go +++ b/tests/integration/git_helper_for_declarative_test.go @@ -15,12 +15,12 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/ssh" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + "gitea.dev/modules/git" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/setting" + "gitea.dev/modules/ssh" + "gitea.dev/modules/util" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/git_lfs_ssh_test.go b/tests/integration/git_lfs_ssh_test.go index f940d84b81..e185c27a80 100644 --- a/tests/integration/git_lfs_ssh_test.go +++ b/tests/integration/git_lfs_ssh_test.go @@ -12,13 +12,13 @@ import ( "sync" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" + auth_model "gitea.dev/models/auth" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/modules/web" + "gitea.dev/routers/common" + "gitea.dev/services/context" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/git_misc_test.go b/tests/integration/git_misc_test.go index 71e35cceab..4747d2bd09 100644 --- a/tests/integration/git_misc_test.go +++ b/tests/integration/git_misc_test.go @@ -10,15 +10,15 @@ import ( "sync" "testing" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - files_service "code.gitea.io/gitea/services/repository/files" + auth_model "gitea.dev/models/auth" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/git" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/gitrepo" + files_service "gitea.dev/services/repository/files" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/git_push_test.go b/tests/integration/git_push_test.go index 5d54eaed12..eee80b191c 100644 --- a/tests/integration/git_push_test.go +++ b/tests/integration/git_push_test.go @@ -8,14 +8,14 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - repo_service "code.gitea.io/gitea/services/repository" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + git_model "gitea.dev/models/git" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/git" + "gitea.dev/modules/git/gitcmd" + repo_service "gitea.dev/services/repository" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/git_smart_http_test.go b/tests/integration/git_smart_http_test.go index c535838c8a..dfbda5c701 100644 --- a/tests/integration/git_smart_http_test.go +++ b/tests/integration/git_smart_http_test.go @@ -9,12 +9,12 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/git_ssh_redirect_test.go b/tests/integration/git_ssh_redirect_test.go index 3ae2652412..033c6cc0c0 100644 --- a/tests/integration/git_ssh_redirect_test.go +++ b/tests/integration/git_ssh_redirect_test.go @@ -9,8 +9,8 @@ import ( "os" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/structs" + auth_model "gitea.dev/models/auth" + "gitea.dev/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/goget_test.go b/tests/integration/goget_test.go index a1f4acf0c1..21ae6fb13b 100644 --- a/tests/integration/goget_test.go +++ b/tests/integration/goget_test.go @@ -8,9 +8,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/gpg_ssh_git_test.go b/tests/integration/gpg_ssh_git_test.go index a8ec79cd9d..3b9bc29d1d 100644 --- a/tests/integration/gpg_ssh_git_test.go +++ b/tests/integration/gpg_ssh_git_test.go @@ -15,14 +15,14 @@ import ( "path/filepath" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/process" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/armor" diff --git a/tests/integration/heatmap_test.go b/tests/integration/heatmap_test.go index 4e0c02dd0f..11387c80ff 100644 --- a/tests/integration/heatmap_test.go +++ b/tests/integration/heatmap_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/tests" + "gitea.dev/modules/timeutil" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/html_helper.go b/tests/integration/html_helper.go index c2045453e6..cefe5592c4 100644 --- a/tests/integration/html_helper.go +++ b/tests/integration/html_helper.go @@ -5,10 +5,13 @@ package integration import ( "io" + "slices" + "strings" "testing" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" + "golang.org/x/net/html" ) // HTMLDoc struct @@ -47,3 +50,39 @@ func AssertHTMLElement[T int | bool](t testing.TB, doc *HTMLDoc, selector string assert.Equal(t, v, sel.Length()) } } + +func assertHTMLEq(t testing.TB, expected, actual string) { + t.Helper() + if expected == actual { + return + } + exp, err := html.Parse(strings.NewReader(expected)) + if !assert.NoError(t, err) { + return + } + act, err := html.Parse(strings.NewReader(actual)) + if !assert.NoError(t, err) { + return + } + var normalize func(n *html.Node) + normalize = func(n *html.Node) { + slices.SortFunc(n.Attr, func(a, b html.Attribute) int { + if cmp := strings.Compare(a.Namespace, b.Namespace); cmp != 0 { + return cmp + } + if cmp := strings.Compare(a.Key, b.Key); cmp != 0 { + return cmp + } + return strings.Compare(a.Val, b.Val) + }) + for c := n.FirstChild; c != nil; c = c.NextSibling { + normalize(c) + } + } + normalize(exp) + normalize(act) + var expNormalized, actNormalized strings.Builder + assert.NoError(t, html.Render(&expNormalized, exp)) + assert.NoError(t, html.Render(&actNormalized, act)) + assert.Equal(t, expNormalized.String(), actNormalized.String()) +} diff --git a/tests/integration/incoming_email_test.go b/tests/integration/incoming_email_test.go index b82c67475a..08dec041e1 100644 --- a/tests/integration/incoming_email_test.go +++ b/tests/integration/incoming_email_test.go @@ -12,15 +12,15 @@ import ( "testing" "time" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/mailer/incoming" - incoming_payload "code.gitea.io/gitea/services/mailer/incoming/payload" - sender_service "code.gitea.io/gitea/services/mailer/sender" - token_service "code.gitea.io/gitea/services/mailer/token" - "code.gitea.io/gitea/tests" + issues_model "gitea.dev/models/issues" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + "gitea.dev/services/mailer/incoming" + incoming_payload "gitea.dev/services/mailer/incoming/payload" + sender_service "gitea.dev/services/mailer/sender" + token_service "gitea.dev/services/mailer/token" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go index 39de596de5..9c42366832 100644 --- a/tests/integration/integration_test.go +++ b/tests/integration/integration_test.go @@ -20,19 +20,19 @@ import ( "sync/atomic" "testing" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/testlogger" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/routers" - gitea_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/tests" + "gitea.dev/models/auth" + "gitea.dev/models/unittest" + "gitea.dev/modules/graceful" + "gitea.dev/modules/json" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/modules/testlogger" + "gitea.dev/modules/util" + "gitea.dev/modules/web" + "gitea.dev/modules/web/middleware" + "gitea.dev/routers" + gitea_context "gitea.dev/services/context" + "gitea.dev/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go index 5ce5eec0ce..aaeba60d8e 100644 --- a/tests/integration/issue_test.go +++ b/tests/integration/issue_test.go @@ -14,18 +14,18 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/indexer/issues" - "code.gitea.io/gitea/modules/references" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "gitea.dev/models/db" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unit" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/indexer/issues" + "gitea.dev/modules/references" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/issue_timetrack_test.go b/tests/integration/issue_timetrack_test.go index 0a3188fca0..9c3c22e8fd 100644 --- a/tests/integration/issue_timetrack_test.go +++ b/tests/integration/issue_timetrack_test.go @@ -8,9 +8,9 @@ import ( "net/http" "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/tests" + issues_model "gitea.dev/models/issues" + "gitea.dev/models/unittest" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/lfs_getobject_test.go b/tests/integration/lfs_getobject_test.go index 72bad4cc91..ddc23ccd05 100644 --- a/tests/integration/lfs_getobject_test.go +++ b/tests/integration/lfs_getobject_test.go @@ -11,15 +11,15 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/auth" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers/web" - "code.gitea.io/gitea/tests" + "gitea.dev/models/auth" + git_model "gitea.dev/models/git" + repo_model "gitea.dev/models/repo" + "gitea.dev/modules/json" + "gitea.dev/modules/lfs" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/routers/web" + "gitea.dev/tests" gzipp "github.com/klauspost/compress/gzip" "github.com/stretchr/testify/assert" diff --git a/tests/integration/lfs_local_endpoint_test.go b/tests/integration/lfs_local_endpoint_test.go index e67f0712a3..3418963741 100644 --- a/tests/integration/lfs_local_endpoint_test.go +++ b/tests/integration/lfs_local_endpoint_test.go @@ -9,8 +9,8 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/tests" + "gitea.dev/modules/lfs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/lfs_view_test.go b/tests/integration/lfs_view_test.go index 5855c881a0..203887fbf9 100644 --- a/tests/integration/lfs_view_test.go +++ b/tests/integration/lfs_view_test.go @@ -9,14 +9,14 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/lfs" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + "gitea.dev/models/db" + "gitea.dev/models/git" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/lfs" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/linguist_test.go b/tests/integration/linguist_test.go index 8f924f0ffb..67850cbf13 100644 --- a/tests/integration/linguist_test.go +++ b/tests/integration/linguist_test.go @@ -10,14 +10,14 @@ import ( "testing" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/indexer/stats" - "code.gitea.io/gitea/modules/queue" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/indexer/stats" + "gitea.dev/modules/queue" + repo_service "gitea.dev/services/repository" + files_service "gitea.dev/services/repository/files" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/links_test.go b/tests/integration/links_test.go index 733a3e045a..a3198a6759 100644 --- a/tests/integration/links_test.go +++ b/tests/integration/links_test.go @@ -9,10 +9,10 @@ import ( "path" "testing" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/manual_merge_test.go b/tests/integration/manual_merge_test.go index 7f931b620b..ae94101844 100644 --- a/tests/integration/manual_merge_test.go +++ b/tests/integration/manual_merge_test.go @@ -10,14 +10,14 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" + auth_model "gitea.dev/models/auth" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/markup_external_test.go b/tests/integration/markup_external_test.go index 97ef7e0b22..9217fd7e5a 100644 --- a/tests/integration/markup_external_test.go +++ b/tests/integration/markup_external_test.go @@ -9,16 +9,16 @@ import ( "strings" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/external" - "code.gitea.io/gitea/modules/public" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/charset" + "gitea.dev/modules/markup" + "gitea.dev/modules/markup/external" + "gitea.dev/modules/public" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -109,8 +109,8 @@ func TestExternalMarkupRenderer(t *testing.T) { assert.Equal(t, "frame-src 'self'; sandbox allow-scripts allow-popups", respSub.Header().Get("Content-Security-Policy")) // FIXME: actually here is a bug (legacy design problem), the "PostProcess" will escape "`+ - ``+ + ``+ + ``+ `
<script></script>
`, respSub.Body.String(), ) @@ -137,8 +137,8 @@ func TestExternalMarkupRenderer(t *testing.T) { req := NewRequest(t, "GET", "/user2/repo1/render/branch/master/html.no-sanitizer?a=1%2f2") respSub := MakeRequest(t, req, http.StatusOK) assert.Equal(t, - ``+ - ``+ + ``+ + ``+ ``, respSub.Body.String(), ) diff --git a/tests/integration/migrate_test.go b/tests/integration/migrate_test.go index 19a63d89c3..57e1e2b341 100644 --- a/tests/integration/migrate_test.go +++ b/tests/integration/migrate_test.go @@ -17,19 +17,19 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/services/migrations" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + git_model "gitea.dev/models/git" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/gitrepo" + "gitea.dev/modules/setting" + "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/services/migrations" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/migration-test/migration_test.go b/tests/integration/migration-test/migration_test.go index 4b9dc20e07..23567ba348 100644 --- a/tests/integration/migration-test/migration_test.go +++ b/tests/integration/migration-test/migration_test.go @@ -17,14 +17,14 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations" - migrate_base "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/testlogger" + "gitea.dev/models/db" + "gitea.dev/models/migrations" + migrate_base "gitea.dev/models/migrations/base" + "gitea.dev/models/unittest" + "gitea.dev/modules/git" + "gitea.dev/modules/log" + "gitea.dev/modules/setting" + "gitea.dev/modules/testlogger" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/mirror_pull_test.go b/tests/integration/mirror_pull_test.go index 0e81aa3d5e..0fd6647b95 100644 --- a/tests/integration/mirror_pull_test.go +++ b/tests/integration/mirror_pull_test.go @@ -7,17 +7,17 @@ import ( "slices" "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/migration" - mirror_service "code.gitea.io/gitea/services/mirror" - release_service "code.gitea.io/gitea/services/release" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unit" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/gitrepo" + "gitea.dev/modules/migration" + mirror_service "gitea.dev/services/mirror" + release_service "gitea.dev/services/release" + repo_service "gitea.dev/services/repository" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/mirror_push_test.go b/tests/integration/mirror_push_test.go index 699665fe3b..f0a9228e03 100644 --- a/tests/integration/mirror_push_test.go +++ b/tests/integration/mirror_push_test.go @@ -11,18 +11,18 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/services/migrations" - mirror_service "code.gitea.io/gitea/services/mirror" - repo_service "code.gitea.io/gitea/services/repository" - wiki_service "code.gitea.io/gitea/services/wiki" - "code.gitea.io/gitea/tests" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/gitrepo" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/services/migrations" + mirror_service "gitea.dev/services/mirror" + repo_service "gitea.dev/services/repository" + wiki_service "gitea.dev/services/wiki" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/nonascii_branches_test.go b/tests/integration/nonascii_branches_test.go index 89b0350779..bf5b34d0d7 100644 --- a/tests/integration/nonascii_branches_test.go +++ b/tests/integration/nonascii_branches_test.go @@ -10,7 +10,7 @@ import ( "path" "testing" - "code.gitea.io/gitea/tests" + "gitea.dev/tests" "github.com/stretchr/testify/require" ) diff --git a/tests/integration/oauth_avatar_test.go b/tests/integration/oauth_avatar_test.go index d86f2f2cbe..4987fa70d2 100644 --- a/tests/integration/oauth_avatar_test.go +++ b/tests/integration/oauth_avatar_test.go @@ -7,16 +7,16 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/web/auth" - "code.gitea.io/gitea/services/auth/source/oauth2" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/modules/web" + "gitea.dev/routers/web/auth" + "gitea.dev/services/auth/source/oauth2" + "gitea.dev/services/context" + "gitea.dev/tests" "github.com/markbates/goth" "github.com/markbates/goth/gothic" diff --git a/tests/integration/oauth_test.go b/tests/integration/oauth_test.go index cef2e96441..ee9eb838a3 100644 --- a/tests/integration/oauth_test.go +++ b/tests/integration/oauth_test.go @@ -17,20 +17,20 @@ import ( "strings" "testing" - asymkey_model "code.gitea.io/gitea/models/asymkey" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/auth/source/oauth2" - "code.gitea.io/gitea/services/oauth2_provider" - "code.gitea.io/gitea/tests" + asymkey_model "gitea.dev/models/asymkey" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/json" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/modules/timeutil" + "gitea.dev/modules/util" + "gitea.dev/services/auth/source/oauth2" + "gitea.dev/services/oauth2_provider" + "gitea.dev/tests" "github.com/PuerkitoBio/goquery" "github.com/markbates/goth" diff --git a/tests/integration/org_count_test.go b/tests/integration/org_count_test.go index 6a2cf53ed4..687ec65463 100644 --- a/tests/integration/org_count_test.go +++ b/tests/integration/org_count_test.go @@ -7,13 +7,13 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + "gitea.dev/models/organization" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/org_profile_test.go b/tests/integration/org_profile_test.go index 69d7999bb9..60d80f0763 100644 --- a/tests/integration/org_profile_test.go +++ b/tests/integration/org_profile_test.go @@ -11,10 +11,10 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/web/shared/user" + auth_model "gitea.dev/models/auth" + api "gitea.dev/modules/structs" + "gitea.dev/modules/util" + "gitea.dev/routers/web/shared/user" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/org_project_test.go b/tests/integration/org_project_test.go index 8c55a43757..c4ec402a3f 100644 --- a/tests/integration/org_project_test.go +++ b/tests/integration/org_project_test.go @@ -8,8 +8,8 @@ import ( "slices" "testing" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/tests" + unit_model "gitea.dev/models/unit" + "gitea.dev/tests" ) func TestOrgProjectAccess(t *testing.T) { diff --git a/tests/integration/org_team_invite_test.go b/tests/integration/org_team_invite_test.go index b1c1fbb17d..42780a844c 100644 --- a/tests/integration/org_team_invite_test.go +++ b/tests/integration/org_team_invite_test.go @@ -10,12 +10,12 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "gitea.dev/models/organization" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/org_test.go b/tests/integration/org_test.go index e34bc60635..27629d0fa0 100644 --- a/tests/integration/org_test.go +++ b/tests/integration/org_test.go @@ -9,17 +9,17 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + "gitea.dev/models/organization" + "gitea.dev/models/perm" + "gitea.dev/models/unit" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/org_worktime_test.go b/tests/integration/org_worktime_test.go index 9d2280ac7e..91bdb45f47 100644 --- a/tests/integration/org_worktime_test.go +++ b/tests/integration/org_worktime_test.go @@ -6,8 +6,8 @@ package integration_test import ( "testing" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" + "gitea.dev/models/organization" + "gitea.dev/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/packages_service_test.go b/tests/integration/packages_service_test.go index 361950cb10..172b5ab5e1 100644 --- a/tests/integration/packages_service_test.go +++ b/tests/integration/packages_service_test.go @@ -7,12 +7,12 @@ import ( "bytes" "testing" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - packages_module "code.gitea.io/gitea/modules/packages" - packages_service "code.gitea.io/gitea/services/packages" - "code.gitea.io/gitea/tests" + packages_model "gitea.dev/models/packages" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + packages_module "gitea.dev/modules/packages" + packages_service "gitea.dev/services/packages" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/privateactivity_test.go b/tests/integration/privateactivity_test.go index 4db483a074..0ce590e276 100644 --- a/tests/integration/privateactivity_test.go +++ b/tests/integration/privateactivity_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - activities_model "code.gitea.io/gitea/models/activities" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + activities_model "gitea.dev/models/activities" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/project_test.go b/tests/integration/project_test.go index 516f2acec7..5a0c1ef545 100644 --- a/tests/integration/project_test.go +++ b/tests/integration/project_test.go @@ -10,13 +10,13 @@ import ( "strings" "testing" - issues_model "code.gitea.io/gitea/models/issues" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + issues_model "gitea.dev/models/issues" + project_model "gitea.dev/models/project" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unit" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/pull_comment_test.go b/tests/integration/pull_comment_test.go index 56ef9972ad..c550bd582d 100644 --- a/tests/integration/pull_comment_test.go +++ b/tests/integration/pull_comment_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - issues_service "code.gitea.io/gitea/services/issue" + issues_model "gitea.dev/models/issues" + "gitea.dev/models/unittest" + issues_service "gitea.dev/services/issue" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/pull_commit_test.go b/tests/integration/pull_commit_test.go index 702bddfcef..938be5f044 100644 --- a/tests/integration/pull_commit_test.go +++ b/tests/integration/pull_commit_test.go @@ -7,8 +7,8 @@ import ( "net/http" "testing" - pull_service "code.gitea.io/gitea/services/pull" - "code.gitea.io/gitea/tests" + pull_service "gitea.dev/services/pull" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/pull_compare_test.go b/tests/integration/pull_compare_test.go index da00b3fd56..69bb22d2a9 100644 --- a/tests/integration/pull_compare_test.go +++ b/tests/integration/pull_compare_test.go @@ -9,12 +9,12 @@ import ( "net/url" "testing" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/test" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + "gitea.dev/modules/test" + repo_service "gitea.dev/services/repository" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/pull_create_test.go b/tests/integration/pull_create_test.go index 48e8c96d38..eaee27652a 100644 --- a/tests/integration/pull_create_test.go +++ b/tests/integration/pull_create_test.go @@ -14,13 +14,13 @@ import ( "sync" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git/gitcmd" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + "gitea.dev/modules/git/gitcmd" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/pull_diff_test.go b/tests/integration/pull_diff_test.go index 134ae2c0ed..ea97a134b2 100644 --- a/tests/integration/pull_diff_test.go +++ b/tests/integration/pull_diff_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "gitea.dev/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/pull_merge_test.go b/tests/integration/pull_merge_test.go index bf046e17e6..8469057620 100644 --- a/tests/integration/pull_merge_test.go +++ b/tests/integration/pull_merge_test.go @@ -16,33 +16,33 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/perm" - pull_model "code.gitea.io/gitea/models/pull" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/commitstatus" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/automerge" - "code.gitea.io/gitea/services/automergequeue" - "code.gitea.io/gitea/services/forms" - pull_service "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" - commitstatus_service "code.gitea.io/gitea/services/repository/commitstatus" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + git_model "gitea.dev/models/git" + issues_model "gitea.dev/models/issues" + "gitea.dev/models/perm" + pull_model "gitea.dev/models/pull" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/models/webhook" + "gitea.dev/modules/commitstatus" + "gitea.dev/modules/git" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/gitrepo" + "gitea.dev/modules/json" + "gitea.dev/modules/queue" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/modules/translation" + "gitea.dev/modules/util" + "gitea.dev/services/automerge" + "gitea.dev/services/automergequeue" + "gitea.dev/services/forms" + pull_service "gitea.dev/services/pull" + repo_service "gitea.dev/services/repository" + commitstatus_service "gitea.dev/services/repository/commitstatus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/pull_review_test.go b/tests/integration/pull_review_test.go index b38a037870..2ab2787e92 100644 --- a/tests/integration/pull_review_test.go +++ b/tests/integration/pull_review_test.go @@ -11,17 +11,17 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/test" - issue_service "code.gitea.io/gitea/services/issue" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + "gitea.dev/models/db" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/git" + "gitea.dev/modules/test" + issue_service "gitea.dev/services/issue" + repo_service "gitea.dev/services/repository" + files_service "gitea.dev/services/repository/files" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/pull_status_test.go b/tests/integration/pull_status_test.go index 54ceb3b39c..a630529969 100644 --- a/tests/integration/pull_status_test.go +++ b/tests/integration/pull_status_test.go @@ -11,16 +11,16 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/commitstatus" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/services/pull" + auth_model "gitea.dev/models/auth" + git_model "gitea.dev/models/git" + "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + "gitea.dev/modules/commitstatus" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/services/pull" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/pull_update_test.go b/tests/integration/pull_update_test.go index bbe0077fe5..db3c61cfa8 100644 --- a/tests/integration/pull_update_test.go +++ b/tests/integration/pull_update_test.go @@ -10,17 +10,17 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - pull_service "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" + auth_model "gitea.dev/models/auth" + issues_model "gitea.dev/models/issues" + "gitea.dev/models/perm" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unit" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/gitrepo" + pull_service "gitea.dev/services/pull" + repo_service "gitea.dev/services/repository" + files_service "gitea.dev/services/repository/files" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/release_test.go b/tests/integration/release_test.go index 89ad7a3de5..320661420e 100644 --- a/tests/integration/release_test.go +++ b/tests/integration/release_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/tests" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/modules/translation" + "gitea.dev/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/rename_branch_test.go b/tests/integration/rename_branch_test.go index 00ad6546e3..807381cc01 100644 --- a/tests/integration/rename_branch_test.go +++ b/tests/integration/rename_branch_test.go @@ -8,10 +8,10 @@ import ( "net/url" "testing" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/tests" + git_model "gitea.dev/models/git" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_activity_test.go b/tests/integration/repo_activity_test.go index 7781fd0511..a3bfaff0b2 100644 --- a/tests/integration/repo_activity_test.go +++ b/tests/integration/repo_activity_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/test" + "gitea.dev/models/db" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_archive_test.go b/tests/integration/repo_archive_test.go index 4c190121b8..fd8403496c 100644 --- a/tests/integration/repo_archive_test.go +++ b/tests/integration/repo_archive_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/routers/web" - "code.gitea.io/gitea/tests" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/routers" + "gitea.dev/routers/web" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/repo_branch_test.go b/tests/integration/repo_branch_test.go index 792ffb6011..7a9f1c8130 100644 --- a/tests/integration/repo_branch_test.go +++ b/tests/integration/repo_branch_test.go @@ -11,10 +11,10 @@ import ( "strings" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + "gitea.dev/modules/test" + "gitea.dev/modules/translation" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/repo_commits_search_test.go b/tests/integration/repo_commits_search_test.go index 9b05e36399..28202e9977 100644 --- a/tests/integration/repo_commits_search_test.go +++ b/tests/integration/repo_commits_search_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/tests" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_commits_test.go b/tests/integration/repo_commits_test.go index dbaabc380b..9335ef7065 100644 --- a/tests/integration/repo_commits_test.go +++ b/tests/integration/repo_commits_test.go @@ -11,14 +11,14 @@ import ( "sync" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/modules/commitstatus" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + git_model "gitea.dev/models/git" + "gitea.dev/modules/commitstatus" + "gitea.dev/modules/json" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" @@ -69,6 +69,28 @@ func TestRepoCommits(t *testing.T) { assert.Equal(t, "6543", strings.TrimSpace(authorElem.Text())) }) + t.Run("CommitPageUsesCommitterDate", func(t *testing.T) { + const ( + commitID = "5099b81332712fe655e34e8dd63574f503f61811" + expectedCommitterTime = "2017-08-06T19:56:13+02:00" + authorTime = "2017-08-06T19:55:01+02:00" + ) + + req := NewRequest(t, "GET", "/user2/repo16/commits/branch/master") + resp := session.MakeRequest(t, req, http.StatusOK) + doc := NewHTMLParser(t, resp.Body) + + var commitListTime string + doc.doc.Find("#commits-table tbody tr").EachWithBreak(func(_ int, row *goquery.Selection) bool { + if path.Base(row.Find(".commit-id-short").AttrOr("href", "")) != commitID { + return true + } + commitListTime = row.Find("td").Eq(3).Find("relative-time").AttrOr("datetime", "") + return false + }) + require.Equal(t, expectedCommitterTime, commitListTime) + }) + t.Run("LastCommitNonExistingCommiter", func(t *testing.T) { req := NewRequest(t, "GET", "/user2/repo1/src/branch/branch2") resp := session.MakeRequest(t, req, http.StatusOK) diff --git a/tests/integration/repo_fork_test.go b/tests/integration/repo_fork_test.go index fd6a0eac7a..5c34b83aa1 100644 --- a/tests/integration/repo_fork_test.go +++ b/tests/integration/repo_fork_test.go @@ -10,13 +10,13 @@ import ( "strconv" "testing" - org_model "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - org_service "code.gitea.io/gitea/services/org" - "code.gitea.io/gitea/tests" + org_model "gitea.dev/models/organization" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/structs" + "gitea.dev/modules/test" + org_service "gitea.dev/services/org" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_generate_test.go b/tests/integration/repo_generate_test.go index be4d5a036b..e3dfa69981 100644 --- a/tests/integration/repo_generate_test.go +++ b/tests/integration/repo_generate_test.go @@ -11,10 +11,10 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_merge_upstream_test.go b/tests/integration/repo_merge_upstream_test.go index e0e47e1a03..44b3c748c1 100644 --- a/tests/integration/repo_merge_upstream_test.go +++ b/tests/integration/repo_merge_upstream_test.go @@ -11,13 +11,13 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + git_model "gitea.dev/models/git" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + api "gitea.dev/modules/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/repo_migrate_test.go b/tests/integration/repo_migrate_test.go index 98ad112fcc..c6ba0669b0 100644 --- a/tests/integration/repo_migrate_test.go +++ b/tests/integration/repo_migrate_test.go @@ -9,8 +9,8 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_search_test.go b/tests/integration/repo_search_test.go index 88be3c5bb6..1b396ed238 100644 --- a/tests/integration/repo_search_test.go +++ b/tests/integration/repo_search_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - repo_model "code.gitea.io/gitea/models/repo" - code_indexer "code.gitea.io/gitea/modules/indexer/code" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + repo_model "gitea.dev/models/repo" + code_indexer "gitea.dev/modules/indexer/code" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/repo_tag_test.go b/tests/integration/repo_tag_test.go index eef83a794e..a045b174b3 100644 --- a/tests/integration/repo_tag_test.go +++ b/tests/integration/repo_tag_test.go @@ -9,16 +9,16 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git/gitcmd" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/release" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + git_model "gitea.dev/models/git" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/git/gitcmd" + api "gitea.dev/modules/structs" + "gitea.dev/services/release" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/repo_test.go b/tests/integration/repo_test.go index 4aefa3ed72..462f790585 100644 --- a/tests/integration/repo_test.go +++ b/tests/integration/repo_test.go @@ -13,17 +13,17 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + "gitea.dev/models/db" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unit" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/modules/util" + repo_service "gitea.dev/services/repository" + "gitea.dev/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/repo_topic_test.go b/tests/integration/repo_topic_test.go index 522a774c4d..3dfaa37d05 100644 --- a/tests/integration/repo_topic_test.go +++ b/tests/integration/repo_topic_test.go @@ -8,8 +8,8 @@ import ( "net/url" "testing" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_visibility_test.go b/tests/integration/repo_visibility_test.go index f9a2ab8369..a666e49723 100644 --- a/tests/integration/repo_visibility_test.go +++ b/tests/integration/repo_visibility_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_watch_test.go b/tests/integration/repo_watch_test.go index c01662256c..e54f4df6aa 100644 --- a/tests/integration/repo_watch_test.go +++ b/tests/integration/repo_watch_test.go @@ -7,10 +7,10 @@ import ( "net/url" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" ) func TestRepoWatch(t *testing.T) { diff --git a/tests/integration/repo_webhook_test.go b/tests/integration/repo_webhook_test.go index 12a11d45bd..af309674cd 100644 --- a/tests/integration/repo_webhook_test.go +++ b/tests/integration/repo_webhook_test.go @@ -15,26 +15,26 @@ import ( "testing" "time" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - db_model "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/commitstatus" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/tests" + runnerv1 "gitea.dev/actions-proto-go/runner/v1" + actions_model "gitea.dev/models/actions" + auth_model "gitea.dev/models/auth" + db_model "gitea.dev/models/db" + "gitea.dev/models/perm" + "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/models/webhook" + "gitea.dev/modules/commitstatus" + "gitea.dev/modules/git" + "gitea.dev/modules/gitrepo" + "gitea.dev/modules/json" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + webhook_module "gitea.dev/modules/webhook" + "gitea.dev/services/actions" + "gitea.dev/tests" - runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/repofiles_change_test.go b/tests/integration/repofiles_change_test.go index 5de973aacc..05f9b027d3 100644 --- a/tests/integration/repofiles_change_test.go +++ b/tests/integration/repofiles_change_test.go @@ -12,13 +12,13 @@ import ( "testing" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/contexttest" - files_service "code.gitea.io/gitea/services/repository/files" + repo_model "gitea.dev/models/repo" + "gitea.dev/modules/git" + "gitea.dev/modules/gitrepo" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/services/contexttest" + files_service "gitea.dev/services/repository/files" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/session_test.go b/tests/integration/session_test.go index 981b88ae45..7529eee469 100644 --- a/tests/integration/session_test.go +++ b/tests/integration/session_test.go @@ -6,9 +6,9 @@ package integration import ( "testing" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/tests" + "gitea.dev/models/auth" + "gitea.dev/models/unittest" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/setting_test.go b/tests/integration/setting_test.go index e94052d42f..b6e72488d1 100644 --- a/tests/integration/setting_test.go +++ b/tests/integration/setting_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/signin_test.go b/tests/integration/signin_test.go index 5d5420d95d..ab1167ce2c 100644 --- a/tests/integration/signin_test.go +++ b/tests/integration/signin_test.go @@ -9,18 +9,18 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/routers/web/auth" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/modules/translation" + "gitea.dev/modules/web" + "gitea.dev/routers" + "gitea.dev/routers/web/auth" + "gitea.dev/services/context" + "gitea.dev/tests" "github.com/markbates/goth" "github.com/stretchr/testify/assert" diff --git a/tests/integration/signout_test.go b/tests/integration/signout_test.go index ff35dcf7a5..fcaf30da07 100644 --- a/tests/integration/signout_test.go +++ b/tests/integration/signout_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/signup_test.go b/tests/integration/signup_test.go index 06c513f616..125bdf1daa 100644 --- a/tests/integration/signup_test.go +++ b/tests/integration/signup_test.go @@ -9,13 +9,13 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/tests" + "gitea.dev/models/db" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/modules/translation" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/ssh_key_test.go b/tests/integration/ssh_key_test.go index 1625dc3756..9b5eaee880 100644 --- a/tests/integration/ssh_key_test.go +++ b/tests/integration/ssh_key_test.go @@ -12,9 +12,9 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" + auth_model "gitea.dev/models/auth" + "gitea.dev/modules/git" + api "gitea.dev/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/timetracking_test.go b/tests/integration/timetracking_test.go index e4d8927856..92e76a399c 100644 --- a/tests/integration/timetracking_test.go +++ b/tests/integration/timetracking_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/tests" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/user_avatar_test.go b/tests/integration/user_avatar_test.go index add1554b7a..3f5674f8ad 100644 --- a/tests/integration/user_avatar_test.go +++ b/tests/integration/user_avatar_test.go @@ -11,10 +11,10 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/avatar" - "code.gitea.io/gitea/tests" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/avatar" + "gitea.dev/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/user_settings_test.go b/tests/integration/user_settings_test.go index b0e23b6e7f..3ccb6d9522 100644 --- a/tests/integration/user_settings_test.go +++ b/tests/integration/user_settings_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "gitea.dev/modules/container" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/user_test.go b/tests/integration/user_test.go index f1eaf89889..83af9e0bf8 100644 --- a/tests/integration/user_test.go +++ b/tests/integration/user_test.go @@ -8,18 +8,18 @@ import ( "strings" "testing" - asymkey_model "code.gitea.io/gitea/models/asymkey" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/tests" + asymkey_model "gitea.dev/models/asymkey" + auth_model "gitea.dev/models/auth" + "gitea.dev/models/db" + issues_model "gitea.dev/models/issues" + repo_model "gitea.dev/models/repo" + "gitea.dev/models/unittest" + user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" + api "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/modules/translation" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/version_test.go b/tests/integration/version_test.go index 180c5da08f..631c7c1e25 100644 --- a/tests/integration/version_test.go +++ b/tests/integration/version_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "gitea.dev/modules/setting" + "gitea.dev/modules/structs" + "gitea.dev/modules/test" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/view_test.go b/tests/integration/view_test.go index 4dbf771705..7c5a2525eb 100644 --- a/tests/integration/view_test.go +++ b/tests/integration/view_test.go @@ -9,11 +9,11 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/tests" + "gitea.dev/modules/setting" + "gitea.dev/modules/test" + "gitea.dev/modules/web" + "gitea.dev/services/context" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/wiki_test.go b/tests/integration/wiki_test.go index 71f64e98b7..0c1b00e507 100644 --- a/tests/integration/wiki_test.go +++ b/tests/integration/wiki_test.go @@ -11,10 +11,10 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + "gitea.dev/modules/git" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/workflow_run_api_check_test.go b/tests/integration/workflow_run_api_check_test.go index d7390b3ac1..a43dc78cf2 100644 --- a/tests/integration/workflow_run_api_check_test.go +++ b/tests/integration/workflow_run_api_check_test.go @@ -9,9 +9,9 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "gitea.dev/models/auth" + api "gitea.dev/modules/structs" + "gitea.dev/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/test_utils.go b/tests/test_utils.go index 1b7987527a..d7f520e405 100644 --- a/tests/test_utils.go +++ b/tests/test_utils.go @@ -7,16 +7,16 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/testlogger" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers" + "gitea.dev/models/db" + packages_model "gitea.dev/models/packages" + "gitea.dev/models/unittest" + "gitea.dev/modules/git" + "gitea.dev/modules/graceful" + "gitea.dev/modules/setting" + "gitea.dev/modules/storage" + "gitea.dev/modules/testlogger" + "gitea.dev/modules/util" + "gitea.dev/routers" "github.com/stretchr/testify/assert" ) diff --git a/tools/migrate-nolyfills.ts b/tools/migrate-nolyfills.ts deleted file mode 100644 index 2e5f635272..0000000000 --- a/tools/migrate-nolyfills.ts +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env node -// nolyfill writes overrides to package.json#pnpm.overrides which pnpm v11 ignores. -// This moves them to pnpm-workspace.yaml until SukkaW/nolyfill#119 is fixed. -import {readFileSync, writeFileSync} from 'node:fs'; -import {exit} from 'node:process'; -import {fileURLToPath} from 'node:url'; -import {dump} from 'js-yaml'; - -const packagePath = fileURLToPath(new URL('../package.json', import.meta.url)); -const workspacePath = fileURLToPath(new URL('../pnpm-workspace.yaml', import.meta.url)); - -const packageJson: {pnpm?: {overrides?: Record}} = JSON.parse(readFileSync(packagePath, 'utf8')); -const overrides = packageJson.pnpm?.overrides; - -if (!overrides || !Object.keys(overrides).length) { - exit(0); -} - -const block = dump({overrides}, {lineWidth: -1, quotingType: "'"}); -const workspace = readFileSync(workspacePath, 'utf8'); -const overridesRegex = /^overrides:[^\n]*(?:\n(?:[ \t][^\n]*|[ \t]*(?=\n[ \t])))*\n?/m; - -if (!overridesRegex.test(workspace)) { - console.error(`No 'overrides:' block found in pnpm-workspace.yaml`); - exit(1); -} - -writeFileSync(workspacePath, workspace.replace(overridesRegex, block)); - -const pnpm = packageJson.pnpm!; -delete pnpm.overrides; -if (!Object.keys(pnpm).length) delete packageJson.pnpm; -writeFileSync(packagePath, `${JSON.stringify(packageJson, null, 2)}\n`); diff --git a/uv.lock b/uv.lock index 1d4148ac46..a14f9745a4 100644 --- a/uv.lock +++ b/uv.lock @@ -102,7 +102,7 @@ dev = [ dev = [ { name = "djlint", specifier = "==1.36.4" }, { name = "yamllint", specifier = "==1.38.0" }, - { name = "zizmor", specifier = "==1.25.1" }, + { name = "zizmor", specifier = "==1.25.2" }, ] [[package]] @@ -420,18 +420,18 @@ wheels = [ [[package]] name = "zizmor" -version = "1.25.1" +version = "1.25.2" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/28/16/6fb78c89586bfbd6e2aec21999891e3281ed104d29b65654b0112b6f804f/zizmor-1.25.1.tar.gz", hash = "sha256:f7849ce53371178338bd0302c7ee16fd274354e1f46490b49a76da37a1a1e7a1", size = 517745, upload-time = "2026-05-15T20:08:49.258Z" } +sdist = { url = "https://files.pythonhosted.org/packages/b3/41/8987d546e3101cc76748b2f1b0ccda58e244773ef5124d39e7e749e3d6e4/zizmor-1.25.2.tar.gz", hash = "sha256:f26ffeb16659c8922c7b08203ca5a4f8bf5e1a7e8d190734961c40877cf778ea", size = 517794, upload-time = "2026-05-16T06:28:43.816Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/64/e4/a8971c6a350150485309ead9a09dc38268057d0b07a423f75bc30ef5ac5c/zizmor-1.25.1-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:afb2e483beb7245d9216ed62ccaf7bef4b59387126521f2b5a47677eda3fade1", size = 9152995, upload-time = "2026-05-15T20:08:50.815Z" }, - { url = "https://files.pythonhosted.org/packages/78/d2/281b579c8cbb5d9f52f70a53db67bf9162ce1f260312d783b415d99b78c6/zizmor-1.25.1-py3-none-macosx_11_0_arm64.whl", hash = "sha256:172ff167f4d3616c7af972a5ddcd9e26b6fe4bf39d33bcfbb424da54f667e80b", size = 8682011, upload-time = "2026-05-15T20:08:59.54Z" }, - { url = "https://files.pythonhosted.org/packages/d4/05/c6e16b705452a80aae1d532a64f05b2f672665eb04f9f155d14a81fa62cc/zizmor-1.25.1-py3-none-manylinux_2_24_aarch64.whl", hash = "sha256:3eabb625b4e9814754c77f6a79092cd57ce05a1693ef0f2a16362b841c7268db", size = 8849676, upload-time = "2026-05-15T20:08:55.354Z" }, - { url = "https://files.pythonhosted.org/packages/20/06/b5588059bd05d4e61203e3d3dfb34fc5c0930d4b5446c79154cfe0c71c60/zizmor-1.25.1-py3-none-manylinux_2_28_armv7l.whl", hash = "sha256:e25e9167d549df0a21a857165b7c57e3d60fd2984f934fa07d1f5e06c9a59f4a", size = 8463314, upload-time = "2026-05-15T20:08:47.413Z" }, - { url = "https://files.pythonhosted.org/packages/be/5b/a5dd5cb75d4b0cb148d0d395abfd6e9b335244f22372367b5d82fb6d5d60/zizmor-1.25.1-py3-none-manylinux_2_28_x86_64.whl", hash = "sha256:917c86ff8f91706e6d6f2e24a3472f64e75397e2dd50c19fda5b117ab1b9f26d", size = 9286826, upload-time = "2026-05-15T20:09:03.528Z" }, - { url = "https://files.pythonhosted.org/packages/db/ad/0d41eb3dd09625f824545590e02b3e5be4fef2fba716b5466a7269dac8bd/zizmor-1.25.1-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:4db178b1d6671abb78aca64295c7b3081375c3ab9303e966e91cfae20b1604e2", size = 8870771, upload-time = "2026-05-15T20:08:45.237Z" }, - { url = "https://files.pythonhosted.org/packages/65/f3/e9703dcc60fbc91849cbdedff438a8c47fb962e429811d0200ac370f5e13/zizmor-1.25.1-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:025ff2ae568513af2ca8e5f8da7077920ade7f4454086b0ba32ccfe1b3e9d3c0", size = 8419481, upload-time = "2026-05-15T20:08:57.336Z" }, - { url = "https://files.pythonhosted.org/packages/10/93/857a412ac097a9a887d01994ba7154daf9c9ef160b9ee22a8305914901cb/zizmor-1.25.1-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:5b727f9dd5bee4138638bcc3a90471326b33dd8aa7cfdd48e9da1513030b75e5", size = 9373062, upload-time = "2026-05-15T20:08:53.123Z" }, - { url = "https://files.pythonhosted.org/packages/13/f0/79c5f3d13a07a85f8fc77be7dfc619e89dbc721ccb9482d894d14d7dff50/zizmor-1.25.1-py3-none-win32.whl", hash = "sha256:6ebb21f7c1f3a6288b70dae899a3850cf4705443a7a0d8a3976508536a867f48", size = 7547943, upload-time = "2026-05-15T20:09:01.844Z" }, - { url = "https://files.pythonhosted.org/packages/90/61/50ceb009e10d9a6dfff176b1c14cf5178c53b50820113b170b43f405a3f1/zizmor-1.25.1-py3-none-win_amd64.whl", hash = "sha256:d3113404fe529751b983f0282373e1c66c755f114ef5078aa6e59cf5f9c3fea9", size = 8622930, upload-time = "2026-05-15T20:08:43.151Z" }, + { url = "https://files.pythonhosted.org/packages/dc/bd/84108a92ccbfda0d28efc11f382997c7a767b58863bf4a550634b8cf0211/zizmor-1.25.2-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:17cc8cfd9d472e8b11945a869c198d25cfdf4a33f36fa7a1f9674099f5fb509d", size = 9115548, upload-time = "2026-05-16T06:28:33.591Z" }, + { url = "https://files.pythonhosted.org/packages/c2/c0/66453a2553a66286a96ca32d75e3e6bcc94ce7f907cd5f8c2c3fce55315e/zizmor-1.25.2-py3-none-macosx_11_0_arm64.whl", hash = "sha256:d3e301eb4465e2da77857cf01ab4ef0184cf3818e826800b270ab01ae7338977", size = 8665071, upload-time = "2026-05-16T06:28:30.861Z" }, + { url = "https://files.pythonhosted.org/packages/52/3e/d60939d1cc4907c0d021a7c46362aab5e8045550bb09157d56c070e43568/zizmor-1.25.2-py3-none-manylinux_2_24_aarch64.whl", hash = "sha256:cf64374149b567c9373228b76c8e77a389b4071899f84b82c36ee50fab894e79", size = 8842884, upload-time = "2026-05-16T06:28:26.041Z" }, + { url = "https://files.pythonhosted.org/packages/46/82/f3e8d9b6d941194f2558591b449c106d46a16ea566b95eccff3a83bf6acc/zizmor-1.25.2-py3-none-manylinux_2_28_armv7l.whl", hash = "sha256:0beba1601be08bd00c9277e6ed4b026e125b26b379d86d6d98eb708409b3050d", size = 8449741, upload-time = "2026-05-16T06:28:45.424Z" }, + { url = "https://files.pythonhosted.org/packages/4b/13/445bc98acc2c976d6b8f8ca59b9c09f055adb5ffb3445d99af8ff7efcb4f/zizmor-1.25.2-py3-none-manylinux_2_28_x86_64.whl", hash = "sha256:c4246f1344d8dbeffc044d7bb11b131773a7db7eb57d9073c45942dfd3543a1f", size = 9285184, upload-time = "2026-05-16T06:28:39.21Z" }, + { url = "https://files.pythonhosted.org/packages/cf/78/fc7717c706bde7531b2fde12003994fbc04c47ab4f91aa6ca9b3b24b30fd/zizmor-1.25.2-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:dbb1b5c85b8de8eaa0227c6620f06c8e4fbd0a4da2086e218bc225c0bef0923d", size = 8886579, upload-time = "2026-05-16T06:28:51.384Z" }, + { url = "https://files.pythonhosted.org/packages/ca/bc/a46f11377cdc145c625d62d88c30fead56f9d29bc31652069a1a0eaed6c2/zizmor-1.25.2-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:d670a1e2f00b3cd56febd145bc1a0b2c4caf1cbe5dad8128721843fa877e2d2e", size = 8413576, upload-time = "2026-05-16T06:28:36.376Z" }, + { url = "https://files.pythonhosted.org/packages/2b/3b/0fd93b77171c8f229e8e1304eecc9931bf3009f722c57967d545d9f151b6/zizmor-1.25.2-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:b75c84d7387389f95edadbe859fb2aaf0a360c5b080932cc53e92ae1db6f09ef", size = 9378162, upload-time = "2026-05-16T06:28:41.999Z" }, + { url = "https://files.pythonhosted.org/packages/b5/3f/dcb85fb9a0d87794847f9043f9db9bb4d274cf4b8077604bc13850c8fdb4/zizmor-1.25.2-py3-none-win32.whl", hash = "sha256:aa9f4c43b499c55339c3ef2e885133c5017cd9a18d76d9335541203cfa5ae1e7", size = 7548509, upload-time = "2026-05-16T06:28:28.828Z" }, + { url = "https://files.pythonhosted.org/packages/d2/81/1cb088098bd53f9b910098b0c19d06dc587acf328a170ef8afd1cd93b482/zizmor-1.25.2-py3-none-win_amd64.whl", hash = "sha256:af55bd9bd119ea8cbce2a7addc3922503019de32c1fe31106d70b3dc77d77908", size = 8609822, upload-time = "2026-05-16T06:28:48.078Z" }, ] diff --git a/vite.config.ts b/vite.config.ts index 53717813a1..e077fed6ae 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -267,7 +267,6 @@ export default defineConfig(commonViteOpts({ manifest: true, rolldownOptions: { input: { - // FIXME: INCORRECT-VITE-MANIFEST-PARSER: the "css importing" logic in backend is wrong index: join(import.meta.dirname, 'web_src/js/index.ts'), swagger: join(import.meta.dirname, 'web_src/js/swagger.ts'), 'external-render-frontend': join(import.meta.dirname, 'web_src/js/external-render-frontend.ts'), diff --git a/web_src/css/base.css b/web_src/css/base.css index 62d639a302..49ddca57a3 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -350,9 +350,7 @@ a.label, width: 16px; height: 16px; mask-size: cover; - -webkit-mask-size: cover; mask-image: var(--select-arrows); - -webkit-mask-image: var(--select-arrows); background: currentcolor; } @@ -384,16 +382,6 @@ a.label, color: var(--color-text-light-2); } -/* styles from removed fomantic transition module */ -.hidden.transition { - visibility: hidden; - display: none; -} -.visible.transition { - display: block !important; - visibility: visible !important; -} - .ui.comments .comment .metadata { color: var(--color-text-light-2); } @@ -440,11 +428,6 @@ img.ui.avatar, margin-top: calc(var(--page-spacing) - 1rem); } -.ui.message.flash-message pre { - white-space: pre-line; - margin: 0; -} - .ui .header > i + .content { padding-left: 0.75rem; vertical-align: middle; @@ -488,10 +471,6 @@ img.ui.avatar, color: var(--color-text) !important; } -.ui .border { - border: 1px solid; -} - .user-menu > .item { width: 100%; border-radius: 0 !important; diff --git a/web_src/css/index.css b/web_src/css/index.css index 06f7101af9..89ad63ba1a 100644 --- a/web_src/css/index.css +++ b/web_src/css/index.css @@ -22,8 +22,9 @@ @import "./modules/tab.css"; @import "./modules/form.css"; @import "./modules/dropdown.css"; -@import "./modules/shortcut.css"; +@import "./modules/transition.css"; +@import "./modules/shortcut.css"; @import "./modules/tippy.css"; @import "./modules/breadcrumb.css"; @import "./modules/comment.css"; diff --git a/web_src/css/modules/animations.css b/web_src/css/modules/animations.css index cdbcf45a96..4b68f48666 100644 --- a/web_src/css/modules/animations.css +++ b/web_src/css/modules/animations.css @@ -101,13 +101,6 @@ code.language-math.is-loading::after { animation: pulse-1p5 200ms linear; } -.ui.modal, -.ui.dimmer.transition { - animation-name: fadein; - animation-duration: 100ms; - animation-timing-function: ease-in-out; -} - .rotate-clockwise { animation: rotate-clockwise-keyframes 1s linear infinite; } diff --git a/web_src/css/modules/checkbox.css b/web_src/css/modules/checkbox.css index a6caf3324f..a90082c1a7 100644 --- a/web_src/css/modules/checkbox.css +++ b/web_src/css/modules/checkbox.css @@ -35,13 +35,9 @@ input[type="checkbox"]::before { height: var(--checkbox-size); clip-path: inset(var(--checkbox-size) 0 0 0); mask-image: var(--checkbox-mask-checked); - -webkit-mask-image: var(--checkbox-mask-checked); mask-size: 75%; - -webkit-mask-size: 75%; mask-repeat: no-repeat; - -webkit-mask-repeat: no-repeat; mask-position: center; - -webkit-mask-position: center; } input[type="checkbox"]:checked, @@ -67,9 +63,7 @@ input[type="radio"]:disabled:checked { input[type="checkbox"]:indeterminate::before { clip-path: inset(0); mask-image: var(--checkbox-mask-indeterminate); - -webkit-mask-image: var(--checkbox-mask-indeterminate); mask-size: 75%; - -webkit-mask-size: 75%; } .ui.checkbox { diff --git a/web_src/css/modules/codeeditor.css b/web_src/css/modules/codeeditor.css index 558ba7a44f..3212c04c83 100644 --- a/web_src/css/modules/codeeditor.css +++ b/web_src/css/modules/codeeditor.css @@ -127,8 +127,6 @@ background-color: currentcolor; mask-image: var(--octicon-x); mask-size: cover; - -webkit-mask-image: var(--octicon-x); - -webkit-mask-size: cover; border-radius: var(--border-radius); } diff --git a/web_src/css/modules/dropdown.css b/web_src/css/modules/dropdown.css index 62ca91e61f..9d3dc48ada 100644 --- a/web_src/css/modules/dropdown.css +++ b/web_src/css/modules/dropdown.css @@ -209,7 +209,6 @@ select.ui.dropdown { overflow-x: hidden; overflow-y: auto; backface-visibility: hidden; - -webkit-overflow-scrolling: touch; border-top-width: 0 !important; outline: none; margin: 0 -1px; @@ -379,7 +378,6 @@ select.ui.dropdown { overflow-x: hidden; overflow-y: auto; backface-visibility: hidden; - -webkit-overflow-scrolling: touch; } @media only screen and (max-width: 767.98px) { @@ -653,7 +651,6 @@ select.ui.dropdown { overflow-x: hidden; overflow-y: auto; backface-visibility: hidden; - -webkit-overflow-scrolling: touch; min-width: 100% !important; width: auto !important; } diff --git a/web_src/css/modules/menu.css b/web_src/css/modules/menu.css index d371fe00e2..458d47fad0 100644 --- a/web_src/css/modules/menu.css +++ b/web_src/css/modules/menu.css @@ -311,6 +311,7 @@ .ui.vertical.menu .item > .menu { margin: 0.5em -1.14285714em 0; } + .ui.vertical.menu .menu .item { background: none; padding: 0.5em 1.33333333em; diff --git a/web_src/css/modules/message.css b/web_src/css/modules/message.css index bb0965a077..61ce04666c 100644 --- a/web_src/css/modules/message.css +++ b/web_src/css/modules/message.css @@ -31,6 +31,11 @@ details.ui.message:not(:has(pre)) summary { cursor: text; } +.ui.message.flash-message pre { + white-space: pre-line; + margin: 0; +} + .ui.message:first-child { margin-top: 0; } diff --git a/web_src/css/modules/transition.css b/web_src/css/modules/transition.css new file mode 100644 index 0000000000..3031c217f7 --- /dev/null +++ b/web_src/css/modules/transition.css @@ -0,0 +1,24 @@ +/* styles for Fomantic transition (toggle): dimmer, modal, dropdown menu */ + +/* this is the only place using "hidden" and "visible" classes, it can safely work with tailwind without prefix in the future */ +.ui.modal.transition.hidden, +.ui.dropdown > .menu.transition.hidden { + display: none; + visibility: hidden; +} + +.ui.modal.transition.visible, +.ui.dropdown > .menu.transition.visible { + display: block; + visibility: visible; +} + +/* dimmer uses "active" but not "hidden/visible" classes, no special classes for it here */ + +/* only modal and dimmer need animation, dropdown menu doesn't */ +.ui.modal.transition, +.ui.dimmer.transition { + animation-name: fadein; + animation-duration: 100ms; + animation-timing-function: ease-in-out; +} diff --git a/web_src/css/repo/issue-list.css b/web_src/css/repo/issue-list.css index 2d55ef83dc..1a635f2019 100644 --- a/web_src/css/repo/issue-list.css +++ b/web_src/css/repo/issue-list.css @@ -39,6 +39,7 @@ font-weight: var(--font-weight-semibold); color: var(--color-text); text-decoration: none; + overflow-wrap: anywhere; } #issue-list .branches { diff --git a/web_src/css/review.css b/web_src/css/review.css index f192b0322b..76e98386db 100644 --- a/web_src/css/review.css +++ b/web_src/css/review.css @@ -26,9 +26,7 @@ height: 14px; background-color: var(--color-yellow); /* TODO: maybe it needs a new kind of color, there is no suitable "warning" color in the current palette */ mask-image: var(--octicon-alert-fill); - -webkit-mask-image: var(--octicon-alert-fill); mask-size: contain; - -webkit-mask-size: contain; } .repository .diff-file-box .code-diff td.lines-escape { diff --git a/web_src/css/shared/settings.css b/web_src/css/shared/settings.css index 33f88615e0..fa2ac9c4ef 100644 --- a/web_src/css/shared/settings.css +++ b/web_src/css/shared/settings.css @@ -1,37 +1,53 @@ -details.toggleable-item { - user-select: none !important; - padding: 0 !important; +.ui.vertical.menu > details.item { + user-select: none; + padding: 0; } -details.toggleable-item .menu { - margin: 4px 0 10px !important; -} - -details.toggleable-item summary { +.ui.vertical.menu > details.item summary { display: flex; - justify-content: space-between; + justify-content: space-between; /* make the "::after" right-aligned */ align-items: center; - padding: 0.92857143em 1.14285714em; + padding: 16px 13px; /* match Fomantic menu item padding */ } -details.toggleable-item summary::marker, /* Chrome, Edge, Firefox */ -details.toggleable-item summary::-webkit-details-marker /* Safari */ { +.ui.vertical.menu > details.item > summary::marker, /* Chrome, Edge, Firefox */ +.ui.vertical.menu > details.item > summary::-webkit-details-marker /* Safari */ { display: none; } -details.toggleable-item summary::after { +.ui.vertical.menu > details.item > summary::after { transition: transform 0.25s ease; content: ""; width: 14px; height: 14px; mask-size: cover; - -webkit-mask-size: cover; mask-image: var(--octicon-chevron-right); - -webkit-mask-image: var(--octicon-chevron-right); background: currentcolor; border: 1px solid var(--color-body); /* workaround https://bugzilla.mozilla.org/show_bug.cgi?id=1671784 */ } -details.toggleable-item[open] summary::after { +.ui.vertical.menu > details.item[open] > summary::after { transform: rotate(90deg); } + +/* default toggleable details menu: items don't have menu item padding, don't change background color on hover or active */ +.ui.vertical.menu > details.item > .menu { + margin: 0 0 10px; /* only need the space between the current details menu and next item */ +} + +/* full width toggleable details menu: items have menu item padding, change background color on hover and active */ +.ui.vertical.menu > details.item > .menu.items-full-width { + margin: 0; +} + +.ui.vertical.menu > details.item > .menu.items-full-width > .item { + padding: 16px 13px; /* match Fomantic menu item padding */ +} + +.ui.vertical.menu > details.item > .menu.items-full-width > .item.active { + background: var(--color-active); +} + +.ui.vertical.menu > details.item > .menu.items-full-width > .item:hover { + background: var(--color-hover); /* ".ui.vertical.menu .menu .item" resets the hover background, so we need to add it again */ +} diff --git a/web_src/js/components/ActionRunJobView.vue b/web_src/js/components/ActionRunJobView.vue index de3cd3a2e4..835518ecb8 100644 --- a/web_src/js/components/ActionRunJobView.vue +++ b/web_src/js/components/ActionRunJobView.vue @@ -1,7 +1,8 @@