Add missing validation steps in KitspaceSignUp

.github/workflows/sync-fork.yml

@@ -0,0 +1,24 @@
+name: Sync fork
+# syncs our main branch with upstream main
+
+on:
+  # runs every monday at 6:21 UTC+0
+  schedule:
+    - cron: '21 6 * * MON'
+  # allow triggers via button click
+  workflow_dispatch:
+
+jobs:
+  sync:
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: tgymnich/[email protected]
+        with:
+          pr_title: Fork updates from go-gitea/gitea main
+          owner: go-gitea
+          base: main
+          head: main
+          auto_approve: false
+          auto_merge: true
+          token: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

@@ -1,5 +1,5 @@
 #Build stage
-FROM golang:1.18-alpine3.15 AS build-env
+FROM golang:1.17-alpine3.15 AS build-env
 
 ARG GOPROXY
 ENV GOPROXY ${GOPROXY:-direct}

Dockerfile.gitea.dev

@@ -0,0 +1,66 @@
+FROM golang:1.17-alpine3.15
+
+ARG GOPROXY
+ENV GOPROXY ${GOPROXY:-direct}
+
+ARG TAGS="sqlite sqlite_unlock_notify"
+ENV TAGS "bindata timetzdata $TAGS"
+ARG CGO_EXTRA_CFLAGS
+
+#Build & runtime deps
+RUN apk --no-cache add \
+    build-base \
+    git \
+    nodejs \
+    npm \
+    bash \
+    ca-certificates \
+    curl \
+    gettext \
+    git \
+    linux-pam \
+    openssh \
+    s6 \
+    sqlite \
+    su-exec \
+    gnupg
+
+
+#Setup repo
+COPY . /go/src/code.gitea.io/gitea
+WORKDIR /go/src/code.gitea.io/gitea
+
+RUN npm install --no-save
+RUN make build
+
+# Begin env-to-ini build
+RUN go build contrib/environment-to-ini/environment-to-ini.go
+
+EXPOSE 22 3000
+
+RUN addgroup \
+    -S -g 1000 \
+    git && \
+    adduser \
+    -S -H -D \
+    -h /data/git \
+    -s /bin/bash \
+    -u 1000 \
+    -G git \
+    git && \
+    echo "git:*" | chpasswd -e
+
+ENV USER git
+ENV GITEA_CUSTOM /data/gitea
+
+VOLUME ["/data"]
+
+ENTRYPOINT ["/usr/bin/entrypoint"]
+CMD ["/bin/s6-svscan", "/etc/s6"]
+
+COPY docker/root /
+RUN mkdir -p /app/gitea
+RUN cp /go/src/code.gitea.io/gitea/gitea /app/gitea/gitea
+RUN cp /go/src/code.gitea.io/gitea/environment-to-ini /usr/local/bin/environment-to-ini
+RUN chmod 755 /usr/bin/entrypoint /app/gitea/gitea /usr/local/bin/gitea /usr/local/bin/environment-to-ini
+RUN chmod 755 /etc/s6/gitea/* /etc/s6/openssh/* /etc/s6/.s6-svscan/*

routers/api/v1/api.go

@@ -772,7 +772,10 @@ func Routes(sessioner func(http.Handler) http.Handler) *web.Route {
 
 			m.Get("/issues/search", repo.SearchIssues)
 
-			m.Post("/migrate", reqToken(), bind(api.MigrateRepoOptions{}), repo.Migrate)
+			m.Group("/migrate", func() {
+				m.Post("", reqToken(), bind(api.MigrateRepoOptions{}), repo.Migrate)
+				m.Get("/status", repo.GetMigratingTask)
+			})
 
 			m.Group("/{username}/{reponame}", func() {
 				m.Combo("").Get(reqAnyRepoReader(), repo.Get).
@@ -803,9 +806,10 @@ func Routes(sessioner func(http.Handler) http.Handler) *web.Route {
 						m.Post("/tests", context.RepoRefForAPI, repo.TestHook)
 					})
 				}, reqToken(), reqAdmin(), reqWebhooksEnabled())
+				m.Get("/collaborators/{collaborator}", reqAnyRepoReader(), repo.IsCollaborator)
 				m.Group("/collaborators", func() {
 					m.Get("", reqAnyRepoReader(), repo.ListCollaborators)
-					m.Combo("/{collaborator}").Get(reqAnyRepoReader(), repo.IsCollaborator).
+					m.Combo("/{collaborator}").
 						Put(reqAdmin(), bind(api.AddCollaboratorOption{}), repo.AddCollaborator).
 						Delete(reqAdmin(), repo.DeleteCollaborator)
 				}, reqToken())