Merge branch 'master' into mobile-tabs

Author: CL-Jeremy

.drone.yml

@@ -6,10 +6,6 @@ platform:
   os: linux
   arch: arm64
 
-workspace:
-  base: /go
-  path: src/code.gitea.io/gitea
-
 trigger:
   event:
     - push
@@ -31,7 +27,7 @@ steps:
 
   - name: lint-backend
     pull: always
-    image: golang:1.15
+    image: golang:1.16
     commands:
       - make lint-backend
     environment:
@@ -41,7 +37,7 @@ steps:
 
   - name: lint-backend-windows
     pull: always
-    image: golang:1.15
+    image: golang:1.16
     commands:
       - make golangci-lint vet
     environment:
@@ -53,7 +49,7 @@ steps:
 
   - name: lint-backend-gogit
     pull: always
-    image: golang:1.15
+    image: golang:1.16
     commands:
       - make lint-backend
     environment:
@@ -69,7 +65,7 @@ steps:
 
   - name: checks-backend
     pull: always
-    image: golang:1.15
+    image: golang:1.16
     commands:
       - make checks-backend
     depends_on: [lint-backend]
@@ -91,7 +87,7 @@ steps:
     depends_on: [checks-backend]
 
   - name: build-backend-arm64
-    image: golang:1.15
+    image: golang:1.16
     environment:
       GO111MODULE: on
       GOPROXY: off
@@ -104,7 +100,7 @@ steps:
     depends_on: [checks-backend]
 
   - name: build-backend-windows
-    image: golang:1.15
+    image: golang:1.16
     environment:
       GO111MODULE: on
       GOPROXY: off
@@ -116,7 +112,7 @@ steps:
     depends_on: [checks-backend]
 
   - name: build-backend-386
-    image: golang:1.15
+    image: golang:1.16
     environment:
       GO111MODULE: on
       GOPROXY: off
@@ -143,10 +139,6 @@ trigger:
     - tag
     - pull_request
 
-workspace:
-  base: /go
-  path: src/code.gitea.io/gitea
-
 services:
   - name: mysql
     image: mysql:5.7
@@ -195,7 +187,7 @@ steps:
 
   - name: build
     pull: always
-    image: golang:1.15
+    image: golang:1.16
     commands:
       - make backend
     environment:
@@ -210,7 +202,7 @@ steps:
       - git update-ref refs/heads/tag_test ${DRONE_COMMIT_SHA}
 
   - name: unit-test
-    image: golang:1.15
+    image: golang:1.16
     commands:
       - make unit-test-coverage test-check
     environment:
@@ -221,7 +213,7 @@ steps:
 
   - name: unit-test-gogit
     pull: always
-    image: golang:1.15
+    image: golang:1.16
     commands:
       - make unit-test-coverage test-check
     environment:
@@ -231,7 +223,7 @@ steps:
         from_secret: github_read_token
 
   - name: test-mysql
-    image: golang:1.15
+    image: golang:1.16
     commands:
       - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
       - apt-get install -y git-lfs
@@ -246,7 +238,7 @@ steps:
       - build
 
   - name: test-mysql8
-    image: golang:1.15
+    image: golang:1.16
     commands:
       - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
       - apt-get install -y git-lfs
@@ -260,7 +252,7 @@ steps:
       - build
 
   - name: test-mssql
-    image: golang:1.15
+    image: golang:1.16
     commands:
       - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
       - apt-get install -y git-lfs
@@ -274,7 +266,7 @@ steps:
       - build
 
   - name: generate-coverage
-    image: golang:1.15
+    image: golang:1.16
     commands:
       - make coverage
     environment:
@@ -324,10 +316,6 @@ trigger:
     - tag
     - pull_request
 
-workspace:
-  base: /go
-  path: src/code.gitea.io/gitea
-
 services:
   - name: pgsql
     pull: default
@@ -352,16 +340,16 @@ steps:
 
   - name: build
     pull: always
-    image: golang:1.15
+    image: golang:1.16
     commands:
       - make backend
     environment:
       GOPROXY: https://goproxy.cn # proxy.golang.org is blocked in China, this proxy is not
       GOSUMDB: sum.golang.org
-      TAGS: bindata sqlite sqlite_unlock_notify
+      TAGS: bindata gogit sqlite sqlite_unlock_notify
 
   - name: test-sqlite
-    image: golang:1.15
+    image: golang:1.16
     commands:
       - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
       - apt-get install -y git-lfs
@@ -375,7 +363,7 @@ steps:
       - build
 
   - name: test-pgsql
-    image: golang:1.15
+    image: golang:1.16
     commands:
       - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
       - apt-get install -y git-lfs
@@ -391,21 +379,19 @@ steps:
 
 ---
 kind: pipeline
-name: translations
+name: update_translations
 
 platform:
   os: linux
   arch: arm64
 
-workspace:
-  base: /go
-  path: src/code.gitea.io/gitea
-
 trigger:
   branch:
     - master
   event:
-    - push
+    - cron
+  cron:
+    - update_translations
 
 steps:
   - name: download
@@ -457,11 +443,7 @@ name: update_gitignore_and_licenses
 
 platform:
   os: linux
-  arch: amd64
-
-workspace:
-  base: /go
-  path: src/code.gitea.io/gitea
+  arch: arm64
 
 trigger:
   branch:
@@ -473,7 +455,7 @@ trigger:
 
 steps:
   - name: download
-    image: golang:1.15
+    image: golang:1.16
     commands:
       - timeout -s ABRT 40m make generate-license generate-gitignore
 
@@ -499,8 +481,8 @@ platform:
   arch: amd64
 
 workspace:
-  base: /go
-  path: src/code.gitea.io/gitea
+  base: /source
+  path: /
 
 trigger:
   branch:
@@ -512,7 +494,6 @@ trigger:
 depends_on:
   - testing-amd64
   - testing-arm64
-  - translations
 
 steps:
   - name: fetch-tags
@@ -522,7 +503,7 @@ steps:
 
   - name: static
     pull: always
-    image: techknowlogick/xgo:go-1.15.x
+    image: techknowlogick/xgo:go-1.16.x
     commands:
       - curl -sL https://deb.nodesource.com/setup_14.x | bash - && apt -y install nodejs
       - export PATH=$PATH:$GOPATH/bin
@@ -598,8 +579,8 @@ platform:
   arch: amd64
 
 workspace:
-  base: /go
-  path: src/code.gitea.io/gitea
+  base: /source
+  path: /
 
 trigger:
   event:
@@ -618,7 +599,7 @@ steps:
 
   - name: static
     pull: always
-    image: techknowlogick/xgo:go-1.15.x
+    image: techknowlogick/xgo:go-1.16.x
     commands:
       - curl -sL https://deb.nodesource.com/setup_14.x | bash - && apt -y install nodejs
       - export PATH=$PATH:$GOPATH/bin
@@ -718,10 +699,6 @@ platform:
   os: linux
   arch: amd64
 
-workspace:
-  base: /go
-  path: src/code.gitea.io/gitea
-
 depends_on:
   - testing-amd64
   - testing-arm64
@@ -730,6 +707,9 @@ trigger:
   ref:
   - refs/heads/master
   - "refs/tags/**"
+  event:
+    exclude:
+    - cron
 
 steps:
   - name: fetch-tags
@@ -784,10 +764,6 @@ platform:
   os: linux
   arch: arm64
 
-workspace:
-  base: /go
-  path: src/code.gitea.io/gitea
-
 depends_on:
   - compliance
 
@@ -820,10 +796,6 @@ platform:
   os: linux
   arch: arm64
 
-workspace:
-  base: /go
-  path: src/code.gitea.io/gitea
-
 depends_on:
   - testing-amd64
   - testing-arm64
@@ -832,6 +804,10 @@ trigger:
   ref:
   - refs/heads/master
   - "refs/tags/**"
+  event:
+    exclude:
+    - cron
+
 steps:
   - name: fetch-tags
     image: docker:git
@@ -916,6 +892,9 @@ trigger:
   ref:
   - refs/heads/master
   - "refs/tags/**"
+  event:
+    exclude:
+    - cron
 
 depends_on:
   - docker-linux-amd64-release
@@ -946,7 +925,6 @@ trigger:
 depends_on:
   - testing-amd64
   - testing-arm64
-  - translations
   - release-version
   - release-latest
   - docker-linux-amd64-release

.github/issue_template.md

@@ -30,6 +30,9 @@
 <!-- In addition, if your problem relates to git commands set `RUN_MODE=dev` at the top of app.ini -->
 
 ## Description
+<!-- If using a proxy or a CDN (e.g. CloudFlare) in front of gitea, please
+     disable the proxy/CDN fully and connect to gitea directly to confirm
+     the issue still persists without those services. -->
 
 ...
 

.gitignore

@@ -106,3 +106,6 @@ prime/
 
 # Make evidence files
 /.make_evidence
+
+# Manpage
+/man

Dockerfile

@@ -1,7 +1,7 @@
 
 ###################################
 #Build stage
-FROM golang:1.15-alpine3.13 AS build-env
+FROM golang:1.16-alpine3.13 AS build-env
 
 ARG GOPROXY
 ENV GOPROXY ${GOPROXY:-direct}
@@ -22,6 +22,9 @@ WORKDIR ${GOPATH}/src/code.gitea.io/gitea
 RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
  && make clean-all build
 
+# Begin env-to-ini build
+RUN go build contrib/environment-to-ini/environment-to-ini.go
+
 FROM alpine:3.13
 LABEL maintainer="[email protected]"
 
@@ -62,4 +65,5 @@ CMD ["/bin/s6-svscan", "/etc/s6"]
 
 COPY docker/root /
 COPY --from=build-env /go/src/code.gitea.io/gitea/gitea /app/gitea/gitea
+COPY --from=build-env /go/src/code.gitea.io/gitea/environment-to-ini /usr/local/bin/environment-to-ini
 RUN ln -s /app/gitea/gitea /usr/local/bin/gitea