Changelog v1.14.0 (#15360 )

* clean & merge & update v1.14.0 changelog * backport v1.13.x changelogs
Fix delete nonexist oauth application 500 and prevent deadlock (#15384 ) (#15396 )
2025-11-03 08:02:36 +09:00 · 2021-04-11 06:07:02 +02:00 · 2021-04-11 04:57:44 +02:00 · 2021-04-10 14:08:30 +02:00 · 2021-04-09 22:24:40 -04:00 · 2021-04-09 19:43:36 -04:00
3114 changed files with 120328 additions and 170821 deletions
--- a/.changelog.yml
+++ b/.changelog.yml
@@ -14,28 +14,28 @@ groups:
    name: BREAKING
    labels:
      - kind/breaking
-  -
-    name: SECURITY
-    labels:
-      - kind/security
  -
    name: FEATURES
    labels:
      - kind/feature
+  -
+    name: SECURITY
+    labels:
+      - kind/security
  -
    name: API
    labels:
      - kind/api
+  -
+    name: BUGFIXES
+    labels:
+      - kind/bug
  -
    name: ENHANCEMENTS
    labels:
      - kind/enhancement
      - kind/refactor
      - kind/ui
-  -
-    name: BUGFIXES
-    labels:
-      - kind/bug
  -
    name: TESTING
    labels:
--- a/.drone.yml
+++ b/.drone.yml
@@ -4,7 +4,7 @@ name: compliance

 platform:
  os: linux
-  arch: amd64
+  arch: arm64

 trigger:
  event:
@@ -15,19 +15,19 @@ trigger:
 steps:
  - name: deps-frontend
    pull: always
-    image: node:16
+    image: node:14
    commands:
      - make node_modules

  - name: lint-frontend
-    image: node:16
+    image: node:14
    commands:
      - make lint-frontend
    depends_on: [deps-frontend]

  - name: lint-backend
    pull: always
-    image: gitea/test_env:linux-amd64  # https://gitea.com/gitea/test-env
+    image: gitea/test_env:linux-arm64  # https://gitea.com/gitea/test-env
    commands:
      - make lint-backend
    environment:
@@ -37,7 +37,7 @@ steps:

  - name: lint-backend-windows
    pull: always
-    image: gitea/test_env:linux-amd64  # https://gitea.com/gitea/test-env
+    image: gitea/test_env:linux-arm64  # https://gitea.com/gitea/test-env
    commands:
      - make golangci-lint vet
    environment:
@@ -49,7 +49,7 @@ steps:

  - name: lint-backend-gogit
    pull: always
-    image: gitea/test_env:linux-amd64  # https://gitea.com/gitea/test-env
+    image: gitea/test_env:linux-arm64  # https://gitea.com/gitea/test-env
    commands:
      - make lint-backend
    environment:
@@ -58,7 +58,7 @@ steps:
      TAGS: bindata gogit sqlite sqlite_unlock_notify

  - name: checks-frontend
-    image: node:16
+    image: node:14
    commands:
      - make checks-frontend
    depends_on: [deps-frontend]
@@ -70,17 +70,11 @@ steps:
      - make checks-backend
    depends_on: [lint-backend]

-  - name: test-frontend
-    image: node:16
-    commands:
-      - make test-frontend
-    depends_on: [lint-frontend]
-
  - name: build-frontend
-    image: node:16
+    image: node:14
    commands:
      - make frontend
-    depends_on: [test-frontend]
+    depends_on: [lint-frontend]

  - name: build-backend-no-gcc
    pull: always
@@ -153,7 +147,7 @@ services:
      MYSQL_DATABASE: test

  - name: mysql8
-    image: mysql:8
+    image: mysql:8.0
    environment:
      MYSQL_ALLOW_EMPTY_PASSWORD: yes
      MYSQL_DATABASE: testgitea
@@ -277,7 +271,7 @@ steps:
      - test-mysql
    when:
      branch:
-        - main
+        - master
      event:
        - push
        - pull_request
@@ -294,7 +288,7 @@ steps:
      - generate-coverage
    when:
      branch:
-        - main
+        - master
      event:
        - push
        - pull_request
@@ -319,7 +313,7 @@ trigger:
 services:
  - name: pgsql
    pull: default
-    image: postgres:10
+    image: postgres:9.5
    environment:
      POSTGRES_DB: test
      POSTGRES_PASSWORD: postgres
@@ -383,7 +377,7 @@ platform:

 trigger:
  branch:
-    - main
+    - master
  event:
    - cron
  cron:
@@ -404,7 +398,7 @@ steps:

  - name: update
    pull: default
-    image: alpine:3.14
+    image: alpine:3.13
    commands:
      - ./build/update-locales.sh

@@ -414,7 +408,6 @@ steps:
    settings:
      author_email: "teabot@gitea.io"
      author_name: GiteaBot
-      branch: main
      commit: true
      commit_message: "[skip ci] Updated translations via Crowdin"
      remote: "git@github.com:go-gitea/gitea.git"
@@ -444,7 +437,7 @@ platform:

 trigger:
  branch:
-    - main
+    - master
  event:
    - cron
  cron:
@@ -462,7 +455,6 @@ steps:
    settings:
      author_email: "teabot@gitea.io"
      author_name: GiteaBot
-      branch: main
      commit: true
      commit_message: "[skip ci] Updated licenses and gitignores "
      remote: "git@github.com:go-gitea/gitea.git"
@@ -484,7 +476,7 @@ workspace:

 trigger:
  branch:
-    - main
+    - master
    - "release/*"
  event:
    - push
@@ -503,7 +495,7 @@ steps:
    pull: always
    image: techknowlogick/xgo:go-1.16.x
    commands:
-      - curl -sL https://deb.nodesource.com/setup_16.x | bash - && apt-get install -y nodejs
+      - curl -sL https://deb.nodesource.com/setup_14.x | bash - && apt -y install nodejs
      - export PATH=$PATH:$GOPATH/bin
      - make release
    environment:
@@ -530,7 +522,7 @@ steps:
    image: plugins/s3:1
    settings:
      acl: public-read
-      bucket: gitea-artifacts
+      bucket: releases
      endpoint: https://storage.gitea.io
      path_style: true
      source: "dist/release/*"
@@ -547,16 +539,16 @@ steps:
      event:
        - push

-  - name: release-main
+  - name: release-master
    image: plugins/s3:1
    settings:
      acl: public-read
-      bucket: gitea-artifacts
+      bucket: releases
      endpoint: https://storage.gitea.io
      path_style: true
      source: "dist/release/*"
      strip_prefix: dist/release/
-      target: /gitea/main
+      target: /gitea/master
    environment:
      AWS_ACCESS_KEY_ID:
        from_secret: aws_access_key_id
@@ -564,7 +556,7 @@ steps:
        from_secret: aws_secret_access_key
    when:
      branch:
-        - main
+        - master
      event:
        - push

@@ -599,7 +591,7 @@ steps:
    pull: always
    image: techknowlogick/xgo:go-1.16.x
    commands:
-      - curl -sL https://deb.nodesource.com/setup_16.x | bash - && apt-get install -y nodejs
+      - curl -sL https://deb.nodesource.com/setup_14.x | bash - && apt -y install nodejs
      - export PATH=$PATH:$GOPATH/bin
      - make release
    environment:
@@ -626,7 +618,7 @@ steps:
    image: plugins/s3:1
    settings:
      acl: public-read
-      bucket: gitea-artifacts
+      bucket: releases
      endpoint: https://storage.gitea.io
      path_style: true
      source: "dist/release/*"
@@ -685,13 +677,13 @@ steps:
        from_secret: netlify_token
    when:
      branch:
-        - main
+        - master
      event:
        - push

 ---
 kind: pipeline
-name: docker-linux-amd64-release-version
+name: docker-linux-amd64-release

 platform:
  os: linux
@@ -703,6 +695,7 @@ depends_on:

 trigger:
  ref:
+  - refs/heads/master
  - "refs/tags/**"
  event:
    exclude:
@@ -716,7 +709,7 @@ steps:

  - name: publish
    pull: always
-    image: techknowlogick/drone-docker:latest
+    image: plugins/docker:linux-amd64
    settings:
      auto_tag: true
      auto_tag_suffix: linux-amd64
@@ -733,7 +726,7 @@ steps:
        - pull_request

  - name: publish-rootless
-    image: techknowlogick/drone-docker:latest
+    image: plugins/docker:linux-amd64
    settings:
      dockerfile: Dockerfile.rootless
      auto_tag: true
@@ -753,70 +746,6 @@ steps:
        exclude:
        - pull_request

---
-kind: pipeline
-name: docker-linux-amd64-release
-
-platform:
-  os: linux
-  arch: amd64
-
-depends_on:
-  - testing-amd64
-  - testing-arm64
-
-trigger:
-  ref:
-  - refs/heads/main
-  event:
-    exclude:
-    - cron
-
-steps:
-  - name: fetch-tags
-    image: docker:git
-    commands:
-      - git fetch --tags --force
-
-  - name: publish
-    pull: always
-    image: techknowlogick/drone-docker:latest
-    settings:
-      auto_tag: false
-      tags: dev-linux-amd64
-      repo: gitea/gitea
-      build_args:
-        - GOPROXY=off
-      password:
-        from_secret: docker_password
-      username:
-        from_secret: docker_username
-    when:
-      event:
-        exclude:
-        - pull_request
-
-  - name: publish-rootless
-    image: techknowlogick/drone-docker:latest
-    settings:
-      dockerfile: Dockerfile.rootless
-      auto_tag: false
-      tags: dev-linux-amd64-rootless
-      repo: gitea/gitea
-      build_args:
-        - GOPROXY=off
-      password:
-        from_secret: docker_password
-      username:
-        from_secret: docker_username
-    environment:
-      PLUGIN_MIRROR:
-        from_secret: plugin_mirror
-    when:
-      event:
-        exclude:
-        - pull_request
-
 ---
 kind: pipeline
 name: docker-linux-arm64-dry-run
@@ -835,7 +764,7 @@ trigger:
 steps:
  - name: dryrun
    pull: always
-    image: techknowlogick/drone-docker:latest
+    image: plugins/docker:linux-arm64
    settings:
      dry_run: true
      repo: gitea/gitea
@@ -851,7 +780,7 @@ steps:

 ---
 kind: pipeline
-name: docker-linux-arm64-release-version
+name: docker-linux-arm64-release

 platform:
  os: linux
@@ -863,6 +792,7 @@ depends_on:

 trigger:
  ref:
+  - refs/heads/master
  - "refs/tags/**"
  event:
    exclude:
@@ -876,7 +806,7 @@ steps:

  - name: publish
    pull: always
-    image: techknowlogick/drone-docker:latest
+    image: plugins/docker:linux-arm64
    settings:
      auto_tag: true
      auto_tag_suffix: linux-arm64
@@ -896,7 +826,7 @@ steps:
        - pull_request

  - name: publish-rootless
-    image: techknowlogick/drone-docker:latest
+    image: plugins/docker:linux-arm64
    settings:
      dockerfile: Dockerfile.rootless
      auto_tag: true
@@ -916,115 +846,6 @@ steps:
        exclude:
        - pull_request

---
-kind: pipeline
-name: docker-linux-arm64-release
-
-platform:
-  os: linux
-  arch: arm64
-
-depends_on:
-  - testing-amd64
-  - testing-arm64
-
-trigger:
-  ref:
-  - refs/heads/main
-  event:
-    exclude:
-    - cron
-
-steps:
-  - name: fetch-tags
-    image: docker:git
-    commands:
-      - git fetch --tags --force
-
-  - name: publish
-    pull: always
-    image: techknowlogick/drone-docker:latest
-    settings:
-      auto_tag: false
-      tags: dev-linux-arm64
-      repo: gitea/gitea
-      build_args:
-        - GOPROXY=off
-      password:
-        from_secret: docker_password
-      username:
-        from_secret: docker_username
-    environment:
-      PLUGIN_MIRROR:
-        from_secret: plugin_mirror
-    when:
-      event:
-        exclude:
-        - pull_request
-
-  - name: publish-rootless
-    image: techknowlogick/drone-docker:latest
-    settings:
-      dockerfile: Dockerfile.rootless
-      auto_tag: false
-      tags: dev-linux-arm64-rootless
-      repo: gitea/gitea
-      build_args:
-        - GOPROXY=off
-      password:
-        from_secret: docker_password
-      username:
-        from_secret: docker_username
-    environment:
-      PLUGIN_MIRROR:
-        from_secret: plugin_mirror
-    when:
-      event:
-        exclude:
-        - pull_request
---
-kind: pipeline
-name: docker-manifest-version
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-  - name: manifest-rootless
-    pull: always
-    image: plugins/manifest
-    settings:
-      auto_tag: true
-      ignore_missing: true
-      spec: docker/manifest.rootless.tmpl
-      password:
-        from_secret: docker_password
-      username:
-        from_secret: docker_username
-
-  - name: manifest
-    image: plugins/manifest
-    settings:
-      auto_tag: true
-      ignore_missing: true
-      spec: docker/manifest.tmpl
-      password:
-        from_secret: docker_password
-      username:
-        from_secret: docker_username
-
-trigger:
-  ref:
-  - "refs/tags/**"
-  event:
-    exclude:
-    - cron
-
-depends_on:
-  - docker-linux-amd64-release-version
-  - docker-linux-arm64-release-version
-
 ---
 kind: pipeline
 name: docker-manifest
@@ -1038,7 +859,7 @@ steps:
    pull: always
    image: plugins/manifest
    settings:
-      auto_tag: false
+      auto_tag: true
      ignore_missing: true
      spec: docker/manifest.rootless.tmpl
      password:
@@ -1049,7 +870,7 @@ steps:
  - name: manifest
    image: plugins/manifest
    settings:
-      auto_tag: false
+      auto_tag: true
      ignore_missing: true
      spec: docker/manifest.tmpl
      password:
@@ -1059,7 +880,8 @@ steps:

 trigger:
  ref:
-  - refs/heads/main
+  - refs/heads/master
+  - "refs/tags/**"
  event:
    exclude:
    - cron
@@ -1081,7 +903,7 @@ clone:

 trigger:
  branch:
-    - main
+    - master
    - "release/*"
  event:
    - push
@@ -1097,10 +919,7 @@ depends_on:
  - release-latest
  - docker-linux-amd64-release
  - docker-linux-arm64-release
-  - docker-linux-amd64-release-version
-  - docker-linux-arm64-release-version
  - docker-manifest
-  - docker-manifest-version
  - docs

 steps:
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,15 +12,6 @@ insert_final_newline = true
 [*.{go,tmpl,html}]
 indent_style = tab

-[templates/custom/*.tmpl]
-insert_final_newline = false
-
-[templates/swagger/v1_json.tmpl]
-indent_style = space
-
-[templates/user/auth/oidc_wellknown.tmpl]
-indent_style = space
-
 [Makefile]
 indent_style = tab

--- a/.eslintrc
+++ b/.eslintrc
@@ -2,6 +2,7 @@ root: true
 reportUnusedDisableDirectives: true

 ignorePatterns:
+  - /web_src/js/vendor
  - /templates/base/head.tmpl
  - /templates/repo/activity.tmpl
  - /templates/repo/view_file.tmpl
@@ -52,12 +53,6 @@ overrides:
    rules:
      import/no-unresolved: [0]
      import/no-extraneous-dependencies: [0]
-  - files: ["*.test.js"]
-    env:
-      jest: true
-  - files: ["*.config.js"]
-    rules:
-      import/no-unused-modules: [0]

 rules:
  accessor-pairs: [2]
@@ -349,7 +344,6 @@ rules:
  unicode-bom: [2, never]
  unicorn/better-regex: [0]
  unicorn/catch-error-name: [0]
-  unicorn/consistent-destructuring: [2]
  unicorn/consistent-function-scoping: [2]
  unicorn/custom-error-definition: [0]
  unicorn/empty-brace-spaces: [2]
@@ -362,25 +356,19 @@ rules:
  unicorn/import-style: [0]
  unicorn/new-for-builtins: [2]
  unicorn/no-abusive-eslint-disable: [0]
-  unicorn/no-array-for-each: [0]
  unicorn/no-array-instanceof: [0]
-  unicorn/no-array-push-push: [2]
  unicorn/no-console-spaces: [0]
-  unicorn/no-document-cookie: [2]
  unicorn/no-fn-reference-in-iterator: [0]
  unicorn/no-for-loop: [0]
  unicorn/no-hex-escape: [0]
  unicorn/no-keyword-prefix: [0]
  unicorn/no-lonely-if: [2]
  unicorn/no-nested-ternary: [0]
-  unicorn/no-new-array: [0]
  unicorn/no-new-buffer: [0]
  unicorn/no-null: [0]
  unicorn/no-object-as-default-parameter: [2]
  unicorn/no-process-exit: [0]
  unicorn/no-reduce: [2]
-  unicorn/no-static-only-class: [2]
-  unicorn/no-this-assignment: [2]
  unicorn/no-unreadable-array-destructuring: [0]
  unicorn/no-unsafe-regex: [0]
  unicorn/no-unused-properties: [2]
@@ -390,33 +378,24 @@ rules:
  unicorn/numeric-separators-style: [0]
  unicorn/prefer-add-event-listener: [2]
  unicorn/prefer-array-find: [2]
-  unicorn/prefer-array-flat-map: [2]
-  unicorn/prefer-array-flat: [2]
-  unicorn/prefer-array-index-of: [2]
-  unicorn/prefer-array-some: [2]
  unicorn/prefer-dataset: [2]
  unicorn/prefer-date-now: [2]
-  unicorn/prefer-default-parameters: [0]
  unicorn/prefer-event-key: [2]
  unicorn/prefer-includes: [2]
  unicorn/prefer-math-trunc: [2]
  unicorn/prefer-modern-dom-apis: [0]
-  unicorn/prefer-module: [2]
  unicorn/prefer-negative-index: [2]
  unicorn/prefer-node-append: [0]
-  unicorn/prefer-node-protocol: [0]
  unicorn/prefer-node-remove: [0]
  unicorn/prefer-number-properties: [0]
  unicorn/prefer-optional-catch-binding: [2]
  unicorn/prefer-query-selector: [0]
  unicorn/prefer-reflect-apply: [0]
-  unicorn/prefer-regexp-test: [2]
  unicorn/prefer-replace-all: [0]
  unicorn/prefer-set-has: [0]
  unicorn/prefer-spread: [0]
  unicorn/prefer-starts-ends-with: [2]
  unicorn/prefer-string-slice: [0]
-  unicorn/prefer-switch: [0]
  unicorn/prefer-ternary: [0]
  unicorn/prefer-text-content: [2]
  unicorn/prefer-trim-start-end: [2]
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,6 +1,6 @@
 Please check the following:

-1. Make sure you are targeting the `main` branch, pull requests on release branches are only allowed for bug fixes.
+1. Make sure you are targeting the `master` branch, pull requests on release branches are only allowed for bug fixes.
 2. Read contributing guidelines: https://github.com/go-gitea/gitea/blob/master/CONTRIBUTING.md
 3. Describe what your pull request does and which issue you're targeting (if any)

--- a/.gitignore
+++ b/.gitignore
@@ -32,7 +32,6 @@ _testmain.go

 *coverage.out
 coverage.all
-cpu.out

 /modules/options/bindata.go
 /modules/options/bindata.go.hash
@@ -76,14 +75,11 @@ cpu.out
 /integrations/mssql.ini
 /node_modules
 /yarn.lock
-/yarn-error.log
-/npm-debug.log*
 /public/js
 /public/serviceworker.js
 /public/css
 /public/fonts
 /public/img/webpack
-/web_src/fomantic/node_modules
 /web_src/fomantic/build/*
 !/web_src/fomantic/build/semantic.js
 !/web_src/fomantic/build/semantic.css
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -70,6 +70,9 @@ issues:
    - path: modules/log/
      linters:
        - errcheck
+    - path: routers/routes/web.go
+      linters:
+        - dupl
    - path: routers/api/v1/repo/issue_subscription.go
      linters:
        - dupl
@@ -107,8 +110,3 @@ issues:
    - text: "exitAfterDefer:"
      linters:
        - gocritic
-    - path: modules/graceful/manager_windows.go
-      linters:
-        - staticcheck
-      text: "svc.IsAnInteractiveSession is deprecated: Use IsWindowsService instead."
-
--- a/.npmrc
+++ b/.npmrc
@@ -1,5 +1,4 @@
 audit=false
 fund=false
-update-notifier=false
 package-lock=true
 save-exact=true
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,368 +4,12 @@ This changelog goes through all the changes that have been made in each release
 without substantial changes to our git log; to see the highlights of what has
 been added to each release, please refer to the [blog](https://blog.gitea.io).

-## [1.15.0-rc1](https://github.com/go-gitea/gitea/releases/tag/v1.15.0-rc1) - 2021-07-15
-
-* BREAKING
-  * Make app.ini permissions more restrictive (#16266)
-  * Refactor Webhook + Add X-Hub-Signature (#16176)
-  * Add asymmetric JWT signing (#16010)
-  * Clean-up the settings hierarchy for issue_indexer queue (#16001)
-  * Change default queue settings to be low go-routines (#15964)
-  * Improve assets handler middleware (#15961)
-  * Rename StaticUrlPrefix to AssetUrlPrefix (#15779)
-  * Use a generic markup class to display externally rendered files and diffs (#15735)
-  * Add frontend testing, require node 12 (#15315)
-  * Move (custom) assets into subpath `/assets` (#15219)
-  * Use level config in log section when sub log section not set level (#15176)
-  * Links in markdown should be absolute to the repository not the server (#15088)
-* SECURITY
-  * Encrypt LDAP bind password in db with SECRET_KEY (#15547)
-  * Remove random password in Dockerfiles (#15362)
-* FEATURES
-  * Update Go-Git to take advantage of LargeObjectThreshold (#16316)
-  * Support custom mime type mapping for text files (#16304)
-  * Link to previous blames in file blame page (#16259)
-  * Add LRU mem cache implementation (#16226)
-  * Localize Email Templates (#16200)
-  * Make command in authorized keys a template (#16003)
-  * Add possibility to make branch in branch page (#15960)
-  * Add email headers (#15939)
-  * Make tasklist checkboxes clickable (#15791)
-  * Add selecting tags on the compare page (#15723)
-  * Add cron job to delete old actions from database (#15688)
-  * On open repository open common cat file batch and batch-check (#15667)
-  * Add tag protection (#15629)
-  * Add push to remote mirror repository (#15157)
-  * Add Image Diff for SVG files (#14867)
-  * Add dashboard milestone search and repo milestone search by name. (#14866)
-  * Add LFS Migration and Mirror (#14726)
-  * Improve notifications for WIP draft PR's (#14663)
-  * Disable Stars config option (#14653)
-  * Add option to provide signature for a token to verify key ownership (#14054)
-  * OAuth2 auto-register (#5123)
-* API
-  * Return updated repository when changing repository using API (#16420)
-  * Let branch/tag name be a valid ref to get CI status (#16400)
-  * Add endpoint to get commits of PR (#16300)
-  * Allow COMMENT reviews to not specify a body (#16229)
-  * Add subject-type filter to list notification API endpoints (#16177)
-  * ListReleases add filter for draft and pre-releases (#16175)
-  * ListIssues add more filters (#16174)
-  * Issue Search Add filter for MilestoneNames (#16173)
-  * GET / SET User Settings (#16169)
-  * Expose repo.GetReviewers() & repo.GetAssignees() (#16168)
-  * User expose counters (#16167)
-  * Add repoGetTag (#16166)
-  * Add repoCreateTag (#16165)
-  * Creating a repo from a template repo via API (#15958)
-  * Add Active and ProhibitLogin to API (#15689)
-  * Add Location, Website and Description to API (#15675)
-  * Expose resolver via API (#15167)
-* ENHANCEMENTS
-  * Support HTTP/2 in Let's Encrypt (#16371)
-  * Introduce NotifySubjectType (#16320)
-  * Add forge emojies (#16296)
-  * Implemented head_commit for webhooks (#16282)
-  * Upgrade Gliderlabs SSH to 0.3.3 and add FailedConnectionCallback (#16278)
-  * Add previous/next buttons to review comments (#16273)
-  * Review comments: break-word for long file names (#16272)
-  * Add configuration to restrict allowed user visibility modes (#16271)
-  * Add scroll-margin-top to account for sticky header (#16269)
-  * Add --quiet and --verbose to gitea web to control initial logging (#16260)
-  * Use gitea logging module for git module (#16243)
-  * Add tests for all webhooks (#16214)
-  * Add button to delete undeleted repositories from failed migrations (#16197)
-  * Speed up git diff highlight generation (#16180)
-  * Add OpenID claims "profile" and "email". (#16141)
-  * Reintroduce squash merge default comment as a config setting (#16134)
-  * Add sanitizer rules per renderer (#16110)
-  * Improve performance of dashboard list orgs (#16099)
-  * Refactor assert statements in tests (#16089)
-  * Add sso.Group, context.Auth, context.APIAuth to allow auth special routes (#16086)
-  * Remove unnecessary goroutine (#16080)
-  * Add attachments for PR reviews (#16075)
-  * Make the github migration less rate limit waiting to get comment per page from repository but not per issue (#16070)
-  * Add Visible modes function from Organisation to Users too (#16069)
-  * Add checkbox to delete pull branch after successful merge (#16049)
-  * Make commit info cancelable (#16032)
-  * Make modules/context.Context a context.Context (#16031)
-  * Unified custom config creation (#16012)
-  * Make sshd_config more flexible regarding connections (#16009)
-  * Append to existing trailers in generated squash commit message (#15980)
-  * Always store primary email address into email_address table and also the state (#15956)
-  * Load issue/PR context popup data only when needed (#15955)
-  * Remove remaining fontawesome usage in templates (#15952)
-  * Remove fomantic accordion module (#15951)
-  * Small refactoring of modules/private (#15947)
-  * Double the avatar size factor (#15941)
-  * Add curl to rootless docker image (#15908)
-  * Replace clipboard.js with async clipboard api (#15899)
-  * Allow custom highlight mapping beyond file extensions (#15808)
-  * Add trace logging to SSO methods (#15803)
-  * Refactor routers directory (#15800)
-  * Allow only internal registration (#15795)
-  * Add a new internal hook to save ssh log (#15787)
-  * Respect default merge message syntax when parsing item references (#15772)
-  * OAuth2 login: Set account link to "login" as default behavior (#15768)
-  * Use single shared random string generation function (#15741)
-  * Hold the event source when there are no listeners (#15725)
-  * Code comments improvements (#15722)
-  * Provide OIDC compliant user info endpoint (#15721)
-  * Fix webkit calendar icon color on arc-green (#15713)
-  * Improve Light Chroma style (#15699)
-  * Only use boost workers for leveldb shadow queues (#15696)
-  * Add compare tag dropdown to releases page (#15695)
-  * Add caret styling CSS (#15651)
-  * Remove x-ua-compatible meta tag (#15640)
-  * Refactor of link creation (#15619)
-  * Add a new table issue_index to store the max issue index so that issue could be deleted with no duplicated index (#15599)
-  * Rewrite of the LFS server (#15523)
-  * Display more repository type on admin repository management (#15440)
-  * Remove usage of some JS globals (#15378)
-  * SHA in merged commit comment should be rendered ui sha (#15376)
-  * Add well-known config for OIDC (#15355)
-  * Use route rather than use thus reducing the number of stack frames (#15301)
-  * Code Formats, Nits & Unused Func/Var deletions (#15286)
-  * Let package git depend on setting but not opposite (#15241)
-  * Fixed sanitize errors (#15240)
-  * response simple text message for not html request when 404 (#15229)
-  * Remove file-loader dependency (#15196)
-  * Refactor renders (#15175)
-  * Add mimetype mapping settings (#15133)
-  * Add Status Updates whilst Gitea migrations are occurring (#15076)
-  * Reload locales in initialisation if needed by utilizing i18n.Reset (#15073)
-  * Counterwork seemingly unclickable repo button labels (#15064)
-  * Add DefaultMergeStyle option to repository (#14789)
-  * Added support for gopher URLs. (#14749)
-  * Rework repository archive (#14723)
-  * Add links to toggle WIP status (#14677)
-  * Add Tabular Diff for CSV files (#14661)
-  * Use milestone deadline when sorting issues (#14551)
-* BUGFIXES
-  * Fix invalid params and typo of email templates (#16394)
-  * Fix activation of primary email addresses (#16385)
-  * Fix calculation for finalPage in repo-search component (#16382)
-  * Specify user in rootless container numerically (#16361)
-  * Detect encoding changes while parsing diff (#16330)
-  * Fix U2F error reasons always hidden (#16327)
-  * Prevent zombie processes (#16314)
-  * Escape reference to `user` table in models.SearchEmails (#16313)
-  * Fix default push instructions on empty repos (#16302)
-  * Fix modified files list in webhooks when there is a space (#16288)
-  * Fix webhook commits wrong hash on HEAD reset (#16283)
-  * Fuzzer finds an NPE due to incorrect URLPrefix (#16249)
-  * Don't WARN log UserNotExist errors on ExternalUserLogin failure (#16238)
-  * Do not show No match found for tribute (#16231)
-  * Fix "Copy Link" for pull requests (#16230)
-  * Fix diff expansion is missing final line in a file (#16222)
-  * Fix private repo permission problem (#16142)
-  * Fix not able to update local created non-urlencoded wiki pages (#16139)
-  * More efficiently parse shas for shaPostProcessor (#16101)
-  * Fix `doctor --run check-db-consistency --fix` with label fix (#16094)
-  * Prevent webhook action buttons from shifting (#16087)
-  * Change default TMPDIR path in rootless containers (#16077)
-  * Fix typo and add TODO notice (#16064)
-  * Use git log name-status in get last commit (#16059)
-  * Fix 500 Error with branch and tag sharing the same name (#16040)
-  * Fix get tag when migration (#16014)
-  * Add custom emoji support (#16004)
-  * Use filepath.ToSlash and Join in indexer defaults and queues (#15971)
-  * Add permission check for ``GenerateRepository`` (#15946)
-  * Ensure settings for Service and Mailer are read on the install page (#15943)
-  * Fix layout of milestone view (#15927)
-  * Unregister non-matching serviceworkers (#15834)
-  * Multiple Queue improvements: LevelDB Wait on empty, shutdown empty shadow level queue, reduce goroutines etc (#15693)
-  * Attachment support repository route (#15580)
-  * Fix missing icons and colorpicker when mounted on suburl (#15501)
-  * Create a session on ReverseProxy and ensure that ReverseProxy users cannot change username (#15304)
-  * Prevent double-login for Git HTTP and LFS and simplify login (#15303)
-  * Resolve Object { type: "error", data: undefined } in stopwatch.js (#15278)
-  * Fix heatmap activity (#15252)
-  * Remove vendored copy of fomantic-dropdown (#15193)
-  * Update repository size on cron gc task (#15177)
-  * Add NeedPostProcess for Parser interface to improve performance of csv parser and some external parser (#15153)
-  * Add code block highlight to orgmode back (#14222)
-  * Remove User.GetOrganizations() (#14032)
-* TESTING
-  * Bump `postgres` and `mysql` versions (#15710)
-  * Add tests for clone from wiki (#15513)
-  * Fix Benchmark tests, remove a broken one & add two new  (#15250)
-  * Create Proper Migration tests (#15116)
-* TRANSLATION
-  * Use a special name for update default branch on repository setting (#15893)
-  * Fix mirror_lfs source string in en-US locale (#15369)
-* BUILD
-  * Upgrade xorm to v1.1.1 (#16339)
-  * Alpine 3.14 released (#16170)
-  * Disable legal comments in esbuild (#15929)
-  * Switch to Node 16 to build fronted  (#15804)
-  * Use esbuild to minify CSS (#15756)
-  * Use binary version of revive linter (#15739)
-  * Fix: npx webpack make: *** [Makefile:699: public/js/index.js] Error -… (#15465)
-  * Stop packaging node_modules in release tarballs (#15273)
-  * Introduce esbuild on webpack (#14578)
-* DOCS
-  * Update queue workers documentation (#15999)
-  * Comment out app.example.ini (#15807)
-  * Improve logo customization docs (#15754)
-  * Add some response status on api docs (#15399)
-  * Rework Token API comments (#15162)
-  * Add better errors for disabled account recovery (#15117)
-* MISC
-  * Remove utf8 option from installation page (#16126)
-  * Use Wants= over Requires= in systemd file (#15897)
-
-## [1.14.4](https://github.com/go-gitea/gitea/releases/tag/v1.14.4) - 2021-07-06
-
-* BUGFIXES
-  * Fix relative links in postprocessed images (#16334) (#16340)
-  * Fix list_options GetStartEnd (#16303) (#16305)
-  * Fix API to use author for commits instead of committer (#16276) (#16277)
-  * Handle misencoding of login_source cfg in mssql (#16268) (#16275)
-  * Fixed issues not updated by commits (#16254) (#16261)
-  * Improve efficiency in FindRenderizableReferenceNumeric and getReference (#16251) (#16255)
-  * Use html.Parse rather than html.ParseFragment (#16223) (#16225)
-  * Fix milestone counters on new issue (#16183) (#16224)
-  * reqOrgMembership calls need to be preceded by reqToken (#16198) (#16219)
-
-## [1.14.3](https://github.com/go-gitea/gitea/releases/tag/v1.14.3) - 2021-06-18
-
-* SECURITY
-  * Encrypt migration credentials at rest (#15895) (#16187)
-  * Only check access tokens if they are likely to be tokens (#16164) (#16171)
-  * Add missing SameSite settings for the i_like_gitea cookie (#16037) (#16039)
-  * Fix setting of SameSite on cookies (#15989) (#15991)
-* API
-  * Repository object only count releases as releases (#16184) (#16190)
-  * EditOrg respect RepoAdminChangeTeamAccess option (#16184) (#16190)
-  * Fix overly strict edit pr permissions (#15900) (#16081)
-* BUGFIXES
-  * Run processors on whole of text (#16155) (#16185)
-  * Class `issue-keyword` is being incorrectly stripped off spans (#16163) (#16172)
-  * Fix language switch for install page (#16043) (#16128)
-  * Fix bug on getIssueIDsByRepoID (#16119) (#16124)
-  * Set self-adjusting deadline for connection writing (#16068) (#16123)
-  * Fix http path bug (#16117) (#16120)
-  * Fix data URI scramble (#16098) (#16118)
-  * Merge all deleteBranch as one function and also fix bug when delete branch don't close related PRs (#16067) (#16097)
-  * git migration: don't prompt interactively for clone credentials (#15902) (#16082)
-  * Fix case change in ownernames (#16045) (#16050)
-  * Don't manipulate input params in email notification (#16011) (#16033)
-  * Remove branch URL before IssueRefURL (#15968) (#15970)
-  * Fix layout of milestone view (#15927) (#15940)
-  * GitHub Migration, migrate draft releases too (#15884) (#15888)
-  * Close the gitrepo when deleting the repository (#15876) (#15887)
-  * Upgrade xorm to v1.1.0 (#15869) (#15885)
-  * Fix blame row height alignment (#15863) (#15883)
-  * Fix error message when saving generated LOCAL_ROOT_URL config (#15880) (#15882)
-  * Backport Fix LFS commit finder not working (#15856) (#15874)
-  * Stop calling WriteHeader in Write (#15862) (#15873)
-  * Add timeout to writing to responses (#15831) (#15872)
-  * Return go-get info on subdirs (#15642) (#15871)
-  * Restore PAM user autocreation functionality (#15825) (#15867)
-  * Fix truncate utf8 string (#15828) (#15854)
-  * Fix bound address/port for caddy's certmagic library (#15758) (#15848)
-  * Upgrade unrolled/render to v1.1.1 (#15845) (#15846)
-  * Queue manager FlushAll can loop rapidly - add delay (#15733) (#15840)
-  * Tagger can be empty, as can Commit and Author - tolerate this (#15835) (#15839)
-  * Set autocomplete off on branches selector (#15809) (#15833)
-  * Add missing error to Doctor log (#15813) (#15824)
-  * Move restore repo to internal router and invoke from command to avoid open the same db file or queues files (#15790) (#15816)
-* ENHANCEMENTS
-  * Removable media support to snap package (#16136) (#16138)
-  * Move sans-serif fallback font higher than emoji fonts (#15855) (#15892)
-* DOCKER
-  * Only write config in environment-to-ini if there are changes (#15861) (#15868)
-  * Only offer hostcertificates if they exist (#15849) (#15853)
-
-## [1.14.2](https://github.com/go-gitea/gitea/releases/tag/v1.14.2) - 2021-05-09
-
-* API
-  * Make change repo settings work on empty repos (#15778) (#15789)
-  * Add pull "merged" notification subject status to API (#15344) (#15654)
-* BUGFIXES
-  * Ensure that ctx.Written is checked after issues(...) calls (#15797) (#15798)
-  * Use pulls in commit graph unless pulls are disabled (#15734 & #15740 & #15774) (#15775)
-  * Set GIT_DIR correctly if it is not set (#15751) (#15769)
-  * Fix bug where repositories appear unadopted (#15757) (#15767)
-  * Not show `ref-in-new-issue` pop when issue was disabled (#15761) (#15765)
-  * Drop back to use IsAnInteractiveSession for SVC (#15749) (#15762)
-  * Fix setting version table in dump (#15753) (#15759)
-  * Fix close button change on delete in simplemde area (#15737) (#15747)
-  * Defer closing the gitrepo until the end of the wrapped context functions (#15653) (#15746)
-  * Fix some ui bug about draft release (#15137) (#15745)
-  * Only log Error on getLastCommitStatus error to let pull list still be visible (#15716) (#15715)
-  * Move tooltip down to allow selection of Remove File on error (#15672) (#15714)
-  * Fix setting redis db path (#15698) (#15708)
-  * Fix DB session cleanup (#15697) (#15700)
-  * Fixed several activation bugs (#15473) (#15685)
-  * Delete references if repository gets deleted (#15681) (#15684)
-  * Fix orphaned objects deletion bug (#15657) (#15683)
-  * Delete protected branch if repository gets removed (#15658) (#15676)
-  * Remove spurious set name from eventsource.sharedworker.js (#15643) (#15652)
-  * Not update updated uinx for `git gc` (#15637) (#15641)
-  * Fix commit graph author link (#15627) (#15630)
-  * Fix webhook timeout bug (#15613) (#15621)
-  * Resolve panic on failed interface conversion in migration v156 (#15604) (#15610)
-  * Fix missing storage init (#15589) (#15598)
-  * If the default branch is not present do not report error on stats indexing (#15546 & #15583) (#15594)
-  * Fix lfs management find (#15537) (#15578)
-  * Fix NPE on view commit with notes (#15561) (#15573)
-  * Fix bug on commit graph (#15517) (#15530)
-  * Send size to /avatars if requested (#15459) (#15528)
-  * Prevent migration 156 failure if tag commit missing (#15519) (#15527)
-* ENHANCEMENTS
-  * Display conflict-free merge messages for pull requests (#15773) (#15796)
-  * Exponential Backoff for ByteFIFO (#15724) (#15793)
-  * Issue list alignment tweaks (#15483) (#15766)
-  * Implement delete release attachments and update release attachments' name (#14130) (#15666)
-  * Add placeholder text to deploy key textarea (#15575) (#15576)
-  * Project board improvements (#15429) (#15560)
-  * Repo branch page: label size, PR ref, new PR button alignment (#15363) (#15365)
-* MISC
-  * Fix webkit calendar icon color on arc-green (#15713) (#15728)
-  * Performance improvement for last commit cache and show-ref (#15455) (#15701)
-  * Bump unrolled/render to v1.1.0 (#15581) (#15608)
-  * Add ETag header (#15370) (#15552)
-
-## [1.14.1](https://github.com/go-gitea/gitea/releases/tag/v1.14.1) - 2021-04-15
-
-* BUGFIXES
-  * Fix bug clone wiki (#15499) (#15502)
-  * Github Migration ignore rate limit, if not enabled (#15490) (#15495)
-  * Use subdir for URL (#15446) (#15493)
-  * Query the DB for the hash before inserting in to email_hash (#15457) (#15491)
-  * Ensure review dismissal only dismisses the correct review (#15477) (#15489)
-  * Use index of the supported tags to choose user lang (#15452) (#15488)
-  * Fix wrong file link in code search page (#15466) (#15486)
-  * Quick template fix for built-in SSH server in admin config (#15464) (#15481)
-  * Prevent superfluous response.WriteHeader (#15456) (#15476)
-  * Fix ambiguous argument error on tags (#15432) (#15474)
-  * Add created_unix instead of expiry to migration (#15458) (#15463)
-  * Fix repository search (#15428) (#15442)
-  * Prevent NPE on avatar direct rendering if federated avatars disabled (#15434) (#15439)
-  * Fix wiki clone urls (#15430) (#15431)
-  * Fix dingtalk icon url at webhook (#15417) (#15426)
-  * Standardise icon on projects PR page (#15387) (#15408)
-* ENHANCEMENTS
-  * Add option to skip LFS/attachment files for `dump` (#15407) (#15492)
-  * Clone panel fixes (#15436)
-  * Use semantic dropdown for code search query type (#15276) (#15364)
-* BUILD
-  * Build go-git variants for windows (#15482) (#15487)
-  * Lock down build-images dependencies (Partial #15479) (#15480)
-* MISC
-  * Performance improvement for list pull requests (#15447) (#15500)
-  * Fix potential copy lfs records failure when fork a repository (#15441) (#15485)
-
 ## [1.14.0](https://github.com/go-gitea/gitea/releases/tag/v1.14.0) - 2021-04-11

 * SECURITY
  * Respect approved email domain list for externally validated user registration (#15014)
  * Add reverse proxy configuration support for remote IP address detection (#14959)
  * Ensure validation occurs on clone addresses too (#14994)
-  * Fix several render issues highlighted during fuzzing (#14986)
 * BREAKING
  * Fix double 'push tag' action feed (#15078) (#15083)
  * Remove possible resource leak (#15067) (#15082)
@@ -664,7 +308,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
  * Fix bug on avatar middleware (#15124) (#15125)
  * Fix another clusterfuzz identified issue (#15096) (#15114)
 * API
-  * Fix nil exeption for get pull reviews API #15104 (#15106)
+  * Fix nil pointer exception in get pull reviews API (#15106)
 * BUGFIXES
  * Fix markdown rendering in milestone content (#15056) (#15092)

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,14 +3,12 @@
 ## Table of Contents

 - [Contribution Guidelines](#contribution-guidelines)
-  - [Table of Contents](#table-of-contents)
  - [Introduction](#introduction)
  - [Bug reports](#bug-reports)
  - [Discuss your design](#discuss-your-design)
  - [Testing redux](#testing-redux)
  - [Vendoring](#vendoring)
  - [Translation](#translation)
-  - [Building Gitea](#building-gitea)
  - [Code review](#code-review)
  - [Styleguide](#styleguide)
  - [Design guideline](#design-guideline)
@@ -228,18 +226,18 @@ We assume in good faith that the information you provide is legally binding.

 We adopted a release schedule to streamline the process of working
 on, finishing, and issuing releases. The overall goal is to make a
-minor release every three or four months, which breaks down into two or three months of
+minor release every two months, which breaks down into one month of
 general development followed by one month of testing and polishing
 known as the release freeze. All the feature pull requests should be
-merged before feature freeze. And, during the frozen period, a corresponding 
-release branch is open for fixes backported from main branch. Release candidates 
-are made during this period for user testing to
+merged in the first month of one release period. And, during the frozen
+period, a corresponding release branch is open for fixes backported from
+master. Release candidates are made during this period for user testing to
 obtain a final version that is maintained in this branch. A release is
 maintained by issuing patch releases to only correct critical problems
 such as crashes or security issues.

-Major release cycles are seasonal. They always begin on the 25th and end on
-the 24th (i.e., the 25th of December to March 24th).
+Major release cycles are bimonthly. They always begin on the 25th and end on
+the 24th (i.e., the 25th of December to February 24th).

 During a development cycle, we may also publish any necessary minor releases
 for the previous version. For example, if the latest, published release is
--- a/6
+++ b/6
@@ -1,7 +1,7 @@

 ###################################
 #Build stage
-FROM golang:1.16-alpine3.14 AS build-env
+FROM golang:1.16-alpine3.13 AS build-env

 ARG GOPROXY
 ENV GOPROXY ${GOPROXY:-direct}
@@ -25,7 +25,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
 # Begin env-to-ini build
 RUN go build contrib/environment-to-ini/environment-to-ini.go

-FROM alpine:3.14
+FROM alpine:3.13
 LABEL maintainer="maintainers@gitea.io"

 EXPOSE 22 3000
@@ -53,7 +53,7 @@ RUN addgroup \
    -u 1000 \
    -G git \
    git && \
-  echo "git:*" | chpasswd -e
+  echo "git:$(dd if=/dev/urandom bs=24 count=1 status=none | base64)" | chpasswd

 ENV USER git
 ENV GITEA_CUSTOM /data/gitea
--- a/Dockerfile.rootless
+++ b/Dockerfile.rootless
@@ -1,7 +1,7 @@

 ###################################
 #Build stage
-FROM golang:1.16-alpine3.14 AS build-env
+FROM golang:1.16-alpine3.13 AS build-env

 ARG GOPROXY
 ENV GOPROXY ${GOPROXY:-direct}
@@ -25,7 +25,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
 # Begin env-to-ini build
 RUN go build contrib/environment-to-ini/environment-to-ini.go

-FROM alpine:3.14
+FROM alpine:3.13
 LABEL maintainer="maintainers@gitea.io"

 EXPOSE 2222 3000
@@ -35,7 +35,6 @@ RUN apk --no-cache add \
    ca-certificates \
    gettext \
    git \
-    curl \
    gnupg

 RUN addgroup \
@@ -47,7 +46,8 @@ RUN addgroup \
    -s /bin/bash \
    -u 1000 \
    -G git \
-    git
+    git && \
+  echo "git:$(dd if=/dev/urandom bs=24 count=1 status=none | base64)" | chpasswd

 RUN mkdir -p /var/lib/gitea /etc/gitea
 RUN chown git:git /var/lib/gitea /etc/gitea
@@ -56,13 +56,10 @@ COPY docker/rootless /
 COPY --from=build-env --chown=root:root /go/src/code.gitea.io/gitea/gitea /usr/local/bin/gitea
 COPY --from=build-env --chown=root:root /go/src/code.gitea.io/gitea/environment-to-ini /usr/local/bin/environment-to-ini

-#git:git
-USER 1000:1000
+USER git:git
 ENV GITEA_WORK_DIR /var/lib/gitea
 ENV GITEA_CUSTOM /var/lib/gitea/custom
 ENV GITEA_TEMP /tmp/gitea
-ENV TMPDIR /tmp/gitea
-
 #TODO add to docs the ability to define the ini to load (usefull to test and revert a config)
 ENV GITEA_APP_INI /etc/gitea/app.ini
 ENV HOME "/var/lib/gitea/git"
--- a/3
+++ b/3
@@ -41,6 +41,3 @@ Karl Heinz Marbaise <kama@soebes.de> (@khmarbaise)
 Norwin Roosen <git@nroo.de> (@noerw)
 Kyle Dumont <kdumontnu@gmail.com> (@kdumontnu)
 Patrick Schratz <patrick.schratz@gmail.com> (@pat-s)
-Janis Estelmann <admin@oldschoolhack.me> (@KN4CK3R)
-Steven Kriegler <sk.bunsenbrenner@gmail.com> (@justusbunsi)
-Jimmy Praet <jimmy.praet@telenet.be> (@jpraet)
--- a/121
+++ b/121
@@ -26,7 +26,7 @@ COMMA := ,

 XGO_VERSION := go-1.16.x
 MIN_GO_VERSION := 001014000
-MIN_NODE_VERSION := 012017000
+MIN_NODE_VERSION := 010013000

 DOCKER_IMAGE ?= gitea/gitea
 DOCKER_TAG ?= latest
@@ -43,9 +43,6 @@ endif
 ifeq ($(OS), Windows_NT)
 	GOFLAGS := -v -buildmode=exe
 	EXECUTABLE ?= gitea.exe
-else ifeq ($(OS), Windows)
-	GOFLAGS := -v -buildmode=exe
-	EXECUTABLE ?= gitea.exe
 else
 	GOFLAGS := -v
 	EXECUTABLE ?= gitea
@@ -64,9 +61,8 @@ EXTRA_GOFLAGS ?=
 MAKE_VERSION := $(shell $(MAKE) -v | head -n 1)
 MAKE_EVIDENCE_DIR := .make_evidence

-ifeq ($(RACE_ENABLED),true)
-	GOFLAGS += -race
-	GOTESTFLAGS += -race
+ifneq ($(RACE_ENABLED),)
+	GOTESTFLAGS ?= -race
 endif

 STORED_VERSION_FILE := VERSION
@@ -78,7 +74,7 @@ else
 	ifneq ($(DRONE_BRANCH),)
 		VERSION ?= $(subst release/v,,$(DRONE_BRANCH))
 	else
-		VERSION ?= main
+		VERSION ?= master
 	endif

 	STORED_VERSION=$(shell cat $(STORED_VERSION_FILE) 2>/dev/null)
@@ -93,9 +89,11 @@ LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(G

 LINUX_ARCHS ?= linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64

-GO_PACKAGES ?= $(filter-out code.gitea.io/gitea/models/migrations code.gitea.io/gitea/integrations/migration-test code.gitea.io/gitea/integrations,$(shell $(GO) list -mod=vendor ./... | grep -v /vendor/))
+GO_PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations/migration-test,$(filter-out code.gitea.io/gitea/integrations,$(shell $(GO) list -mod=vendor ./... | grep -v /vendor/)))

-FOMANTIC_WORK_DIR := web_src/fomantic
+FOMANTIC_CONFIGS := semantic.json web_src/fomantic/theme.config.less web_src/fomantic/_site/globals/site.variables
+FOMANTIC_DEST := web_src/fomantic/build/semantic.js web_src/fomantic/build/semantic.css
+FOMANTIC_DEST_DIR := web_src/fomantic/build

 WEBPACK_SOURCES := $(shell find web_src/js web_src/less -type f)
 WEBPACK_CONFIGS := webpack.config.js
@@ -115,8 +113,6 @@ TAGS_EVIDENCE := $(MAKE_EVIDENCE_DIR)/tags

 TEST_TAGS ?= sqlite sqlite_unlock_notify

-TAR_EXCLUDES := .git data indexers queues log node_modules $(EXECUTABLE) $(FOMANTIC_WORK_DIR)/node_modules $(DIST) $(MAKE_EVIDENCE_DIR) $(AIR_TMP_DIR)
-
 GO_DIRS := cmd integrations models modules routers build services vendor tools

 GO_SOURCES := $(wildcard *.go)
@@ -175,9 +171,6 @@ help:
 	@echo " - checks                           run various consistency checks"
 	@echo " - checks-frontend                  check frontend files"
 	@echo " - checks-backend                   check backend files"
-	@echo " - test                             test everything"
-	@echo " - test-frontend                    test frontend files"
-	@echo " - test-backend                     test backend files"
 	@echo " - webpack                          build webpack files"
 	@echo " - svg                              build svg files"
 	@echo " - fomantic                         build fomantic files"
@@ -214,16 +207,15 @@ git-check:
 .PHONY: node-check
 node-check:
 	$(eval NODE_VERSION := $(shell printf "%03d%03d%03d" $(shell node -v | cut -c2- | tr '.' ' ');))
-	$(eval MIN_NODE_VER_FMT := $(shell printf "%g.%g.%g" $(shell echo $(MIN_NODE_VERSION) | grep -o ...)))
 	$(eval NPM_MISSING := $(shell hash npm > /dev/null 2>&1 || echo 1))
 	@if [ "$(NODE_VERSION)" -lt "$(MIN_NODE_VERSION)" -o "$(NPM_MISSING)" = "1" ]; then \
-		echo "Gitea requires Node.js $(MIN_NODE_VER_FMT) or greater and npm to build. You can get it at https://nodejs.org/en/download/"; \
+		echo "Gitea requires Node.js 10 or greater and npm to build. You can get it at https://nodejs.org/en/download/"; \
 		exit 1; \
 	fi

 .PHONY: clean-all
 clean-all: clean
-	rm -rf $(WEBPACK_DEST_ENTRIES) node_modules
+	rm -rf $(WEBPACK_DEST_ENTRIES)

 .PHONY: clean
 clean:
@@ -286,10 +278,7 @@ errcheck:

 .PHONY: revive
 revive:
-	@hash revive > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
-		GO111MODULE=off $(GO) get -u github.com/mgechev/revive; \
-	fi
-	@revive -config .revive.toml -exclude=./vendor/... ./...
+	GO111MODULE=on $(GO) run -mod=vendor build/lint.go -config .revive.toml -exclude=./vendor/... ./... || exit 1

 .PHONY: misspell-check
 misspell-check:
@@ -297,7 +286,7 @@ misspell-check:
 		GO111MODULE=off $(GO) get -u github.com/client9/misspell/cmd/misspell; \
 	fi
 	@echo "Running misspell-check..."
-	@misspell -error -i unknwon $(GO_SOURCES_OWN)
+	@misspell -error -i unknwon,destory $(GO_SOURCES_OWN)

 .PHONY: misspell
 misspell:
@@ -331,9 +320,8 @@ lint: lint-frontend lint-backend

 .PHONY: lint-frontend
 lint-frontend: node_modules
-	npx eslint --color --max-warnings=0 web_src/js build templates *.config.js
+	npx eslint --color --max-warnings=0 web_src/js build templates webpack.config.js
 	npx stylelint --color --max-warnings=0 web_src/less
-	npx editorconfig-checker templates

 .PHONY: lint-backend
 lint-backend: golangci-lint revive vet
@@ -355,23 +343,16 @@ watch-backend: go-check
 	air -c .air.conf

 .PHONY: test
-test: test-frontend test-backend
-
-.PHONY: test-backend
-test-backend:
+test:
 	@echo "Running go test with -tags '$(TEST_TAGS)'..."
 	@$(GO) test $(GOTESTFLAGS) -mod=vendor -tags='$(TEST_TAGS)' $(GO_PACKAGES)

-.PHONY: test-frontend
-test-frontend: node_modules
-	@NODE_OPTIONS="--experimental-vm-modules --no-warnings" npx jest --color
-
 .PHONY: test-check
 test-check:
 	@echo "Running test-check...";
 	@diff=$$(git status -s); \
 	if [ -n "$$diff" ]; then \
-		echo "make test-backend has changed files in the source tree:"; \
+		echo "make test has changed files in the source tree:"; \
 		echo "$${diff}"; \
 		echo "You should change the tests to create these files in a temporary directory."; \
 		echo "Do not simply add these files to .gitignore"; \
@@ -381,7 +362,7 @@ test-check:
 .PHONY: test\#%
 test\#%:
 	@echo "Running go test with -tags '$(TEST_TAGS)'..."
-	@$(GO) test -mod=vendor $(GOTESTFLAGS) -tags='$(TEST_TAGS)' -run $(subst .,/,$*) $(GO_PACKAGES)
+	@$(GO) test -mod=vendor -tags='$(TEST_TAGS)' -run $(subst .,/,$*) $(GO_PACKAGES)

 .PHONY: coverage
 coverage:
@@ -418,9 +399,8 @@ test-sqlite\#%: integrations.sqlite.test generate-ini-sqlite
 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test -test.run $(subst .,/,$*)

 .PHONY: test-sqlite-migration
-test-sqlite-migration:  migrations.sqlite.test migrations.individual.sqlite.test generate-ini-sqlite
+test-sqlite-migration:  migrations.sqlite.test generate-ini-sqlite
 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/sqlite.ini ./migrations.sqlite.test
-	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/sqlite.ini ./migrations.individual.sqlite.test

 generate-ini-mysql:
 	sed -e 's|{{TEST_MYSQL_HOST}}|${TEST_MYSQL_HOST}|g' \
@@ -439,9 +419,8 @@ test-mysql\#%: integrations.mysql.test generate-ini-mysql
 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql.ini ./integrations.mysql.test -test.run $(subst .,/,$*)

 .PHONY: test-mysql-migration
-test-mysql-migration: migrations.mysql.test migrations.individual.mysql.test generate-ini-mysql
+test-mysql-migration: migrations.mysql.test generate-ini-mysql
 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql.ini ./migrations.mysql.test
-	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql.ini ./migrations.individual.mysql.test

 generate-ini-mysql8:
 	sed -e 's|{{TEST_MYSQL8_HOST}}|${TEST_MYSQL8_HOST}|g' \
@@ -460,9 +439,8 @@ test-mysql8\#%: integrations.mysql8.test generate-ini-mysql8
 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql8.ini ./integrations.mysql8.test -test.run $(subst .,/,$*)

 .PHONY: test-mysql8-migration
-test-mysql8-migration: migrations.mysql8.test migrations.individual.mysql8.test generate-ini-mysql8
+test-mysql8-migration: migrations.mysql8.test generate-ini-mysql8
 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql8.ini ./migrations.mysql8.test
-	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql8.ini ./migrations.individual.mysql8.test

 generate-ini-pgsql:
 	sed -e 's|{{TEST_PGSQL_HOST}}|${TEST_PGSQL_HOST}|g' \
@@ -482,9 +460,8 @@ test-pgsql\#%: integrations.pgsql.test generate-ini-pgsql
 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/pgsql.ini ./integrations.pgsql.test -test.run $(subst .,/,$*)

 .PHONY: test-pgsql-migration
-test-pgsql-migration: migrations.pgsql.test migrations.individual.pgsql.test generate-ini-pgsql
+test-pgsql-migration: migrations.pgsql.test generate-ini-pgsql
 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/pgsql.ini ./migrations.pgsql.test
-	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/pgsql.ini ./migrations.individual.pgsql.test

 generate-ini-mssql:
 	sed -e 's|{{TEST_MSSQL_HOST}}|${TEST_MSSQL_HOST}|g' \
@@ -503,9 +480,8 @@ test-mssql\#%: integrations.mssql.test generate-ini-mssql
 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mssql.ini ./integrations.mssql.test -test.run $(subst .,/,$*)

 .PHONY: test-mssql-migration
-test-mssql-migration: migrations.mssql.test migrations.individual.mssql.test generate-ini-mssql
+test-mssql-migration: migrations.mssql.test generate-ini-mssql
 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mssql.ini ./migrations.mssql.test -test.failfast
-	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mssql.ini ./migrations.individual.mssql.test -test.failfast

 .PHONY: bench-sqlite
 bench-sqlite: integrations.sqlite.test generate-ini-sqlite
@@ -565,26 +541,6 @@ migrations.mssql.test: $(GO_SOURCES)
 migrations.sqlite.test: $(GO_SOURCES)
 	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/integrations/migration-test -o migrations.sqlite.test -tags '$(TEST_TAGS)'

-.PHONY: migrations.individual.mysql.test
-migrations.individual.mysql.test: $(GO_SOURCES)
-	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/models/migrations -o migrations.individual.mysql.test
-
-.PHONY: migrations.individual.mysql8.test
-migrations.individual.mysql8.test: $(GO_SOURCES)
-	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/models/migrations -o migrations.individual.mysql8.test
-
-.PHONY: migrations.individual.pgsql.test
-migrations.individual.pgsql.test: $(GO_SOURCES)
-	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/models/migrations -o migrations.individual.pgsql.test
-
-.PHONY: migrations.individual.mssql.test
-migrations.individual.mssql.test: $(GO_SOURCES)
-	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/models/migrations -o migrations.individual.mssql.test
-
-.PHONY: migrations.individual.sqlite.test
-migrations.individual.sqlite.test: $(GO_SOURCES)
-	$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/models/migrations -o migrations.individual.sqlite.test -tags '$(TEST_TAGS)'
-
 .PHONY: check
 check: test

@@ -596,7 +552,7 @@ install: $(wildcard *.go)
 build: frontend backend

 .PHONY: frontend
-frontend: $(WEBPACK_DEST)
+frontend: node-check $(WEBPACK_DEST)

 .PHONY: backend
 backend: go-check generate $(EXECUTABLE)
@@ -621,9 +577,6 @@ release-windows: | $(DIST_DIRS)
 		$(GO) install src.techknowlogick.com/xgo@latest; \
 	fi
 	CGO_CFLAGS="$(CGO_CFLAGS)" xgo -go $(XGO_VERSION) -buildmode exe -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out gitea-$(VERSION) .
-ifeq (,$(findstring gogit,$(TAGS)))
-	CGO_CFLAGS="$(CGO_CFLAGS)" xgo -go $(XGO_VERSION) -buildmode exe -dest $(DIST)/binaries -tags 'netgo osusergo gogit $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out gitea-$(VERSION)-gogit .
-endif
 ifeq ($(CI),drone)
 	cp /build/* $(DIST)/binaries
 endif
@@ -664,11 +617,9 @@ release-compress: | $(DIST_DIRS)
 	cd $(DIST)/release/; for file in `find . -type f -name "*"`; do echo "compressing $${file}" && gxz -k -9 $${file}; done;

 .PHONY: release-sources
-release-sources: | $(DIST_DIRS)
+release-sources: | $(DIST_DIRS) node_modules
 	echo $(VERSION) > $(STORED_VERSION_FILE)
-# bsdtar needs a ^ to prevent matching subdirectories
-	$(eval EXCL := --exclude=$(shell tar --help | grep -q bsdtar && echo "^")./)
-	tar $(addprefix $(EXCL),$(TAR_EXCLUDES)) -czf $(DIST)/release/gitea-src-$(VERSION).tar.gz .
+	tar --exclude=./$(DIST) --exclude=./.git --exclude=./$(MAKE_EVIDENCE_DIR) --exclude=./node_modules/.cache --exclude=./$(AIR_TMP_DIR) -czf $(DIST)/release/gitea-src-$(VERSION).tar.gz .
 	rm -f $(STORED_VERSION_FILE)

 .PHONY: release-docs
@@ -694,18 +645,22 @@ npm-update: node-check | node_modules
 	@touch node_modules

 .PHONY: fomantic
-fomantic:
-	rm -rf $(FOMANTIC_WORK_DIR)/build
-	cd $(FOMANTIC_WORK_DIR) && npm install --no-save
-	cp -f $(FOMANTIC_WORK_DIR)/theme.config.less $(FOMANTIC_WORK_DIR)/node_modules/fomantic-ui/src/theme.config
-	cp -rf $(FOMANTIC_WORK_DIR)/_site $(FOMANTIC_WORK_DIR)/node_modules/fomantic-ui/src/
-	cd $(FOMANTIC_WORK_DIR) && npx gulp -f node_modules/fomantic-ui/gulpfile.js build
+fomantic: $(FOMANTIC_DEST)
+
+$(FOMANTIC_DEST): $(FOMANTIC_CONFIGS) | node_modules
+	@if [ ! -d node_modules/fomantic-ui ]; then \
+		npm install --no-save --no-package-lock fomantic-ui@2.8.7; \
+	fi
+	rm -rf $(FOMANTIC_DEST_DIR)
+	cp -f web_src/fomantic/theme.config.less node_modules/fomantic-ui/src/theme.config
+	cp -rf web_src/fomantic/_site/* node_modules/fomantic-ui/src/_site/
+	npx gulp -f node_modules/fomantic-ui/gulpfile.js build
+	@touch $(FOMANTIC_DEST)

 .PHONY: webpack
 webpack: $(WEBPACK_DEST)

-$(WEBPACK_DEST): $(WEBPACK_SOURCES) $(WEBPACK_CONFIGS) package-lock.json
-	@$(MAKE) -s node-check node_modules
+$(WEBPACK_DEST): $(WEBPACK_SOURCES) $(WEBPACK_CONFIGS) package-lock.json | node_modules
 	rm -rf $(WEBPACK_DEST_ENTRIES)
 	npx webpack
 	@touch $(WEBPACK_DEST)
@@ -744,8 +699,8 @@ generate-gitignore:
 	GO111MODULE=on $(GO) run build/generate-gitignores.go

 .PHONY: generate-images
-generate-images: | node_modules
-	npm install --no-save --no-package-lock fabric@4 imagemin-zopfli@7
+generate-images:
+	npm install --no-save --no-package-lock fabric imagemin-zopfli
 	node build/generate-images.js $(TAGS)

 .PHONY: generate-manpage
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
 <p align="center">
  <a href="https://gitea.io/">
-    <img alt="Gitea" src="https://raw.githubusercontent.com/go-gitea/gitea/main/public/img/gitea.svg" width="220"/>
+    <img alt="Gitea" src="https://raw.githubusercontent.com/go-gitea/gitea/master/public/img/gitea.svg" width="220"/>
  </a>
 </p>
 <h1 align="center">Gitea - Git with a cup of tea</h1>

 <p align="center">
  <a href="https://drone.gitea.io/go-gitea/gitea" title="Build Status">
-    <img src="https://drone.gitea.io/api/badges/go-gitea/gitea/status.svg?ref=refs/heads/main">
+    <img src="https://drone.gitea.io/api/badges/go-gitea/gitea/status.svg?ref=refs/heads/master">
  </a>
  <a href="https://discord.gg/Gitea" title="Join the Discord chat at https://discord.gg/Gitea">
    <img src="https://img.shields.io/discord/322538954119184384.svg">
@@ -16,7 +16,7 @@
    <img src="https://images.microbadger.com/badges/image/gitea/gitea.svg">
  </a>
  <a href="https://codecov.io/gh/go-gitea/gitea" title="Codecov">
-    <img src="https://codecov.io/gh/go-gitea/gitea/branch/main/graph/badge.svg">
+    <img src="https://codecov.io/gh/go-gitea/gitea/branch/master/graph/badge.svg">
  </a>
  <a href="https://godoc.org/code.gitea.io/gitea" title="Go Report Card">
    <img src="https://goreportcard.com/badge/code.gitea.io/gitea">
@@ -77,11 +77,13 @@ or if sqlite support is required:
 The `build` target is split into two sub-targets:

 - `make backend` which requires [Go 1.13](https://golang.org/dl/) or greater.
- `make frontend` which requires [Node.js 12.17](https://nodejs.org/en/download/) or greater and Internet connectivity to download npm dependencies.
+- `make frontend` which requires [Node.js 10.13](https://nodejs.org/en/download/) or greater.

-When building from the official source tarballs which include pre-built frontend files, the `frontend` target will not be triggered, making it possible to build without Node.js and Internet connectivity.
+If pre-built frontend files are present it is possible to only build the backend:

-Parallelism (`make -j <num>`) is not supported.
+    TAGS="bindata" make backend
+
+Parallelism is not supported for these targets, so please don't include `-j <num>`.

 More info: https://docs.gitea.io/en-us/install-from-source/

@@ -101,16 +103,6 @@ NOTES:
 1. **YOU MUST READ THE [CONTRIBUTORS GUIDE](CONTRIBUTING.md) BEFORE STARTING TO WORK ON A PULL REQUEST.**
 2. If you have found a vulnerability in the project, please write privately to **security@gitea.io**. Thanks!

-## Translating
-
-Translations are done through Crowdin. If you want to translate to a new language ask one of the managers in the Crowdin project to add a new language there. 
-
-You can also just create an issue for adding a language or ask on discord on the #translation channel. If you need context or find some translation issues, you can leave a comment on the string or ask on Discord. For general translation questions there is a section in the docs. Currently a bit empty but we hope fo fill it as questions pop up.
-
-https://docs.gitea.io/en-us/translation-guidelines/
-
-[![Crowdin](https://badges.crowdin.net/gitea/localized.svg)](https://crowdin.com/project/gitea)
-
 ## Further information

 For more information and instructions about how to install Gitea, please look at our [documentation](https://docs.gitea.io/en-us/).
@@ -160,7 +152,7 @@ We're [working on it](https://github.com/go-gitea/gitea/issues/1029).
 ## License

 This project is licensed under the MIT License.
-See the [LICENSE](https://github.com/go-gitea/gitea/blob/main/LICENSE) file
+See the [LICENSE](https://github.com/go-gitea/gitea/blob/master/LICENSE) file
 for the full license text.

 ## Screenshots
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -1,13 +1,13 @@
 <p align="center">
  <a href="https://gitea.io/">
-    <img alt="Gitea" src="https://raw.githubusercontent.com/go-gitea/gitea/main/public/img/gitea.svg" width="220"/>
+    <img alt="Gitea" src="https://raw.githubusercontent.com/go-gitea/gitea/master/public/img/gitea.svg" width="220"/>
  </a>
 </p>
 <h1 align="center">Gitea - Git with a cup of tea</h1>

 <p align="center">
  <a href="https://drone.gitea.io/go-gitea/gitea" title="Build Status">
-    <img src="https://drone.gitea.io/api/badges/go-gitea/gitea/status.svg?ref=refs/heads/main">
+    <img src="https://drone.gitea.io/api/badges/go-gitea/gitea/status.svg?ref=refs/heads/master">
  </a>
  <a href="https://discord.gg/Gitea" title="Join the Discord chat at https://discord.gg/Gitea">
    <img src="https://img.shields.io/discord/322538954119184384.svg">
@@ -16,7 +16,7 @@
    <img src="https://images.microbadger.com/badges/image/gitea/gitea.svg">
  </a>
  <a href="https://codecov.io/gh/go-gitea/gitea" title="Codecov">
-    <img src="https://codecov.io/gh/go-gitea/gitea/branch/main/graph/badge.svg">
+    <img src="https://codecov.io/gh/go-gitea/gitea/branch/master/graph/badge.svg">
  </a>
  <a href="https://godoc.org/code.gitea.io/gitea" title="Go Report Card">
    <img src="https://goreportcard.com/badge/code.gitea.io/gitea">
@@ -71,11 +71,6 @@ Gitea 的首要目标是创建一个极易安装，运行非常快速，安装

 Fork -> Patch -> Push -> Pull Request

-## 翻译
-
-多语言翻译是基于Crowdin进行的.
-[![Crowdin](https://badges.crowdin.net/gitea/localized.svg)](https://crowdin.com/project/gitea)
-
 ## 作者

 * [Maintainers](https://github.com/orgs/go-gitea/people)
@@ -84,7 +79,7 @@ Fork -> Patch -> Push -> Pull Request

 ## 授权许可

-本项目采用 MIT 开源授权许可证，完整的授权说明已放置在 [LICENSE](https://github.com/go-gitea/gitea/blob/main/LICENSE) 文件中。
+本项目采用 MIT 开源授权许可证，完整的授权说明已放置在 [LICENSE](https://github.com/go-gitea/gitea/blob/master/LICENSE) 文件中。

 ## 截图

--- a/build.go
+++ b/build.go
@@ -10,6 +10,14 @@ package main
 // These libraries will not be included in a normal compilation.

 import (
+	// for lint
+	_ "github.com/mgechev/dots"
+	_ "github.com/mgechev/revive/formatter"
+	_ "github.com/mgechev/revive/lint"
+	_ "github.com/mgechev/revive/rule"
+	_ "github.com/mitchellh/go-homedir"
+	_ "github.com/pelletier/go-toml"
+
 	// for embed
 	_ "github.com/shurcooL/vfsgen"

--- a/build/generate-images.js
+++ b/build/generate-images.js
@@ -1,12 +1,12 @@
-import imageminZopfli from 'imagemin-zopfli';
-import {optimize, extendDefaultPlugins} from 'svgo';
-import {fabric} from 'fabric';
-import fs from 'fs';
-import {resolve, dirname} from 'path';
-import {fileURLToPath} from 'url';
+#!/usr/bin/env node
+'use strict';
+
+const imageminZopfli = require('imagemin-zopfli');
+const Svgo = require('svgo');
+const {fabric} = require('fabric');
+const {readFile, writeFile} = require('fs').promises;
+const {resolve} = require('path');

-const {readFile, writeFile} = fs.promises;
-const __dirname = dirname(fileURLToPath(import.meta.url));
 const logoFile = resolve(__dirname, '../assets/logo.svg');

 function exit(err) {
@@ -24,15 +24,14 @@ function loadSvg(svg) {

 async function generate(svg, outputFile, {size, bg}) {
  if (outputFile.endsWith('.svg')) {
-    const {data} = optimize(svg, {
-      plugins: extendDefaultPlugins([
-        'removeDimensions',
-        {
-          name: 'addAttributesToSVGElement',
-          params: {attributes: [{width: size}, {height: size}]}
-        },
-      ]),
+    const svgo = new Svgo({
+      plugins: [
+        {removeDimensions: true},
+        {addAttributesToSVGElement: {attributes: [{width: size}, {height: size}]}},
+      ],
    });
+
+    const {data} = await svgo.optimize(svg);
    await writeFile(outputFile, data);
    return;
  }
--- a/build/generate-svg.js
+++ b/build/generate-svg.js
@@ -1,11 +1,11 @@
-import fastGlob from 'fast-glob';
-import {optimize, extendDefaultPlugins} from 'svgo';
-import {resolve, parse, dirname} from 'path';
-import fs from 'fs';
-import {fileURLToPath} from 'url';
+#!/usr/bin/env node
+'use strict';
+
+const fastGlob = require('fast-glob');
+const Svgo = require('svgo');
+const {resolve, parse} = require('path');
+const {readFile, writeFile, mkdir} = require('fs').promises;

-const {readFile, writeFile, mkdir} = fs.promises;
-const __dirname = dirname(fileURLToPath(import.meta.url));
 const glob = (pattern) => fastGlob.sync(pattern, {cwd: resolve(__dirname), absolute: true});
 const outputDir = resolve(__dirname, '../public/img/svg');

@@ -25,20 +25,31 @@ async function processFile(file, {prefix, fullName} = {}) {
    if (prefix === 'octicon') name = name.replace(/-[0-9]+$/, ''); // chop of '-16' on octicons
  }

-  const {data} = optimize(await readFile(file, 'utf8'), {
-    plugins: extendDefaultPlugins([
-      'removeXMLNS',
-      'removeDimensions',
+  const svgo = new Svgo({
+    plugins: [
+      {removeXMLNS: true},
+      {removeDimensions: true},
      {
-        name: 'addClassesToSVGElement',
-        params: {classNames: ['svg', name]},
+        addClassesToSVGElement: {
+          classNames: [
+            'svg',
+            name,
+          ],
+        },
      },
      {
-        name: 'addAttributesToSVGElement',
-        params: {attributes: [{'width': '16'}, {'height': '16'}, {'aria-hidden': 'true'}]},
+        addAttributesToSVGElement: {
+          attributes: [
+            {'width': '16'},
+            {'height': '16'},
+            {'aria-hidden': 'true'},
+          ],
        },
-    ]),
+      },
+    ],
  });
+
+  const {data} = await svgo.optimize(await readFile(file, 'utf8'));
  await writeFile(resolve(outputDir, `${name}.svg`), data);
 }

--- a/build/lint.go
+++ b/build/lint.go
@@ -0,0 +1,325 @@
+// Copyright 2020 The Gitea Authors. All rights reserved.
+// Copyright (c) 2018 Minko Gechev. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+package main
+
+import (
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/mgechev/dots"
+	"github.com/mgechev/revive/formatter"
+	"github.com/mgechev/revive/lint"
+	"github.com/mgechev/revive/rule"
+	"github.com/mitchellh/go-homedir"
+	"github.com/pelletier/go-toml"
+)
+
+func fail(err string) {
+	fmt.Fprintln(os.Stderr, err)
+	os.Exit(1)
+}
+
+var defaultRules = []lint.Rule{
+	&rule.VarDeclarationsRule{},
+	&rule.PackageCommentsRule{},
+	&rule.DotImportsRule{},
+	&rule.BlankImportsRule{},
+	&rule.ExportedRule{},
+	&rule.VarNamingRule{},
+	&rule.IndentErrorFlowRule{},
+	&rule.IfReturnRule{},
+	&rule.RangeRule{},
+	&rule.ErrorfRule{},
+	&rule.ErrorNamingRule{},
+	&rule.ErrorStringsRule{},
+	&rule.ReceiverNamingRule{},
+	&rule.IncrementDecrementRule{},
+	&rule.ErrorReturnRule{},
+	&rule.UnexportedReturnRule{},
+	&rule.TimeNamingRule{},
+	&rule.ContextKeysType{},
+	&rule.ContextAsArgumentRule{},
+}
+
+var allRules = append([]lint.Rule{
+	&rule.ArgumentsLimitRule{},
+	&rule.CyclomaticRule{},
+	&rule.FileHeaderRule{},
+	&rule.EmptyBlockRule{},
+	&rule.SuperfluousElseRule{},
+	&rule.ConfusingNamingRule{},
+	&rule.GetReturnRule{},
+	&rule.ModifiesParamRule{},
+	&rule.ConfusingResultsRule{},
+	&rule.DeepExitRule{},
+	&rule.UnusedParamRule{},
+	&rule.UnreachableCodeRule{},
+	&rule.AddConstantRule{},
+	&rule.FlagParamRule{},
+	&rule.UnnecessaryStmtRule{},
+	&rule.StructTagRule{},
+	&rule.ModifiesValRecRule{},
+	&rule.ConstantLogicalExprRule{},
+	&rule.BoolLiteralRule{},
+	&rule.RedefinesBuiltinIDRule{},
+	&rule.ImportsBlacklistRule{},
+	&rule.FunctionResultsLimitRule{},
+	&rule.MaxPublicStructsRule{},
+	&rule.RangeValInClosureRule{},
+	&rule.RangeValAddress{},
+	&rule.WaitGroupByValueRule{},
+	&rule.AtomicRule{},
+	&rule.EmptyLinesRule{},
+	&rule.LineLengthLimitRule{},
+	&rule.CallToGCRule{},
+	&rule.DuplicatedImportsRule{},
+	&rule.ImportShadowingRule{},
+	&rule.BareReturnRule{},
+	&rule.UnusedReceiverRule{},
+	&rule.UnhandledErrorRule{},
+	&rule.CognitiveComplexityRule{},
+	&rule.StringOfIntRule{},
+}, defaultRules...)
+
+var allFormatters = []lint.Formatter{
+	&formatter.Stylish{},
+	&formatter.Friendly{},
+	&formatter.JSON{},
+	&formatter.NDJSON{},
+	&formatter.Default{},
+	&formatter.Unix{},
+	&formatter.Checkstyle{},
+	&formatter.Plain{},
+}
+
+func getFormatters() map[string]lint.Formatter {
+	result := map[string]lint.Formatter{}
+	for _, f := range allFormatters {
+		result[f.Name()] = f
+	}
+	return result
+}
+
+func getLintingRules(config *lint.Config) []lint.Rule {
+	rulesMap := map[string]lint.Rule{}
+	for _, r := range allRules {
+		rulesMap[r.Name()] = r
+	}
+
+	lintingRules := []lint.Rule{}
+	for name := range config.Rules {
+		rule, ok := rulesMap[name]
+		if !ok {
+			fail("cannot find rule: " + name)
+		}
+		lintingRules = append(lintingRules, rule)
+	}
+
+	return lintingRules
+}
+
+func parseConfig(path string) *lint.Config {
+	config := &lint.Config{}
+	file, err := ioutil.ReadFile(path)
+	if err != nil {
+		fail("cannot read the config file")
+	}
+	err = toml.Unmarshal(file, config)
+	if err != nil {
+		fail("cannot parse the config file: " + err.Error())
+	}
+	return config
+}
+
+func normalizeConfig(config *lint.Config) {
+	if config.Confidence == 0 {
+		config.Confidence = 0.8
+	}
+	severity := config.Severity
+	if severity != "" {
+		for k, v := range config.Rules {
+			if v.Severity == "" {
+				v.Severity = severity
+			}
+			config.Rules[k] = v
+		}
+		for k, v := range config.Directives {
+			if v.Severity == "" {
+				v.Severity = severity
+			}
+			config.Directives[k] = v
+		}
+	}
+}
+
+func getConfig() *lint.Config {
+	config := defaultConfig()
+	if configPath != "" {
+		config = parseConfig(configPath)
+	}
+	normalizeConfig(config)
+	return config
+}
+
+func getFormatter() lint.Formatter {
+	formatters := getFormatters()
+	formatter := formatters["default"]
+	if formatterName != "" {
+		f, ok := formatters[formatterName]
+		if !ok {
+			fail("unknown formatter " + formatterName)
+		}
+		formatter = f
+	}
+	return formatter
+}
+
+func buildDefaultConfigPath() string {
+	var result string
+	if homeDir, err := homedir.Dir(); err == nil {
+		result = filepath.Join(homeDir, "revive.toml")
+		if _, err := os.Stat(result); err != nil {
+			result = ""
+		}
+	}
+
+	return result
+}
+
+func defaultConfig() *lint.Config {
+	defaultConfig := lint.Config{
+		Confidence: 0.0,
+		Severity:   lint.SeverityWarning,
+		Rules:      map[string]lint.RuleConfig{},
+	}
+	for _, r := range defaultRules {
+		defaultConfig.Rules[r.Name()] = lint.RuleConfig{}
+	}
+	return &defaultConfig
+}
+
+func normalizeSplit(strs []string) []string {
+	res := []string{}
+	for _, s := range strs {
+		t := strings.Trim(s, " \t")
+		if len(t) > 0 {
+			res = append(res, t)
+		}
+	}
+	return res
+}
+
+func getPackages() [][]string {
+	globs := normalizeSplit(flag.Args())
+	if len(globs) == 0 {
+		globs = append(globs, ".")
+	}
+
+	packages, err := dots.ResolvePackages(globs, normalizeSplit(excludePaths))
+	if err != nil {
+		fail(err.Error())
+	}
+
+	return packages
+}
+
+type arrayFlags []string
+
+func (i *arrayFlags) String() string {
+	return strings.Join([]string(*i), " ")
+}
+
+func (i *arrayFlags) Set(value string) error {
+	*i = append(*i, value)
+	return nil
+}
+
+var configPath string
+var excludePaths arrayFlags
+var formatterName string
+var help bool
+
+var originalUsage = flag.Usage
+
+func init() {
+	flag.Usage = func() {
+		originalUsage()
+	}
+	// command line help strings
+	const (
+		configUsage    = "path to the configuration TOML file, defaults to $HOME/revive.toml, if present (i.e. -config myconf.toml)"
+		excludeUsage   = "list of globs which specify files to be excluded (i.e. -exclude foo/...)"
+		formatterUsage = "formatter to be used for the output (i.e. -formatter stylish)"
+	)
+
+	defaultConfigPath := buildDefaultConfigPath()
+
+	flag.StringVar(&configPath, "config", defaultConfigPath, configUsage)
+	flag.Var(&excludePaths, "exclude", excludeUsage)
+	flag.StringVar(&formatterName, "formatter", "", formatterUsage)
+	flag.Parse()
+}
+
+func main() {
+	config := getConfig()
+	formatter := getFormatter()
+	packages := getPackages()
+
+	revive := lint.New(func(file string) ([]byte, error) {
+		return ioutil.ReadFile(file)
+	})
+
+	lintingRules := getLintingRules(config)
+
+	failures, err := revive.Lint(packages, lintingRules, *config)
+	if err != nil {
+		fail(err.Error())
+	}
+
+	formatChan := make(chan lint.Failure)
+	exitChan := make(chan bool)
+
+	var output string
+	go (func() {
+		output, err = formatter.Format(formatChan, *config)
+		if err != nil {
+			fail(err.Error())
+		}
+		exitChan <- true
+	})()
+
+	exitCode := 0
+	for f := range failures {
+		if f.Confidence < config.Confidence {
+			continue
+		}
+		if exitCode == 0 {
+			exitCode = config.WarningCode
+		}
+		if c, ok := config.Rules[f.RuleName]; ok && c.Severity == lint.SeverityError {
+			exitCode = config.ErrorCode
+		}
+		if c, ok := config.Directives[f.RuleName]; ok && c.Severity == lint.SeverityError {
+			exitCode = config.ErrorCode
+		}
+
+		formatChan <- f
+	}
+
+	close(formatChan)
+	<-exitChan
+	if output != "" {
+		fmt.Println(output)
+	}
+
+	os.Exit(exitCode)
+}
--- a/cmd/admin.go
+++ b/cmd/admin.go
@@ -21,7 +21,6 @@ import (
 	pwd "code.gitea.io/gitea/modules/password"
 	repo_module "code.gitea.io/gitea/modules/repository"
 	"code.gitea.io/gitea/modules/setting"
-	"code.gitea.io/gitea/modules/storage"

 	"github.com/urfave/cli"
 )
@@ -490,10 +489,6 @@ func runDeleteUser(c *cli.Context) error {
 		return err
 	}

-	if err := storage.Init(); err != nil {
-		return err
-	}
-
 	var err error
 	var user *models.User
 	if c.IsSet("email") {
@@ -517,7 +512,7 @@ func runDeleteUser(c *cli.Context) error {
 	return models.DeleteUser(user)
 }

-func runRepoSyncReleases(_ *cli.Context) error {
+func runRepoSyncReleases(c *cli.Context) error {
 	if err := initDB(); err != nil {
 		return err
 	}
@@ -583,14 +578,14 @@ func getReleaseCount(id int64) (int64, error) {
 	)
 }

-func runRegenerateHooks(_ *cli.Context) error {
+func runRegenerateHooks(c *cli.Context) error {
 	if err := initDB(); err != nil {
 		return err
 	}
 	return repo_module.SyncRepositoryHooks(graceful.GetManager().ShutdownContext())
 }

-func runRegenerateKeys(_ *cli.Context) error {
+func runRegenerateKeys(c *cli.Context) error {
 	if err := initDB(); err != nil {
 		return err
 	}
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -7,13 +7,9 @@
 package cmd

 import (
-	"context"
 	"errors"
 	"fmt"
-	"os"
-	"os/signal"
 	"strings"
-	"syscall"

 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/setting"
@@ -70,25 +66,3 @@ func initDBDisableConsole(disableConsole bool) error {
 	}
 	return nil
 }
-
-func installSignals() (context.Context, context.CancelFunc) {
-	ctx, cancel := context.WithCancel(context.Background())
-	go func() {
-		// install notify
-		signalChannel := make(chan os.Signal, 1)
-
-		signal.Notify(
-			signalChannel,
-			syscall.SIGINT,
-			syscall.SIGTERM,
-		)
-		select {
-		case <-signalChannel:
-		case <-ctx.Done():
-		}
-		cancel()
-		signal.Reset()
-	}()
-
-	return ctx, cancel
-}
--- a/cmd/convert.go
+++ b/cmd/convert.go
@@ -27,10 +27,10 @@ func runConvert(ctx *cli.Context) error {
 		return err
 	}

-	log.Info("AppPath: %s", setting.AppPath)
-	log.Info("AppWorkPath: %s", setting.AppWorkPath)
-	log.Info("Custom path: %s", setting.CustomPath)
-	log.Info("Log path: %s", setting.LogRootPath)
+	log.Trace("AppPath: %s", setting.AppPath)
+	log.Trace("AppWorkPath: %s", setting.AppWorkPath)
+	log.Trace("Custom path: %s", setting.CustomPath)
+	log.Trace("Log path: %s", setting.LogRootPath)
 	setting.InitDBConfig()

 	if !setting.Database.UseMySQL {
--- a/cmd/dump.go
+++ b/cmd/dump.go
@@ -129,14 +129,6 @@ It can be used for backup and capture Gitea server image to send to maintainer`,
 			Name:  "skip-custom-dir",
 			Usage: "Skip custom directory",
 		},
-		cli.BoolFlag{
-			Name:  "skip-lfs-data",
-			Usage: "Skip LFS data",
-		},
-		cli.BoolFlag{
-			Name:  "skip-attachment-data",
-			Usage: "Skip attachment data",
-		},
 		cli.GenericFlag{
 			Name:  "type",
 			Value: outputTypeEnum,
@@ -222,9 +214,7 @@ func runDump(ctx *cli.Context) error {
 			fatal("Failed to include repositories: %v", err)
 		}

-		if ctx.IsSet("skip-lfs-data") && ctx.Bool("skip-lfs-data") {
-			log.Info("Skip dumping LFS data")
-		} else if err := storage.LFS.IterateObjects(func(objPath string, object storage.Object) error {
+		if err := storage.LFS.IterateObjects(func(objPath string, object storage.Object) error {
 			info, err := object.Stat()
 			if err != nil {
 				return err
@@ -280,7 +270,7 @@ func runDump(ctx *cli.Context) error {
 	}

 	if ctx.IsSet("skip-custom-dir") && ctx.Bool("skip-custom-dir") {
-		log.Info("Skipping custom directory")
+		log.Info("Skiping custom directory")
 	} else {
 		customDir, err := os.Stat(setting.CustomPath)
 		if err == nil && customDir.IsDir() {
@@ -323,9 +313,7 @@ func runDump(ctx *cli.Context) error {
 		}
 	}

-	if ctx.IsSet("skip-attachment-data") && ctx.Bool("skip-attachment-data") {
-		log.Info("Skip dumping attachment data")
-	} else if err := storage.Attachments.IterateObjects(func(objPath string, object storage.Object) error {
+	if err := storage.Attachments.IterateObjects(func(objPath string, object storage.Object) error {
 		info, err := object.Stat()
 		if err != nil {
 			return err
--- a/cmd/dump_repo.go
+++ b/cmd/dump_repo.go
@@ -80,10 +80,10 @@ func runDumpRepository(ctx *cli.Context) error {
 		return err
 	}

-	log.Info("AppPath: %s", setting.AppPath)
-	log.Info("AppWorkPath: %s", setting.AppWorkPath)
-	log.Info("Custom path: %s", setting.CustomPath)
-	log.Info("Log path: %s", setting.LogRootPath)
+	log.Trace("AppPath: %s", setting.AppPath)
+	log.Trace("AppWorkPath: %s", setting.AppWorkPath)
+	log.Trace("Custom path: %s", setting.CustomPath)
+	log.Trace("Log path: %s", setting.LogRootPath)
 	setting.InitDBConfig()

 	var (
--- a/cmd/embedded.go
+++ b/cmd/embedded.go
@@ -19,7 +19,6 @@ import (
 	"code.gitea.io/gitea/modules/public"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/templates"
-	"code.gitea.io/gitea/modules/util"

 	"github.com/gobwas/glob"
 	"github.com/urfave/cli"
@@ -272,7 +271,7 @@ func extractAsset(d string, a asset, overwrite, rename bool) error {
 	} else if !fi.Mode().IsRegular() {
 		return fmt.Errorf("%s already exists, but it's not a regular file", dest)
 	} else if rename {
-		if err := util.Rename(dest, dest+".bak"); err != nil {
+		if err := os.Rename(dest, dest+".bak"); err != nil {
 			return fmt.Errorf("Error creating backup for %s: %v", dest, err)
 		}
 		// Attempt to respect file permissions mask (even if user:group will be set anew)
--- a/cmd/generate.go
+++ b/cmd/generate.go
@@ -71,7 +71,7 @@ func runGenerateInternalToken(c *cli.Context) error {
 }

 func runGenerateLfsJwtSecret(c *cli.Context) error {
-	JWTSecretBase64, err := generate.NewJwtSecretBase64()
+	JWTSecretBase64, err := generate.NewJwtSecret()
 	if err != nil {
 		return err
 	}
--- a/cmd/hook.go
+++ b/cmd/hook.go
@@ -152,22 +152,21 @@ func runHookPreReceive(c *cli.Context) error {
 	if os.Getenv(models.EnvIsInternal) == "true" {
 		return nil
 	}
-	ctx, cancel := installSignals()
-	defer cancel()

 	setup("hooks/pre-receive.log", c.Bool("debug"))

 	if len(os.Getenv("SSH_ORIGINAL_COMMAND")) == 0 {
 		if setting.OnlyAllowPushIfGiteaEnvironmentSet {
-			return fail(`Rejecting changes as Gitea environment not set.
+			fail(`Rejecting changes as Gitea environment not set.
 If you are pushing over SSH you must push with a key managed by
 Gitea or set your environment appropriately.`, "")
-		}
+		} else {
 			return nil
 		}
+	}

-	// the environment is set by serv command
-	isWiki := os.Getenv(models.EnvRepoIsWiki) == "true"
+	// the environment setted on serv command
+	isWiki := (os.Getenv(models.EnvRepoIsWiki) == "true")
 	username := os.Getenv(models.EnvRepoUsername)
 	reponame := os.Getenv(models.EnvRepoName)
 	userID, _ := strconv.ParseInt(os.Getenv(models.EnvPusherID), 10, 64)
@@ -180,7 +179,7 @@ Gitea or set your environment appropriately.`, "")
 		GitObjectDirectory:              os.Getenv(private.GitObjectDirectory),
 		GitQuarantinePath:               os.Getenv(private.GitQuarantinePath),
 		GitPushOptions:                  pushOptions(),
-		PullRequestID:                   prID,
+		ProtectedBranchID:               prID,
 		IsDeployKey:                     isDeployKey,
 	}

@@ -222,8 +221,8 @@ Gitea or set your environment appropriately.`, "")
 		total++
 		lastline++

-		// If the ref is a branch or tag, check if it's protected
-		if strings.HasPrefix(refFullName, git.BranchPrefix) || strings.HasPrefix(refFullName, git.TagPrefix) {
+		// If the ref is a branch, check if it's protected
+		if strings.HasPrefix(refFullName, git.BranchPrefix) {
 			oldCommitIDs[count] = oldCommitID
 			newCommitIDs[count] = newCommitID
 			refFullNames[count] = refFullName
@@ -231,19 +230,19 @@ Gitea or set your environment appropriately.`, "")
 			fmt.Fprintf(out, "*")

 			if count >= hookBatchSize {
-				fmt.Fprintf(out, " Checking %d references\n", count)
+				fmt.Fprintf(out, " Checking %d branches\n", count)

 				hookOptions.OldCommitIDs = oldCommitIDs
 				hookOptions.NewCommitIDs = newCommitIDs
 				hookOptions.RefFullNames = refFullNames
-				statusCode, msg := private.HookPreReceive(ctx, username, reponame, hookOptions)
+				statusCode, msg := private.HookPreReceive(username, reponame, hookOptions)
 				switch statusCode {
 				case http.StatusOK:
 					// no-op
 				case http.StatusInternalServerError:
-					return fail("Internal Server Error", msg)
+					fail("Internal Server Error", msg)
 				default:
-					return fail(msg, "")
+					fail(msg, "")
 				}
 				count = 0
 				lastline = 0
@@ -262,14 +261,14 @@ Gitea or set your environment appropriately.`, "")
 		hookOptions.NewCommitIDs = newCommitIDs[:count]
 		hookOptions.RefFullNames = refFullNames[:count]

-		fmt.Fprintf(out, " Checking %d references\n", count)
+		fmt.Fprintf(out, " Checking %d branches\n", count)

-		statusCode, msg := private.HookPreReceive(ctx, username, reponame, hookOptions)
+		statusCode, msg := private.HookPreReceive(username, reponame, hookOptions)
 		switch statusCode {
 		case http.StatusInternalServerError:
-			return fail("Internal Server Error", msg)
+			fail("Internal Server Error", msg)
 		case http.StatusForbidden:
-			return fail(msg, "")
+			fail(msg, "")
 		}
 	} else if lastline > 0 {
 		fmt.Fprintf(out, "\n")
@@ -286,11 +285,8 @@ func runHookUpdate(c *cli.Context) error {
 }

 func runHookPostReceive(c *cli.Context) error {
-	ctx, cancel := installSignals()
-	defer cancel()
-
 	// First of all run update-server-info no matter what
-	if _, err := git.NewCommand("update-server-info").SetParentContext(ctx).Run(); err != nil {
+	if _, err := git.NewCommand("update-server-info").Run(); err != nil {
 		return fmt.Errorf("Failed to call 'git update-server-info': %v", err)
 	}

@@ -303,12 +299,13 @@ func runHookPostReceive(c *cli.Context) error {

 	if len(os.Getenv("SSH_ORIGINAL_COMMAND")) == 0 {
 		if setting.OnlyAllowPushIfGiteaEnvironmentSet {
-			return fail(`Rejecting changes as Gitea environment not set.
+			fail(`Rejecting changes as Gitea environment not set.
 If you are pushing over SSH you must push with a key managed by
 Gitea or set your environment appropriately.`, "")
-		}
+		} else {
 			return nil
 		}
+	}

 	var out io.Writer
 	var dWriter *delayWriter
@@ -323,9 +320,9 @@ Gitea or set your environment appropriately.`, "")
 		}
 	}

-	// the environment is set by serv command
+	// the environment setted on serv command
 	repoUser := os.Getenv(models.EnvRepoUsername)
-	isWiki := os.Getenv(models.EnvRepoIsWiki) == "true"
+	isWiki := (os.Getenv(models.EnvRepoIsWiki) == "true")
 	repoName := os.Getenv(models.EnvRepoName)
 	pusherID, _ := strconv.ParseInt(os.Getenv(models.EnvPusherID), 10, 64)
 	pusherName := os.Getenv(models.EnvPusherName)
@@ -374,11 +371,11 @@ Gitea or set your environment appropriately.`, "")
 			hookOptions.OldCommitIDs = oldCommitIDs
 			hookOptions.NewCommitIDs = newCommitIDs
 			hookOptions.RefFullNames = refFullNames
-			resp, err := private.HookPostReceive(ctx, repoUser, repoName, hookOptions)
+			resp, err := private.HookPostReceive(repoUser, repoName, hookOptions)
 			if resp == nil {
 				_ = dWriter.Close()
 				hookPrintResults(results)
-				return fail("Internal Server Error", err)
+				fail("Internal Server Error", err)
 			}
 			wasEmpty = wasEmpty || resp.RepoWasEmpty
 			results = append(results, resp.Results...)
@@ -389,9 +386,9 @@ Gitea or set your environment appropriately.`, "")
 	if count == 0 {
 		if wasEmpty && masterPushed {
 			// We need to tell the repo to reset the default branch to master
-			err := private.SetDefaultBranch(ctx, repoUser, repoName, "master")
+			err := private.SetDefaultBranch(repoUser, repoName, "master")
 			if err != nil {
-				return fail("Internal Server Error", "SetDefaultBranch failed with Error: %v", err)
+				fail("Internal Server Error", "SetDefaultBranch failed with Error: %v", err)
 			}
 		}
 		fmt.Fprintf(out, "Processed %d references in total\n", total)
@@ -407,11 +404,11 @@ Gitea or set your environment appropriately.`, "")

 	fmt.Fprintf(out, " Processing %d references\n", count)

-	resp, err := private.HookPostReceive(ctx, repoUser, repoName, hookOptions)
+	resp, err := private.HookPostReceive(repoUser, repoName, hookOptions)
 	if resp == nil {
 		_ = dWriter.Close()
 		hookPrintResults(results)
-		return fail("Internal Server Error", err)
+		fail("Internal Server Error", err)
 	}
 	wasEmpty = wasEmpty || resp.RepoWasEmpty
 	results = append(results, resp.Results...)
@@ -420,9 +417,9 @@ Gitea or set your environment appropriately.`, "")

 	if wasEmpty && masterPushed {
 		// We need to tell the repo to reset the default branch to master
-		err := private.SetDefaultBranch(ctx, repoUser, repoName, "master")
+		err := private.SetDefaultBranch(repoUser, repoName, "master")
 		if err != nil {
-			return fail("Internal Server Error", "SetDefaultBranch failed with Error: %v", err)
+			fail("Internal Server Error", "SetDefaultBranch failed with Error: %v", err)
 		}
 	}
 	_ = dWriter.Close()
--- a/cmd/keys.go
+++ b/cmd/keys.go
@@ -62,12 +62,9 @@ func runKeys(c *cli.Context) error {
 		return errors.New("No key type and content provided")
 	}

-	ctx, cancel := installSignals()
-	defer cancel()
-
 	setup("keys.log", false)

-	authorizedString, err := private.AuthorizedPublicKeyByContent(ctx, content)
+	authorizedString, err := private.AuthorizedPublicKeyByContent(content)
 	if err != nil {
 		return err
 	}
--- a/cmd/mailer.go
+++ b/cmd/mailer.go
@@ -14,9 +14,6 @@ import (
 )

 func runSendMail(c *cli.Context) error {
-	ctx, cancel := installSignals()
-	defer cancel()
-
 	setting.NewContext()

 	if err := argsSet(c, "title"); err != nil {
@@ -42,7 +39,7 @@ func runSendMail(c *cli.Context) error {
 		}
 	}

-	status, message := private.SendEmail(ctx, subject, body, nil)
+	status, message := private.SendEmail(subject, body, nil)
 	if status != http.StatusOK {
 		fmt.Printf("error: %s\n", message)
 		return nil
--- a/cmd/manager.go
+++ b/cmd/manager.go
@@ -236,13 +236,10 @@ func runRemoveLogger(c *cli.Context) error {
 		group = log.DEFAULT
 	}
 	name := c.Args().First()
-	ctx, cancel := installSignals()
-	defer cancel()
-
-	statusCode, msg := private.RemoveLogger(ctx, group, name)
+	statusCode, msg := private.RemoveLogger(group, name)
 	switch statusCode {
 	case http.StatusInternalServerError:
-		return fail("InternalServerError", msg)
+		fail("InternalServerError", msg)
 	}

 	fmt.Fprintln(os.Stdout, msg)
@@ -374,13 +371,10 @@ func commonAddLogger(c *cli.Context, mode string, vals map[string]interface{}) e
 	if c.IsSet("name") {
 		name = c.String("name")
 	}
-	ctx, cancel := installSignals()
-	defer cancel()
-
-	statusCode, msg := private.AddLogger(ctx, group, name, mode, vals)
+	statusCode, msg := private.AddLogger(group, name, mode, vals)
 	switch statusCode {
 	case http.StatusInternalServerError:
-		return fail("InternalServerError", msg)
+		fail("InternalServerError", msg)
 	}

 	fmt.Fprintln(os.Stdout, msg)
@@ -388,14 +382,11 @@ func commonAddLogger(c *cli.Context, mode string, vals map[string]interface{}) e
 }

 func runShutdown(c *cli.Context) error {
-	ctx, cancel := installSignals()
-	defer cancel()
-
 	setup("manager", c.Bool("debug"))
-	statusCode, msg := private.Shutdown(ctx)
+	statusCode, msg := private.Shutdown()
 	switch statusCode {
 	case http.StatusInternalServerError:
-		return fail("InternalServerError", msg)
+		fail("InternalServerError", msg)
 	}

 	fmt.Fprintln(os.Stdout, msg)
@@ -403,14 +394,11 @@ func runShutdown(c *cli.Context) error {
 }

 func runRestart(c *cli.Context) error {
-	ctx, cancel := installSignals()
-	defer cancel()
-
 	setup("manager", c.Bool("debug"))
-	statusCode, msg := private.Restart(ctx)
+	statusCode, msg := private.Restart()
 	switch statusCode {
 	case http.StatusInternalServerError:
-		return fail("InternalServerError", msg)
+		fail("InternalServerError", msg)
 	}

 	fmt.Fprintln(os.Stdout, msg)
@@ -418,14 +406,11 @@ func runRestart(c *cli.Context) error {
 }

 func runFlushQueues(c *cli.Context) error {
-	ctx, cancel := installSignals()
-	defer cancel()
-
 	setup("manager", c.Bool("debug"))
-	statusCode, msg := private.FlushQueues(ctx, c.Duration("timeout"), c.Bool("non-blocking"))
+	statusCode, msg := private.FlushQueues(c.Duration("timeout"), c.Bool("non-blocking"))
 	switch statusCode {
 	case http.StatusInternalServerError:
-		return fail("InternalServerError", msg)
+		fail("InternalServerError", msg)
 	}

 	fmt.Fprintln(os.Stdout, msg)
@@ -433,14 +418,11 @@ func runFlushQueues(c *cli.Context) error {
 }

 func runPauseLogging(c *cli.Context) error {
-	ctx, cancel := installSignals()
-	defer cancel()
-
 	setup("manager", c.Bool("debug"))
-	statusCode, msg := private.PauseLogging(ctx)
+	statusCode, msg := private.PauseLogging()
 	switch statusCode {
 	case http.StatusInternalServerError:
-		return fail("InternalServerError", msg)
+		fail("InternalServerError", msg)
 	}

 	fmt.Fprintln(os.Stdout, msg)
@@ -448,14 +430,11 @@ func runPauseLogging(c *cli.Context) error {
 }

 func runResumeLogging(c *cli.Context) error {
-	ctx, cancel := installSignals()
-	defer cancel()
-
 	setup("manager", c.Bool("debug"))
-	statusCode, msg := private.ResumeLogging(ctx)
+	statusCode, msg := private.ResumeLogging()
 	switch statusCode {
 	case http.StatusInternalServerError:
-		return fail("InternalServerError", msg)
+		fail("InternalServerError", msg)
 	}

 	fmt.Fprintln(os.Stdout, msg)
@@ -463,14 +442,11 @@ func runResumeLogging(c *cli.Context) error {
 }

 func runReleaseReopenLogging(c *cli.Context) error {
-	ctx, cancel := installSignals()
-	defer cancel()
-
 	setup("manager", c.Bool("debug"))
-	statusCode, msg := private.ReleaseReopenLogging(ctx)
+	statusCode, msg := private.ReleaseReopenLogging()
 	switch statusCode {
 	case http.StatusInternalServerError:
-		return fail("InternalServerError", msg)
+		fail("InternalServerError", msg)
 	}

 	fmt.Fprintln(os.Stdout, msg)
--- a/cmd/migrate.go
+++ b/cmd/migrate.go
@@ -28,10 +28,10 @@ func runMigrate(ctx *cli.Context) error {
 		return err
 	}

-	log.Info("AppPath: %s", setting.AppPath)
-	log.Info("AppWorkPath: %s", setting.AppWorkPath)
-	log.Info("Custom path: %s", setting.CustomPath)
-	log.Info("Log path: %s", setting.LogRootPath)
+	log.Trace("AppPath: %s", setting.AppPath)
+	log.Trace("AppWorkPath: %s", setting.AppWorkPath)
+	log.Trace("Custom path: %s", setting.CustomPath)
+	log.Trace("Log path: %s", setting.LogRootPath)
 	setting.InitDBConfig()

 	if err := models.NewEngine(context.Background(), migrations.Migrate); err != nil {
--- a/cmd/migrate_storage.go
+++ b/cmd/migrate_storage.go
@@ -110,10 +110,10 @@ func runMigrateStorage(ctx *cli.Context) error {
 		return err
 	}

-	log.Info("AppPath: %s", setting.AppPath)
-	log.Info("AppWorkPath: %s", setting.AppWorkPath)
-	log.Info("Custom path: %s", setting.CustomPath)
-	log.Info("Log path: %s", setting.LogRootPath)
+	log.Trace("AppPath: %s", setting.AppPath)
+	log.Trace("AppWorkPath: %s", setting.AppWorkPath)
+	log.Trace("Custom path: %s", setting.CustomPath)
+	log.Trace("Log path: %s", setting.LogRootPath)
 	setting.InitDBConfig()

 	if err := models.NewEngine(context.Background(), migrations.Migrate); err != nil {
@@ -184,7 +184,7 @@ func runMigrateStorage(ctx *cli.Context) error {
 		return fmt.Errorf("Unsupported storage: %s", ctx.String("type"))
 	}

-	log.Warn("All files have been copied to the new placement but old files are still on the original placement.")
+	log.Warn("All files have been copied to the new placement but old files are still on the orignial placement.")

 	return nil
 }
--- a/cmd/restore_repo.go
+++ b/cmd/restore_repo.go
@@ -5,12 +5,15 @@
 package cmd

 import (
-	"errors"
-	"net/http"
+	"context"
+	"strings"

 	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/modules/private"
+	"code.gitea.io/gitea/modules/migrations"
+	"code.gitea.io/gitea/modules/migrations/base"
 	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/modules/storage"
+	pull_service "code.gitea.io/gitea/services/pull"

 	"github.com/urfave/cli"
 )
@@ -46,23 +49,71 @@ wiki, issues, labels, releases, release_assets, milestones, pull_requests, comme
 	},
 }

-func runRestoreRepository(c *cli.Context) error {
-	ctx, cancel := installSignals()
-	defer cancel()
+func runRestoreRepository(ctx *cli.Context) error {
+	if err := initDB(); err != nil {
+		return err
+	}

-	setting.NewContext()
+	log.Trace("AppPath: %s", setting.AppPath)
+	log.Trace("AppWorkPath: %s", setting.AppWorkPath)
+	log.Trace("Custom path: %s", setting.CustomPath)
+	log.Trace("Log path: %s", setting.LogRootPath)
+	setting.InitDBConfig()
+
+	if err := storage.Init(); err != nil {
+		return err
+	}
+
+	if err := pull_service.Init(); err != nil {
+		return err
+	}
+
+	var opts = base.MigrateOptions{
+		RepoName: ctx.String("repo_name"),
+	}
+
+	if len(ctx.String("units")) == 0 {
+		opts.Wiki = true
+		opts.Issues = true
+		opts.Milestones = true
+		opts.Labels = true
+		opts.Releases = true
+		opts.Comments = true
+		opts.PullRequests = true
+		opts.ReleaseAssets = true
+	} else {
+		units := strings.Split(ctx.String("units"), ",")
+		for _, unit := range units {
+			switch strings.ToLower(unit) {
+			case "wiki":
+				opts.Wiki = true
+			case "issues":
+				opts.Issues = true
+			case "milestones":
+				opts.Milestones = true
+			case "labels":
+				opts.Labels = true
+			case "releases":
+				opts.Releases = true
+			case "release_assets":
+				opts.ReleaseAssets = true
+			case "comments":
+				opts.Comments = true
+			case "pull_requests":
+				opts.PullRequests = true
+			}
+		}
+	}
+
+	if err := migrations.RestoreRepository(
+		context.Background(),
+		ctx.String("repo_dir"),
+		ctx.String("owner_name"),
+		ctx.String("repo_name"),
+	); err != nil {
+		log.Fatal("Failed to restore repository: %v", err)
+		return err
+	}

-	statusCode, errStr := private.RestoreRepo(
-		ctx,
-		c.String("repo_dir"),
-		c.String("owner_name"),
-		c.String("repo_name"),
-		c.StringSlice("units"),
-	)
-	if statusCode == http.StatusOK {
 	return nil
 }
-
-	log.Fatal("Failed to restore repository: %v", errStr)
-	return errors.New(errStr)
-}
--- a/cmd/serv.go
+++ b/cmd/serv.go
@@ -17,11 +17,11 @@ import (
 	"time"

 	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/lfs"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/pprof"
 	"code.gitea.io/gitea/modules/private"
 	"code.gitea.io/gitea/modules/setting"
-	"code.gitea.io/gitea/services/lfs"

 	"github.com/dgrijalva/jwt-go"
 	jsoniter "github.com/json-iterator/go"
@@ -72,10 +72,7 @@ var (
 	alphaDashDotPattern = regexp.MustCompile(`[^\w-\.]`)
 )

-func fail(userMessage, logMessage string, args ...interface{}) error {
-	// There appears to be a chance to cause a zombie process and failure to read the Exit status
-	// if nothing is outputted on stdout.
-	fmt.Fprintln(os.Stdout, "")
+func fail(userMessage, logMessage string, args ...interface{}) {
 	fmt.Fprintln(os.Stderr, "Gitea:", userMessage)

 	if len(logMessage) > 0 {
@@ -83,19 +80,11 @@ func fail(userMessage, logMessage string, args ...interface{}) error {
 			fmt.Fprintf(os.Stderr, logMessage+"\n", args...)
 		}
 	}
-	ctx, cancel := installSignals()
-	defer cancel()

-	if len(logMessage) > 0 {
-		_ = private.SSHLog(ctx, true, fmt.Sprintf(logMessage+": ", args...))
-	}
-	return cli.NewExitError(fmt.Sprintf("Gitea: %s", userMessage), 1)
+	os.Exit(1)
 }

 func runServ(c *cli.Context) error {
-	ctx, cancel := installSignals()
-	defer cancel()
-
 	// FIXME: This needs to internationalised
 	setup("serv.log", c.Bool("debug"))

@@ -113,18 +102,18 @@ func runServ(c *cli.Context) error {

 	keys := strings.Split(c.Args()[0], "-")
 	if len(keys) != 2 || keys[0] != "key" {
-		return fail("Key ID format error", "Invalid key argument: %s", c.Args()[0])
+		fail("Key ID format error", "Invalid key argument: %s", c.Args()[0])
 	}
 	keyID, err := strconv.ParseInt(keys[1], 10, 64)
 	if err != nil {
-		return fail("Key ID format error", "Invalid key argument: %s", c.Args()[1])
+		fail("Key ID format error", "Invalid key argument: %s", c.Args()[1])
 	}

 	cmd := os.Getenv("SSH_ORIGINAL_COMMAND")
 	if len(cmd) == 0 {
-		key, user, err := private.ServNoCommand(ctx, keyID)
+		key, user, err := private.ServNoCommand(keyID)
 		if err != nil {
-			return fail("Internal error", "Failed to check provided key: %v", err)
+			fail("Internal error", "Failed to check provided key: %v", err)
 		}
 		switch key.Type {
 		case models.KeyTypeDeploy:
@@ -142,11 +131,11 @@ func runServ(c *cli.Context) error {

 	words, err := shellquote.Split(cmd)
 	if err != nil {
-		return fail("Error parsing arguments", "Failed to parse arguments: %v", err)
+		fail("Error parsing arguments", "Failed to parse arguments: %v", err)
 	}

 	if len(words) < 2 {
-		return fail("Too few arguments", "Too few arguments in cmd: %s", cmd)
+		fail("Too few arguments", "Too few arguments in cmd: %s", cmd)
 	}

 	verb := words[0]
@@ -158,7 +147,7 @@ func runServ(c *cli.Context) error {
 	var lfsVerb string
 	if verb == lfsAuthenticateVerb {
 		if !setting.LFS.StartServer {
-			return fail("Unknown git command", "LFS authentication request over SSH denied, LFS support is disabled")
+			fail("Unknown git command", "LFS authentication request over SSH denied, LFS support is disabled")
 		}

 		if len(words) > 2 {
@@ -171,37 +160,37 @@ func runServ(c *cli.Context) error {

 	rr := strings.SplitN(repoPath, "/", 2)
 	if len(rr) != 2 {
-		return fail("Invalid repository path", "Invalid repository path: %v", repoPath)
+		fail("Invalid repository path", "Invalid repository path: %v", repoPath)
 	}

 	username := strings.ToLower(rr[0])
 	reponame := strings.ToLower(strings.TrimSuffix(rr[1], ".git"))

 	if alphaDashDotPattern.MatchString(reponame) {
-		return fail("Invalid repo name", "Invalid repo name: %s", reponame)
+		fail("Invalid repo name", "Invalid repo name: %s", reponame)
 	}

 	if setting.EnablePprof || c.Bool("enable-pprof") {
 		if err := os.MkdirAll(setting.PprofDataPath, os.ModePerm); err != nil {
-			return fail("Error while trying to create PPROF_DATA_PATH", "Error while trying to create PPROF_DATA_PATH: %v", err)
+			fail("Error while trying to create PPROF_DATA_PATH", "Error while trying to create PPROF_DATA_PATH: %v", err)
 		}

 		stopCPUProfiler, err := pprof.DumpCPUProfileForUsername(setting.PprofDataPath, username)
 		if err != nil {
-			return fail("Internal Server Error", "Unable to start CPU profile: %v", err)
+			fail("Internal Server Error", "Unable to start CPU profile: %v", err)
 		}
 		defer func() {
 			stopCPUProfiler()
 			err := pprof.DumpMemProfileForUsername(setting.PprofDataPath, username)
 			if err != nil {
-				_ = fail("Internal Server Error", "Unable to dump Mem Profile: %v", err)
+				fail("Internal Server Error", "Unable to dump Mem Profile: %v", err)
 			}
 		}()
 	}

 	requestedMode, has := allowedCommands[verb]
 	if !has {
-		return fail("Unknown git command", "Unknown git command %s", verb)
+		fail("Unknown git command", "Unknown git command %s", verb)
 	}

 	if verb == lfsAuthenticateVerb {
@@ -210,20 +199,21 @@ func runServ(c *cli.Context) error {
 		} else if lfsVerb == "download" {
 			requestedMode = models.AccessModeRead
 		} else {
-			return fail("Unknown LFS verb", "Unknown lfs verb %s", lfsVerb)
+			fail("Unknown LFS verb", "Unknown lfs verb %s", lfsVerb)
 		}
 	}

-	results, err := private.ServCommand(ctx, keyID, username, reponame, requestedMode, verb, lfsVerb)
+	results, err := private.ServCommand(keyID, username, reponame, requestedMode, verb, lfsVerb)
 	if err != nil {
 		if private.IsErrServCommand(err) {
 			errServCommand := err.(private.ErrServCommand)
 			if errServCommand.StatusCode != http.StatusInternalServerError {
-				return fail("Unauthorized", "%s", errServCommand.Error())
+				fail("Unauthorized", "%s", errServCommand.Error())
+			} else {
+				fail("Internal Server Error", "%s", errServCommand.Error())
 			}
-			return fail("Internal Server Error", "%s", errServCommand.Error())
 		}
-		return fail("Internal Server Error", "%s", err.Error())
+		fail("Internal Server Error", "%s", err.Error())
 	}
 	os.Setenv(models.EnvRepoIsWiki, strconv.FormatBool(results.IsWiki))
 	os.Setenv(models.EnvRepoName, results.RepoName)
@@ -256,7 +246,7 @@ func runServ(c *cli.Context) error {
 		// Sign and get the complete encoded token as a string using the secret
 		tokenString, err := token.SignedString(setting.LFS.JWTSecretBytes)
 		if err != nil {
-			return fail("Internal error", "Failed to sign JWT token: %v", err)
+			fail("Internal error", "Failed to sign JWT token: %v", err)
 		}

 		tokenAuthentication := &models.LFSTokenResponse{
@@ -269,7 +259,7 @@ func runServ(c *cli.Context) error {
 		enc := json.NewEncoder(os.Stdout)
 		err = enc.Encode(tokenAuthentication)
 		if err != nil {
-			return fail("Internal error", "Failed to encode LFS json response: %v", err)
+			fail("Internal error", "Failed to encode LFS json response: %v", err)
 		}
 		return nil
 	}
@@ -282,9 +272,9 @@ func runServ(c *cli.Context) error {
 	var gitcmd *exec.Cmd
 	verbs := strings.Split(verb, " ")
 	if len(verbs) == 2 {
-		gitcmd = exec.CommandContext(ctx, verbs[0], verbs[1], repoPath)
+		gitcmd = exec.Command(verbs[0], verbs[1], repoPath)
 	} else {
-		gitcmd = exec.CommandContext(ctx, verb, repoPath)
+		gitcmd = exec.Command(verb, repoPath)
 	}

 	gitcmd.Dir = setting.RepoRootPath
@@ -292,13 +282,13 @@ func runServ(c *cli.Context) error {
 	gitcmd.Stdin = os.Stdin
 	gitcmd.Stderr = os.Stderr
 	if err = gitcmd.Run(); err != nil {
-		return fail("Internal error", "Failed to execute git command: %v", err)
+		fail("Internal error", "Failed to execute git command: %v", err)
 	}

 	// Update user key activity.
 	if results.KeyID > 0 {
-		if err = private.UpdatePublicKeyInRepo(ctx, results.KeyID, results.RepoID); err != nil {
-			return fail("Internal error", "UpdatePublicKeyInRepo: %v", err)
+		if err = private.UpdatePublicKeyInRepo(results.KeyID, results.RepoID); err != nil {
+			fail("Internal error", "UpdatePublicKeyInRepo: %v", err)
 		}
 	}

--- a/cmd/web.go
+++ b/cmd/web.go
@@ -16,8 +16,9 @@ import (
 	"code.gitea.io/gitea/modules/graceful"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/routers"
-	"code.gitea.io/gitea/routers/install"
+	"code.gitea.io/gitea/routers/routes"

 	context2 "github.com/gorilla/context"
 	"github.com/urfave/cli"
@@ -47,14 +48,6 @@ and it takes care of all the other things for you`,
 			Value: setting.PIDFile,
 			Usage: "Custom pid file path",
 		},
-		cli.BoolFlag{
-			Name:  "quiet, q",
-			Usage: "Only display Fatal logging errors until logging is set-up",
-		},
-		cli.BoolFlag{
-			Name:  "verbose",
-			Usage: "Set initial logging to TRACE level until logging is properly set-up",
-		},
 	},
 }

@@ -79,14 +72,6 @@ func runHTTPRedirector() {
 }

 func runWeb(ctx *cli.Context) error {
-	if ctx.Bool("verbose") {
-		_ = log.DelLogger("console")
-		log.NewLogger(0, "console", "console", fmt.Sprintf(`{"level": "trace", "colorize": %t, "stacktraceLevel": "none"}`, log.CanColorStdout))
-	} else if ctx.Bool("quiet") {
-		_ = log.DelLogger("console")
-		log.NewLogger(0, "console", "console", fmt.Sprintf(`{"level": "fatal", "colorize": %t, "stacktraceLevel": "none"}`, log.CanColorStdout))
-	}
-
 	managerCtx, cancel := context.WithCancel(context.Background())
 	graceful.InitManager(managerCtx)
 	defer cancel()
@@ -104,7 +89,7 @@ func runWeb(ctx *cli.Context) error {
 	}

 	// Perform pre-initialization
-	needsInstall := install.PreloadSettings(graceful.GetManager().HammerContext())
+	needsInstall := routers.PreInstallInit(graceful.GetManager().HammerContext())
 	if needsInstall {
 		// Flag for port number in case first time run conflict
 		if ctx.IsSet("port") {
@@ -117,7 +102,7 @@ func runWeb(ctx *cli.Context) error {
 				return err
 			}
 		}
-		c := install.Routes()
+		c := routes.InstallRoutes()
 		err := listen(c, false)
 		select {
 		case <-graceful.GetManager().IsShutdown():
@@ -150,7 +135,7 @@ func runWeb(ctx *cli.Context) error {
 	}

 	// Set up Chi routes
-	c := routers.NormalRoutes()
+	c := routes.NormalRoutes()
 	err := listen(c, true)
 	<-graceful.GetManager().Done()
 	log.Info("PID: %d Gitea Web Finished", os.Getpid())
@@ -167,6 +152,19 @@ func setPort(port string) error {
 	case setting.FCGI:
 	case setting.FCGIUnix:
 	default:
+		// Save LOCAL_ROOT_URL if port changed
+		cfg := ini.Empty()
+		isFile, err := util.IsFile(setting.CustomConf)
+		if err != nil {
+			log.Fatal("Unable to check if %s is a file", err)
+		}
+		if isFile {
+			// Keeps custom settings if there is already something.
+			if err := cfg.Append(setting.CustomConf); err != nil {
+				return fmt.Errorf("Failed to load custom conf '%s': %v", setting.CustomConf, err)
+			}
+		}
+
 		defaultLocalURL := string(setting.Protocol) + "://"
 		if setting.HTTPAddr == "0.0.0.0" {
 			defaultLocalURL += "localhost"
@@ -175,10 +173,10 @@ func setPort(port string) error {
 		}
 		defaultLocalURL += ":" + setting.HTTPPort + "/"

-		// Save LOCAL_ROOT_URL if port changed
-		setting.CreateOrAppendToCustomConf(func(cfg *ini.File) {
 		cfg.Section("server").Key("LOCAL_ROOT_URL").SetValue(defaultLocalURL)
-		})
+		if err := cfg.SaveTo(setting.CustomConf); err != nil {
+			return fmt.Errorf("Error saving generated JWT Secret to custom config: %v", err)
+		}
 	}
 	return nil
 }
--- a/cmd/web_letsencrypt.go
+++ b/cmd/web_letsencrypt.go
@@ -6,7 +6,6 @@ package cmd

 import (
 	"net/http"
-	"strconv"
 	"strings"

 	"code.gitea.io/gitea/modules/log"
@@ -19,19 +18,10 @@ import (
 func runLetsEncrypt(listenAddr, domain, directory, email string, m http.Handler) error {

 	// If HTTP Challenge enabled, needs to be serving on port 80. For TLSALPN needs 443.
-	// Due to docker port mapping this can't be checked programmatically
+	// Due to docker port mapping this can't be checked programatically
 	// TODO: these are placeholders until we add options for each in settings with appropriate warning
 	enableHTTPChallenge := true
 	enableTLSALPNChallenge := true
-	altHTTPPort := 0
-	altTLSALPNPort := 0
-
-	if p, err := strconv.Atoi(setting.PortToRedirect); err == nil {
-		altHTTPPort = p
-	}
-	if p, err := strconv.Atoi(setting.HTTPPort); err == nil {
-		altTLSALPNPort = p
-	}

 	magic := certmagic.NewDefault()
 	magic.Storage = &certmagic.FileStorage{Path: directory}
@@ -40,12 +30,9 @@ func runLetsEncrypt(listenAddr, domain, directory, email string, m http.Handler)
 		Agreed:                  setting.LetsEncryptTOS,
 		DisableHTTPChallenge:    !enableHTTPChallenge,
 		DisableTLSALPNChallenge: !enableTLSALPNChallenge,
-		ListenHost:              setting.HTTPAddr,
-		AltTLSALPNPort:          altTLSALPNPort,
-		AltHTTPPort:             altHTTPPort,
 	})

-	magic.Issuers = []certmagic.Issuer{myACME}
+	magic.Issuer = myACME

 	// this obtains certificates or renews them if necessary
 	err := magic.ManageSync([]string{domain})
@@ -54,7 +41,6 @@ func runLetsEncrypt(listenAddr, domain, directory, email string, m http.Handler)
 	}

 	tlsConfig := magic.TLSConfig()
-	tlsConfig.NextProtos = append(tlsConfig.NextProtos, "h2")

 	if enableHTTPChallenge {
 		go func() {
--- a/contrib/environment-to-ini/environment-to-ini.go
+++ b/contrib/environment-to-ini/environment-to-ini.go
@@ -110,8 +110,6 @@ func runEnvironmentToIni(c *cli.Context) error {
 	}
 	cfg.NameMapper = ini.SnackCase

-	changed := false
-
 	prefix := c.String("prefix") + "__"

 	for _, kv := range os.Environ() {
@@ -145,22 +143,16 @@ func runEnvironmentToIni(c *cli.Context) error {
 				continue
 			}
 		}
-		oldValue := key.Value()
-		if !changed && oldValue != value {
-			changed = true
-		}
 		key.SetValue(value)
 	}
 	destination := c.String("out")
 	if len(destination) == 0 {
 		destination = setting.CustomConf
 	}
-	if destination != setting.CustomConf || changed {
 	err = cfg.SaveTo(destination)
 	if err != nil {
 		return err
 	}
-	}
 	if c.Bool("clear") {
 		for _, kv := range os.Environ() {
 			idx := strings.IndexByte(kv, '=')
--- a/contrib/pr/checkout.go
+++ b/contrib/pr/checkout.go
@@ -26,12 +26,12 @@ import (
 	"time"

 	"code.gitea.io/gitea/models"
-	gitea_git "code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/markup"
 	"code.gitea.io/gitea/modules/markup/external"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/routers"
+	"code.gitea.io/gitea/routers/routes"

 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/config"
@@ -80,7 +80,7 @@ func runPR() {
 	setting.RunUser = curUser.Username

 	log.Printf("[PR] Loading fixtures data ...\n")
-	gitea_git.CheckLFSVersion()
+	setting.CheckLFSVersion()
 	//models.LoadConfigs()
 	/*
 		setting.Database.Type = "sqlite3"
@@ -114,9 +114,9 @@ func runPR() {

 	log.Printf("[PR] Setting up router\n")
 	//routers.GlobalInit()
-	external.RegisterRenderers()
+	external.RegisterParsers()
 	markup.Init()
-	c := routers.NormalRoutes()
+	c := routes.NormalRoutes()

 	log.Printf("[PR] Ready for testing !\n")
 	log.Printf("[PR] Login with user1, user2, user3, ... with pass: password\n")
--- a/contrib/systemd/gitea.service
+++ b/contrib/systemd/gitea.service
@@ -3,23 +3,14 @@ Description=Gitea (Git with a cup of tea)
 After=syslog.target
 After=network.target
 ###
-# Don't forget to add the database service dependencies
+# Don't forget to add the database service requirements
 ###
 #
-#Wants=mysql.service
-#After=mysql.service
-#
-#Wants=mariadb.service
-#After=mariadb.service
-#
-#Wants=postgresql.service
-#After=postgresql.service
-#
-#Wants=memcached.service
-#After=memcached.service
-#
-#Wants=redis.service
-#After=redis.service
+#Requires=mysql.service
+#Requires=mariadb.service
+#Requires=postgresql.service
+#Requires=memcached.service
+#Requires=redis.service
 #
 ###
 # If using socket activation for main http/s
--- a/contrib/update_dependencies.sh
+++ b/contrib/update_dependencies.sh
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-grep 'git' go.mod | grep '\.com' | grep -v indirect | grep -v replace | cut -f 2 | cut -d ' ' -f 1 | while read line; do
-  go get -u "$line"
-  make vendor
-  git add .
-  git commit -S -m "update $line"
-done
--- a/custom/conf/app.example.ini
+++ b/custom/conf/app.example.ini
--- a/docker/manifest.rootless.tmpl
+++ b/docker/manifest.rootless.tmpl
@@ -1,19 +1,18 @@
-image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}dev{{/if}}-rootless
+image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-rootless
 {{#if build.tags}}
 tags:
 {{#each build.tags}}
  - {{this}}-rootless
 {{/each}}
-  - "latest-rootless"
 {{/if}}
 manifests:
  -
-    image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}dev{{/if}}-linux-amd64-rootless
+    image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64-rootless
    platform:
      architecture: amd64
      os: linux
  -
-    image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}dev{{/if}}-linux-arm64-rootless
+    image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64-rootless
    platform:
      architecture: arm64
      os: linux
--- a/docker/manifest.tmpl
+++ b/docker/manifest.tmpl
@@ -1,19 +1,18 @@
-image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}dev{{/if}}
+image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
 {{#if build.tags}}
 tags:
 {{#each build.tags}}
  - {{this}}
 {{/each}}
-  - "latest"
 {{/if}}
 manifests:
  -
-    image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{else}}dev-{{/if}}linux-amd64
+    image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
    platform:
      architecture: amd64
      os: linux
  -
-    image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{else}}dev-{{/if}}linux-arm64
+    image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64
    platform:
      architecture: arm64
      os: linux
--- a/docker/root/etc/s6/gitea/setup
+++ b/docker/root/etc/s6/gitea/setup
@@ -23,7 +23,7 @@ if [ ! -f ${GITEA_CUSTOM}/conf/app.ini ]; then
        INSTALL_LOCK=true
    fi

-    # Substitute the environment variables in the template
+    # Substitude the environment variables in the template
    APP_NAME=${APP_NAME:-"Gitea: Git with a cup of tea"} \
    RUN_MODE=${RUN_MODE:-"prod"} \
    DOMAIN=${DOMAIN:-"localhost"} \
--- a/docker/root/etc/s6/openssh/setup
+++ b/docker/root/etc/s6/openssh/setup
@@ -24,31 +24,9 @@ if [ ! -f /data/ssh/ssh_host_ecdsa_key ]; then
    ssh-keygen -t ecdsa -b 256 -f /data/ssh/ssh_host_ecdsa_key -N "" > /dev/null
 fi

-if [ -e /data/ssh/ssh_host_ed25519_cert ]; then
-  SSH_ED25519_CERT=${SSH_ED25519_CERT:-"/data/ssh/ssh_host_ed25519_cert"}
-fi
-
-if [ -e /data/ssh/ssh_host_rsa_cert ]; then
-  SSH_RSA_CERT=${SSH_RSA_CERT:-"/data/ssh/ssh_host_rsa_cert"}
-fi
-
-if [ -e /data/ssh/ssh_host_ecdsa_cert ]; then
-  SSH_ECDSA_CERT=${SSH_ECDSA_CERT:-"/data/ssh/ssh_host_ecdsa_cert"}
-fi
-
-if [ -e /data/ssh/ssh_host_dsa_cert ]; then
-  SSH_DSA_CERT=${SSH_DSA_CERT:-"/data/ssh/ssh_host_dsa_cert"}
-fi
-
 if [ -d /etc/ssh ]; then
    SSH_PORT=${SSH_PORT:-"22"} \
    SSH_LISTEN_PORT=${SSH_LISTEN_PORT:-"${SSH_PORT}"} \
-    SSH_ED25519_CERT="${SSH_ED25519_CERT:+"HostCertificate "}${SSH_ED25519_CERT}" \
-    SSH_RSA_CERT="${SSH_RSA_CERT:+"HostCertificate "}${SSH_RSA_CERT}" \
-    SSH_ECDSA_CERT="${SSH_ECDSA_CERT:+"HostCertificate "}${SSH_ECDSA_CERT}" \
-    SSH_DSA_CERT="${SSH_DSA_CERT:+"HostCertificate "}${SSH_DSA_CERT}" \
-    SSH_MAX_STARTUPS="${SSH_MAX_STARTUPS:+"MaxStartups "}${SSH_MAX_STARTUPS}" \
-    SSH_MAX_SESSIONS="${SSH_MAX_SESSIONS:+"MaxSessions "}${SSH_MAX_SESSIONS}" \
    envsubst < /etc/templates/sshd_config > /etc/ssh/sshd_config

    chmod 0644 /etc/ssh/sshd_config
--- a/docker/root/etc/templates/sshd_config
+++ b/docker/root/etc/templates/sshd_config
@@ -5,19 +5,16 @@ AddressFamily any
 ListenAddress 0.0.0.0
 ListenAddress ::

-${SSH_MAX_STARTUPS}
-${SSH_MAX_SESSIONS}
-
 LogLevel INFO

 HostKey /data/ssh/ssh_host_ed25519_key
-${SSH_ED25519_CERT}
+HostCertificate /data/ssh/ssh_host_ed25519_cert
 HostKey /data/ssh/ssh_host_rsa_key
-${SSH_RSA_CERT}
+HostCertificate /data/ssh/ssh_host_rsa_cert
 HostKey /data/ssh/ssh_host_ecdsa_key
-${SSH_ECDSA_CERT}
+HostCertificate /data/ssh/ssh_host_ecdsa_cert
 HostKey /data/ssh/ssh_host_dsa_key
-${SSH_DSA_CERT}
+HostCertificate /data/ssh/ssh_host_dsa_cert

 AuthorizedKeysFile .ssh/authorized_keys
 AuthorizedPrincipalsFile .ssh/authorized_principals
--- a/docker/rootless/usr/local/bin/docker-setup.sh
+++ b/docker/rootless/usr/local/bin/docker-setup.sh
@@ -25,7 +25,7 @@ if [ ! -f ${GITEA_APP_INI} ]; then
        INSTALL_LOCK=true
    fi

-    # Substitute the environment variables in the template
+    # Substitude the environment variables in the template
    APP_NAME=${APP_NAME:-"Gitea: Git with a cup of tea"} \
    RUN_MODE=${RUN_MODE:-"prod"} \
    RUN_USER=${USER:-"git"} \
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -31,4 +31,4 @@ update: $(THEME)
 $(THEME): $(THEME)/theme.toml
 $(THEME)/theme.toml:
 	mkdir -p $$(dirname $@)
-	curl -L -s $(ARCHIVE) | tar xz -C $$(dirname $@)
+	curl -s $(ARCHIVE) | tar xz -C $$(dirname $@)
--- a/docs/config.yaml
+++ b/docs/config.yaml
@@ -18,10 +18,10 @@ params:
  description: Git with a cup of tea
  author: The Gitea Authors
  website: https://docs.gitea.io
-  version: 1.14.4
+  version: 1.13.3
  minGoVersion: 1.14
  goVersion: 1.16
-  minNodeVersion: 12.17
+  minNodeVersion: 10.13

 outputs:
  home:
--- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md
+++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md
@@ -59,7 +59,7 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`.
 - `MIRROR_QUEUE_LENGTH`: **1000**: Patch test queue length, increase if pull request patch
   testing starts hanging.
 - `PREFERRED_LICENSES`: **Apache License 2.0,MIT License**: Preferred Licenses to place at
-   the top of the list. Name must match file name in options/license or custom/options/license.
+   the top of the list. Name must match file name in conf/license or custom/conf/license.
 - `DISABLE_HTTP_GIT`: **false**: Disable the ability to interact with repositories over the
   HTTP protocol.
 - `USE_COMPAT_SSH_URI`: **false**: Force ssh:// clone url instead of scp-style uri when
@@ -75,7 +75,6 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`.
 - `PREFIX_ARCHIVE_FILES`: **true**: Prefix archive files by placing them in a directory named after the repository.
 - `DISABLE_MIRRORS`: **false**: Disable the creation of **new** mirrors. Pre-existing mirrors remain valid.
 - `DISABLE_MIGRATIONS`: **false**: Disable migrating feature.
- `DISABLE_STARS`: **false**: Disable stars feature.
 - `DEFAULT_BRANCH`: **master**: Default branch name of all repositories.
 - `ALLOW_ADOPTION_OF_UNADOPTED_REPOSITORIES`: **false**: Allow non-admin users to adopt unadopted repositories
 - `ALLOW_DELETION_OF_UNADOPTED_REPOSITORIES`: **false**: Allow non-admin users to delete unadopted repositories
@@ -94,11 +93,10 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`.
 - `REOPEN_KEYWORDS`: **reopen**, **reopens**, **reopened**: List of keywords used in Pull Request comments to automatically reopen
 a related issue
 - `DEFAULT_MERGE_MESSAGE_COMMITS_LIMIT`: **50**: In the default merge message for squash commits include at most this many commits. Set to `-1` to include all commits
- `DEFAULT_MERGE_MESSAGE_SIZE`: **5120**: In the default merge message for squash commits limit the size of the commit messages. Set to `-1` to have no limit. Only used if `POPULATE_SQUASH_COMMENT_WITH_COMMIT_MESSAGES` is `true`.
+- `DEFAULT_MERGE_MESSAGE_SIZE`: **5120**: In the default merge message for squash commits limit the size of the commit messages. Set to `-1` to have no limit.
 - `DEFAULT_MERGE_MESSAGE_ALL_AUTHORS`: **false**: In the default merge message for squash commits walk all commits to include all authors in the Co-authored-by otherwise just use those in the limited list
 - `DEFAULT_MERGE_MESSAGE_MAX_APPROVERS`: **10**: In default merge messages limit the number of approvers listed as `Reviewed-by:`. Set to `-1` to include all.
 - `DEFAULT_MERGE_MESSAGE_OFFICIAL_APPROVERS_ONLY`: **true**: In default merge messages only include approvers who are officially allowed to review.
- `POPULATE_SQUASH_COMMENT_WITH_COMMIT_MESSAGES`: **false**: In default squash-merge messages include the commit message of all commits comprising the pull request.

 ### Repository - Issue (`repository.issue`)

@@ -128,8 +126,8 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`.
  - Options other than `never` and `always` can be combined as a comma separated list.
 - `DEFAULT_TRUST_MODEL`: **collaborator**: \[collaborator, committer, collaboratorcommitter\]: The default trust model used for verifying commits.
   - `collaborator`: Trust signatures signed by keys of collaborators.
-   - `committer`: Trust signatures that match committers (This matches GitHub and will force Gitea signed commits to have Gitea as the committer).
-   - `collaboratorcommitter`: Trust signatures signed by keys of collaborators which match the committer.
+   - `committer`: Trust signatures that match committers (This matches GitHub and will force Gitea signed commits to have Gitea as the commmitter).
+   - `collaboratorcommitter`: Trust signatures signed by keys of collaborators which match the commiter.
 - `WIKI`: **never**: \[never, pubkey, twofa, always, parentsigned\]: Sign commits to wiki.
 - `CRUD_ACTIONS`: **pubkey, twofa, parentsigned**: \[never, pubkey, twofa, parentsigned, always\]: Sign CRUD actions.
  - Options as above, with the addition of:
@@ -144,15 +142,6 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`.

 - `LOCAL_COPY_PATH`: **tmp/local-repo**: Path for temporary local repository copies. Defaults to `tmp/local-repo`

-## Repository -  MIME type mapping (`repository.mimetype_mapping`)
-
-Configuration for set the expected MIME type based on file extensions of downloadable files. Configuration presents in key-value pairs and file extensions starts with leading `.`.
-
-The following configuration set `Content-Type: application/vnd.android.package-archive` header when downloading files with `.apk` file extension.
-```ini
-.apk=application/vnd.android.package-archive
-```
-
 ## CORS (`cors`)

 - `ENABLED`: **false**: enable cors headers (disabled by default)
@@ -180,10 +169,7 @@ The following configuration set `Content-Type: application/vnd.android.package-a
 - `MAX_DISPLAY_FILE_SIZE`: **8388608**: Max size of files to be displayed (default is 8MiB)
 - `REACTIONS`: All available reactions users can choose on issues/prs and comments
    Values can be emoji alias (:smile:) or a unicode emoji.
-    For custom reactions, add a tightly cropped square image to public/img/emoji/reaction_name.png
- `CUSTOM_EMOJIS`: **gitea, codeberg, gitlab, git, github, gogs**: Additional Emojis not defined in the utf8 standard.
-    By default we support gitea (:gitea:), to add more copy them to public/img/emoji/emoji_name.png and
-    add it to this config.
+    For custom reactions, add a tightly cropped square image to public/emoji/img/reaction_name.png
 - `DEFAULT_SHOW_FULL_NAME`: **false**: Whether the full name of the users should be shown where possible. If the full name isn't set, the username will be used.
 - `SEARCH_REPO_DESCRIPTION`: **true**: Whether to search within description at repository search on explore page.
 - `USE_SERVICE_WORKER`: **true**: Whether to enable a Service Worker to cache frontend assets.
@@ -212,10 +198,6 @@ The following configuration set `Content-Type: application/vnd.android.package-a

 - `ENABLE_RENDER`: **true**: Whether to render SVG files as images.  If SVG rendering is disabled, SVG files are displayed as text and cannot be embedded in markdown files as images.

-### UI - CSV Files (`ui.csv`)
-
- `MAX_FILE_SIZE`: **524288** (512kb): Maximum allowed file size in bytes to render CSV files as table. (Set to 0 for no limit).
-
 ## Markdown (`markdown`)

 - `ENABLE_HARD_LINE_BREAK_IN_COMMENTS`: **true**: Render soft line breaks as hard line breaks in comments, which
@@ -255,9 +237,6 @@ The following configuration set `Content-Type: application/vnd.android.package-a
   most cases you do not need to change the default value. Alter it only if
   your SSH server node is not the same as HTTP node. Do not set this variable
   if `PROTOCOL` is set to `unix`.
- `PER_WRITE_TIMEOUT`: **30s**: Timeout for any write to the connection. (Set to 0 to
-   disable all timeouts.)
- `PER_WRITE_PER_KB_TIMEOUT`: **10s**: Timeout per Kb written to connections.

 - `DISABLE_SSH`: **false**: Disable SSH feature when it's not available.
 - `START_SSH_SERVER`: **false**: When enabled, use the built-in SSH server.
@@ -274,7 +253,6 @@ The following configuration set `Content-Type: application/vnd.android.package-a
 - `SSH_AUTHORIZED_PRINCIPALS_ALLOW`: **off** or **username, email**: \[off, username, email, anything\]: Specify the principals values that users are allowed to use as principal. When set to `anything` no checks are done on the principal string. When set to `off` authorized principal are not allowed to be set.
 - `SSH_CREATE_AUTHORIZED_PRINCIPALS_FILE`: **false/true**: Gitea will create a authorized_principals file by default when it is not using the internal ssh server and `SSH_AUTHORIZED_PRINCIPALS_ALLOW` is not `off`.
 - `SSH_AUTHORIZED_PRINCIPALS_BACKUP`: **false/true**: Enable SSH Authorized Principals Backup when rewriting all keys, default is true if `SSH_AUTHORIZED_PRINCIPALS_ALLOW` is not `off`.
- `SSH_AUTHORIZED_KEYS_COMMAND_TEMPLATE`: **{{.AppPath}} --config={{.CustomConf}} serv key-{{.Key.ID}}**: Set the template for the command to passed on authorized keys. Possible keys are: AppPath, AppWorkPath, CustomConf, CustomPath, Key - where Key is a `models.PublicKey` and the others are strings which are shellquoted.
 - `SSH_SERVER_CIPHERS`: **aes128-ctr, aes192-ctr, aes256-ctr, aes128-gcm@openssh.com, arcfour256, arcfour128**: For the built-in SSH server, choose the ciphers to support for SSH connections, for system SSH this setting has no effect.
 - `SSH_SERVER_KEY_EXCHANGES`: **diffie-hellman-group1-sha1, diffie-hellman-group14-sha1, ecdh-sha2-nistp256, ecdh-sha2-nistp384, ecdh-sha2-nistp521, curve25519-sha256@libssh.org**: For the built-in SSH server, choose the key exchange algorithms to support for SSH connections, for system SSH this setting has no effect.
 - `SSH_SERVER_MACS`: **hmac-sha2-256-etm@openssh.com, hmac-sha2-256, hmac-sha1, hmac-sha1-96**: For the built-in SSH server, choose the MACs to support for SSH connections, for system SSH this setting has no effect
@@ -282,9 +260,6 @@ The following configuration set `Content-Type: application/vnd.android.package-a
 - `SSH_KEY_TEST_PATH`: **/tmp**: Directory to create temporary files in when testing public keys using ssh-keygen, default is the system temporary directory.
 - `SSH_KEYGEN_PATH`: **ssh-keygen**: Path to ssh-keygen, default is 'ssh-keygen' which means the shell is responsible for finding out which one to call.
 - `SSH_EXPOSE_ANONYMOUS`: **false**: Enable exposure of SSH clone URL to anonymous visitors, default is false.
- `SSH_PER_WRITE_TIMEOUT`: **30s**: Timeout for any write to the SSH connections. (Set to
-  0 to disable all timeouts.)
- `SSH_PER_WRITE_PER_KB_TIMEOUT`: **10s**: Timeout per Kb written to SSH connections.
 - `MINIMUM_KEY_SIZE_CHECK`: **true**: Indicate whether to check minimum key size with corresponding type.

 - `OFFLINE_MODE`: **false**: Disables use of CDN for static files and Gravatar for profile pictures.
@@ -345,9 +320,9 @@ The following configuration set `Content-Type: application/vnd.android.package-a
 - `PATH`: **data/gitea.db**: For SQLite3 only, the database file path.
 - `LOG_SQL`: **true**: Log the executed SQL.
 - `DB_RETRIES`: **10**: How many ORM init / DB connect attempts allowed.
- `DB_RETRY_BACKOFF`: **3s**: time.Duration to wait before trying another ORM init / DB connect attempt, if failure occurred.
+- `DB_RETRY_BACKOFF`: **3s**: time.Duration to wait before trying another ORM init / DB connect attempt, if failure occured.
 - `MAX_OPEN_CONNS` **0**: Database maximum open connections - default is 0, meaning there is no limit.
- `MAX_IDLE_CONNS` **2**: Max idle database connections on connection pool, default is 2 - this will be capped to `MAX_OPEN_CONNS`.
+- `MAX_IDLE_CONNS` **2**: Max idle database connections on connnection pool, default is 2 - this will be capped to `MAX_OPEN_CONNS`.
 - `CONN_MAX_LIFETIME` **0 or 3s**: Sets the maximum amount of time a DB connection may be reused - default is 0, meaning there is no limit (except on MySQL where it is 3s - see #6804 & #7071).

 Please see #8540 & #8273 for further discussion of the appropriate values for `MAX_OPEN_CONNS`, `MAX_IDLE_CONNS` & `CONN_MAX_LIFETIME` and their
@@ -360,10 +335,10 @@ relation to port exhaustion.
 - `ISSUE_INDEXER_NAME`: **gitea_issues**: Issue indexer name, available when ISSUE_INDEXER_TYPE is elasticsearch
 - `ISSUE_INDEXER_PATH`: **indexers/issues.bleve**: Index file used for issue search; available when ISSUE_INDEXER_TYPE is bleve and elasticsearch.
 - The next 4 configuration values are deprecated and should be set in `queue.issue_indexer` however are kept for backwards compatibility:
- `ISSUE_INDEXER_QUEUE_TYPE`: **levelqueue**: Issue indexer queue, currently supports:`channel`, `levelqueue`, `redis`. **DEPRECATED** use settings in `[queue.issue_indexer]`.
- `ISSUE_INDEXER_QUEUE_DIR`: **queues/common**: When `ISSUE_INDEXER_QUEUE_TYPE` is `levelqueue`, this will be the path where the queue will be saved. **DEPRECATED** use settings in `[queue.issue_indexer]`.
- `ISSUE_INDEXER_QUEUE_CONN_STR`: **addrs=127.0.0.1:6379 db=0**: When `ISSUE_INDEXER_QUEUE_TYPE` is `redis`, this will store the redis connection string. When `ISSUE_INDEXER_QUEUE_TYPE` is `levelqueue`, this is a directory or additional options of the form `leveldb://path/to/db?option=value&....`, and overrides `ISSUE_INDEXER_QUEUE_DIR`. **DEPRECATED** use settings in `[queue.issue_indexer]`.
- `ISSUE_INDEXER_QUEUE_BATCH_NUMBER`: **20**: Batch queue number. **DEPRECATED** use settings in `[queue.issue_indexer]`.
+- `ISSUE_INDEXER_QUEUE_TYPE`: **levelqueue**: Issue indexer queue, currently supports:`channel`, `levelqueue`, `redis`.
+- `ISSUE_INDEXER_QUEUE_DIR`: **indexers/issues.queue**: When `ISSUE_INDEXER_QUEUE_TYPE` is `levelqueue`, this will be the path where the queue will be saved.
+- `ISSUE_INDEXER_QUEUE_CONN_STR`: **addrs=127.0.0.1:6379 db=0**: When `ISSUE_INDEXER_QUEUE_TYPE` is `redis`, this will store the redis connection string. When `ISSUE_INDEXER_QUEUE_TYPE` is `levelqueue`, this is a directory or additional options of the form `leveldb://path/to/db?option=value&....`, and overrides `ISSUE_INDEXER_QUEUE_DIR`.
+- `ISSUE_INDEXER_QUEUE_BATCH_NUMBER`: **20**: Batch queue number.

 - `REPO_INDEXER_ENABLED`: **false**: Enables code search (uses a lot of disk space, about 6 times more than the repository size).
 - `REPO_INDEXER_TYPE`: **bleve**: Code search engine type, could be `bleve` or `elasticsearch`.
@@ -374,29 +349,29 @@ relation to port exhaustion.
 - `REPO_INDEXER_INCLUDE`: **empty**: A comma separated list of glob patterns (see https://github.com/gobwas/glob) to **include** in the index. Use `**.txt` to match any files with .txt extension. An empty list means include all files.
 - `REPO_INDEXER_EXCLUDE`: **empty**: A comma separated list of glob patterns (see https://github.com/gobwas/glob) to **exclude** from the index. Files that match this list will not be indexed, even if they match in `REPO_INDEXER_INCLUDE`.
 - `REPO_INDEXER_EXCLUDE_VENDORED`: **true**: Exclude vendored files from index.
- `UPDATE_BUFFER_LEN`: **20**: Buffer length of index request. **DEPRECATED** use settings in `[queue.issue_indexer]`.
+- `UPDATE_BUFFER_LEN`: **20**: Buffer length of index request.
 - `MAX_FILE_SIZE`: **1048576**: Maximum size in bytes of files to be indexed.
 - `STARTUP_TIMEOUT`: **30s**: If the indexer takes longer than this timeout to start - fail. (This timeout will be added to the hammer time above for child processes - as bleve will not start until the previous parent is shutdown.) Set to zero to never timeout.

 ## Queue (`queue` and `queue.*`)

 - `TYPE`: **persistable-channel**: General queue type, currently support: `persistable-channel` (uses a LevelDB internally), `channel`, `level`, `redis`, `dummy`
- `DATADIR`: **queues/**: Base DataDir for storing persistent and level queues. `DATADIR` for individual queues can be set in `queue.name` sections but will default to `DATADIR/`**`common`**. (Previously each queue would default to `DATADIR/`**`name`**.)
+- `DATADIR`: **queues/**: Base DataDir for storing persistent and level queues. `DATADIR` for individual queues can be set in `queue.name` sections but will default to `DATADIR/`**`name`**.
 - `LENGTH`: **20**: Maximal queue size before channel queues block
 - `BATCH_LENGTH`: **20**: Batch data before passing to the handler
 - `CONN_STR`: **redis://127.0.0.1:6379/0**: Connection string for the redis queue type. Options can be set using query params. Similarly LevelDB options can also be set using: **leveldb://relative/path?option=value** or **leveldb:///absolute/path?option=value**, and will override `DATADIR`
- `QUEUE_NAME`: **_queue**: The suffix for default redis and disk queue name. Individual queues will default to **`name`**`QUEUE_NAME` but can be overridden in the specific `queue.name` section.
+- `QUEUE_NAME`: **_queue**: The suffix for default redis and disk queue name. Individual queues will default to **`name`**`QUEUE_NAME` but can be overriden in the specific `queue.name` section.
 - `SET_NAME`: **_unique**: The suffix that will be added to the default redis and disk queue `set` name for unique queues. Individual queues will default to
 **`name`**`QUEUE_NAME`_`SET_NAME`_ but can be overridden in the specific `queue.name` section.
 - `WRAP_IF_NECESSARY`: **true**: Will wrap queues with a timeoutable queue if the selected queue is not ready to be created - (Only relevant for the level queue.)
 - `MAX_ATTEMPTS`: **10**: Maximum number of attempts to create the wrapped queue
 - `TIMEOUT`: **GRACEFUL_HAMMER_TIME + 30s**: Timeout the creation of the wrapped queue if it takes longer than this to create.
 - Queues by default come with a dynamically scaling worker pool. The following settings configure this:
- `WORKERS`: **0** (v1.14 and before: **1**): Number of initial workers for the queue.
+- `WORKERS`: **1**: Number of initial workers for the queue.
 - `MAX_WORKERS`: **10**: Maximum number of worker go-routines for the queue.
 - `BLOCK_TIMEOUT`: **1s**: If the queue blocks for this time, boost the number of workers - the `BLOCK_TIMEOUT` will then be doubled before boosting again whilst the boost is ongoing.
 - `BOOST_TIMEOUT`: **5m**: Boost workers will timeout after this long.
- `BOOST_WORKERS`: **1** (v1.14 and before: **5**): This many workers will be added to the worker pool if there is a boost.
+- `BOOST_WORKERS`: **5**: This many workers will be added to the worker pool if there is a boost.

 ## Admin (`admin`)

@@ -450,21 +425,6 @@ relation to port exhaustion.
 - `BLACKLISTED_URIS`: **\<empty\>**: If non-empty, list of POSIX regex patterns matching
   OpenID URI's to block.

-## OAuth2 Client (`oauth2_client`)
-
- `REGISTER_EMAIL_CONFIRM`: *[service]* **REGISTER\_EMAIL\_CONFIRM**: Set this to enable or disable email confirmation of OAuth2 auto-registration. (Overwrites the REGISTER\_EMAIL\_CONFIRM setting of the `[service]` section)
- `OPENID_CONNECT_SCOPES`: **\<empty\>**: List of additional openid connect scopes. (`openid` is implicitly added)
- `ENABLE_AUTO_REGISTRATION`: **false**: Automatically create user accounts for new oauth2 users.
- `USERNAME`: **nickname**: The source of the username for new oauth2 accounts:
-    - userid - use the userid / sub attribute
-    - nickname - use the nickname attribute
-    - email - use the username part of the email attribute
- `UPDATE_AVATAR`: **false**: Update avatar if available from oauth2 provider. Update will be performed on each login.
- `ACCOUNT_LINKING`: **login**: How to handle if an account / email already exists:
-    - disabled - show an error
-    - login - show an account linking login
-    - auto - automatically link with the account (Please be aware that this will grant access to an existing account just because the same username or email is provided. You must make sure that this does not cause issues with your authentication providers.)
-
 ## Service (`service`)

 - `ACTIVE_CODE_LIVE_MINUTES`: **180**: Time limit (min) to confirm account/email registration.
@@ -515,16 +475,12 @@ relation to port exhaustion.
 - `SHOW_MILESTONES_DASHBOARD_PAGE`: **true** Enable this to show the milestones dashboard page - a view of all the user's milestones
 - `AUTO_WATCH_NEW_REPOS`: **true**: Enable this to let all organisation users watch new repos when they are created
 - `AUTO_WATCH_ON_CHANGES`: **false**: Enable this to make users watch a repository after their first commit to it
- `DEFAULT_USER_VISIBILITY`: **public**: Set default visibility mode for users, either "public", "limited" or "private".
- `ALLOWED_USER_VISIBILITY_MODES`: **public,limited,private**: Set which visibility modes a user can have
 - `DEFAULT_ORG_VISIBILITY`: **public**: Set default visibility mode for organisations, either "public", "limited" or "private".
 - `DEFAULT_ORG_MEMBER_VISIBLE`: **false** True will make the membership of the users visible when added to the organisation.
- `ALLOW_ONLY_INTERNAL_REGISTRATION`: **false** Set to true to force registration only via gitea.
 - `ALLOW_ONLY_EXTERNAL_REGISTRATION`: **false** Set to true to force registration only using third-party services.
- `NO_REPLY_ADDRESS`: **noreply.DOMAIN** Value for the domain part of the user's email address in the git log if user has set KeepEmailPrivate to true. DOMAIN resolves to the value in server.DOMAIN.
+- `NO_REPLY_ADDRESS`: **DOMAIN** Default value for the domain part of the user's email address in the git log if he has set KeepEmailPrivate to true.
  The user's email will be replaced with a concatenation of the user name in lower case, "@" and NO_REPLY_ADDRESS.
 - `USER_DELETE_WITH_COMMENTS_MAX_TIME`: **0** Minimum amount of time a user must exist before comments are kept when the user is deleted.
- `VALID_SITE_URL_SCHEMES`: **http, https**: Valid site url schemes for user profiles

 ### Service - Expore (`service.explore`)

@@ -556,9 +512,9 @@ Define allowed algorithms and their minimum key length (use -1 to disable a type
 - `DISABLE_HELO`: **\<empty\>**: Disable HELO operation.
 - `HELO_HOSTNAME`: **\<empty\>**: Custom hostname for HELO operation.
 - `HOST`: **\<empty\>**: SMTP mail host address and port (example: smtp.gitea.io:587).
-  - As per RFC 8314, if supported, Implicit TLS/SMTPS on port 465 is recommended, otherwise opportunistic TLS via STARTTLS on port 587 should be used.
+  - Using opportunistic TLS via STARTTLS on port 587 is recommended per RFC 6409.
 - `IS_TLS_ENABLED` :  **false** : Forcibly use TLS to connect even if not on a default SMTPS port.
-  - Note, if the port ends with `465` Implicit TLS/SMTPS/SMTP over TLS will be used despite this setting.
+  - Note, if the port ends with `465` SMTPS/SMTP over TLS will be used despite this setting.
  - Otherwise if `IS_TLS_ENABLED=false` and the server supports `STARTTLS` this will be used. Thus if `STARTTLS` is preferred you should set `IS_TLS_ENABLED=false`.
 - `FROM`: **\<empty\>**: Mail from address, RFC 5322. This can be just an email address, or
   the "Name" \<email@example.com\> format.
@@ -590,12 +546,11 @@ Define allowed algorithms and their minimum key length (use -1 to disable a type
 ## Cache (`cache`)

 - `ENABLED`: **true**: Enable the cache.
- `ADAPTER`: **memory**: Cache engine adapter, either `memory`, `redis`, `twoqueue` or `memcache`. (`twoqueue` represents a size limited LRU cache.)
- `INTERVAL`: **60**: Garbage Collection interval (sec), for memory and twoqueue cache only.
- `HOST`: **\<empty\>**: Connection string for `redis` and `memcache`. For `twoqueue` sets configuration for the queue.
+- `ADAPTER`: **memory**: Cache engine adapter, either `memory`, `redis`, or `memcache`.
+- `INTERVAL`: **60**: Garbage Collection interval (sec), for memory cache only.
+- `HOST`: **\<empty\>**: Connection string for `redis` and `memcache`.
   - Redis: `redis://:macaron@127.0.0.1:6379/0?pool_size=100&idle_timeout=180s`
   - Memcache: `127.0.0.1:9090;127.0.0.1:9091`
-   - TwoQueue LRU cache: `{"size":50000,"recent_ratio":0.25,"ghost_ratio":0.5}` or `50000` representing the maximum number of objects stored in the cache.
 - `ITEM_TTL`: **16h**: Time to keep items in cache if not used, Setting it to 0 disables caching.

 ## Cache - LastCommitCache settings (`cache.last_commit`)
@@ -607,7 +562,7 @@ Define allowed algorithms and their minimum key length (use -1 to disable a type
 ## Session (`session`)

 - `PROVIDER`: **memory**: Session engine provider \[memory, file, redis, db, mysql, couchbase, memcache, postgres\].
- `PROVIDER_CONFIG`: **data/sessions**: For file, the root path; for db, empty (database config will be used); for others, the connection string.
+- `PROVIDER_CONFIG`: **data/sessions**: For file, the root path; for others, the connection string.
 - `COOKIE_SECURE`: **false**: Enable this to force using HTTPS for all session access.
 - `COOKIE_NAME`: **i\_like\_gitea**: The name of the cookie used for the session ID.
 - `GC_INTERVAL_TIME`: **86400**: GC interval in seconds.
@@ -672,7 +627,6 @@ Default templates for project boards:
 - `ROUTER`: **console**: The mode or name of the log the router should log to. (If you set this to `,` it will log to default gitea logger.)
 NB: You must have `DISABLE_ROUTER_LOG` set to `false` for this option to take effect. Configure each mode in per mode log subsections `\[log.modename.router\]`.
 - `ENABLE_ACCESS_LOG`: **false**: Creates an access.log in NCSA common log format, or as per the following template
- `ENABLE_SSH_LOG`: **false**: save ssh log to log file
 - `ACCESS`: **file**: Logging mode for the access logger, use a comma to separate values. Configure each mode in per mode log subsections `\[log.modename.access\]`. By default the file mode will log to `$ROOT_PATH/access.log`. (If you set this to `,` it will log to the default gitea logger.)
 - `ACCESS_LOG_TEMPLATE`: **`{{.Ctx.RemoteAddr}} - {{.Identity}} {{.Start.Format "[02/Jan/2006:15:04:05 -0700]" }} "{{.Ctx.Req.Method}} {{.Ctx.Req.URL.RequestURI}} {{.Ctx.Req.Proto}}" {{.ResponseWriter.Status}} {{.ResponseWriter.Size}} "{{.Ctx.Req.Referer}}\" \"{{.Ctx.Req.UserAgent}}"`**: Sets the template used to create the access log.
  - The following variables are available:
@@ -729,18 +683,13 @@ NB: You must have `DISABLE_ROUTER_LOG` set to `false` for this option to take ef
 - `RUN_AT_START`: **false**: Run cron tasks at application start-up.
 - `NO_SUCCESS_NOTICE`: **false**: Set to true to switch off success notices.

- `SCHEDULE` accept formats
-   - Full crontab specs, e.g. `* * * * * ?`
-   - Descriptors, e.g. `@midnight`, `@every 1h30m` ...
-   - See more: [cron decument](https://pkg.go.dev/github.com/gogs/cron@v0.0.0-20171120032916-9f6c956d3e14)
-
 ### Basic cron tasks - enabled by default

 #### Cron - Cleanup old repository archives (`cron.archive_cleanup`)

 - `ENABLED`: **true**: Enable service.
 - `RUN_AT_START`: **true**: Run tasks at start up time (if ENABLED).
- `SCHEDULE`: **@midnight**: Cron syntax for scheduling repository archive cleanup, e.g. `@every 1h`.
+- `SCHEDULE`: **@every 24h**: Cron syntax for scheduling repository archive cleanup, e.g. `@every 1h`.
 - `OLDER_THAN`: **24h**: Archives created more than `OLDER_THAN` ago are subject to deletion, e.g. `12h`.

 #### Cron - Update Mirrors (`cron.update_mirrors`)
@@ -750,31 +699,31 @@ NB: You must have `DISABLE_ROUTER_LOG` set to `false` for this option to take ef

 #### Cron - Repository Health Check (`cron.repo_health_check`)

- `SCHEDULE`: **@midnight**: Cron syntax for scheduling repository health check.
+- `SCHEDULE`: **@every 24h**: Cron syntax for scheduling repository health check.
 - `TIMEOUT`: **60s**: Time duration syntax for health check execution timeout.
 - `ARGS`: **\<empty\>**: Arguments for command `git fsck`, e.g. `--unreachable --tags`. See more on http://git-scm.com/docs/git-fsck

 #### Cron - Repository Statistics Check (`cron.check_repo_stats`)

 - `RUN_AT_START`: **true**: Run repository statistics check at start time.
- `SCHEDULE`: **@midnight**: Cron syntax for scheduling repository statistics check.
+- `SCHEDULE`: **@every 24h**: Cron syntax for scheduling repository statistics check.

 ### Cron - Cleanup hook_task Table (`cron.cleanup_hook_task_table`)

 - `ENABLED`: **true**: Enable cleanup hook_task job.
 - `RUN_AT_START`: **false**: Run cleanup hook_task at start time (if ENABLED).
- `SCHEDULE`: **@midnight**: Cron syntax for cleaning hook_task table.
+- `SCHEDULE`: **@every 24h**: Cron syntax for cleaning hook_task table.
 - `CLEANUP_TYPE` **OlderThan** OlderThan or PerWebhook Method to cleanup hook_task, either by age (i.e. how long ago hook_task record was delivered) or by the number to keep per webhook (i.e. keep most recent x deliveries per webhook).
 - `OLDER_THAN`: **168h**: If CLEANUP_TYPE is set to OlderThan, then any delivered hook_task records older than this expression will be deleted.
 - `NUMBER_TO_KEEP`: **10**: If CLEANUP_TYPE is set to PerWebhook, this is number of hook_task records to keep for a webhook (i.e. keep the most recent x deliveries).

 #### Cron - Update Migration Poster ID (`cron.update_migration_poster_id`)

- `SCHEDULE`: **@midnight** : Interval as a duration between each synchronization, it will always attempt synchronization when the instance starts.
+- `SCHEDULE`: **@every 24h** : Interval as a duration between each synchronization, it will always attempt synchronization when the instance starts.

 #### Cron - Sync External Users (`cron.sync_external_users`)

- `SCHEDULE`: **@midnight** : Interval as a duration between each synchronization, it will always attempt synchronization when the instance starts.
+- `SCHEDULE`: **@every 24h** : Interval as a duration between each synchronization, it will always attempt synchronization when the instance starts.
 - `UPDATE_EXISTING`: **true**: Create new users, update existing user data and disable users that are not in external source anymore (default) or only create new users if UPDATE_EXISTING is set to false.

 ### Extended cron tasks (not enabled by default)
@@ -817,13 +766,6 @@ NB: You must have `DISABLE_ROUTER_LOG` set to `false` for this option to take ef
 - `NO_SUCCESS_NOTICE`: **false**: Set to true to switch off success notices.
 - `SCHEDULE`: **@every 72h**: Cron syntax for scheduling repository archive cleanup, e.g. `@every 1h`.

-#### Cron -  Delete all old actions from database ('cron.delete_old_actions')
- `ENABLED`: **false**: Enable service.
- `RUN_AT_START`: **false**: Run tasks at start up time (if ENABLED).
- `NO_SUCCESS_NOTICE`: **false**: Set to true to switch off success notices.
- `SCHEDULE`: **@every 128h**: Cron syntax for scheduling a work, e.g. `@every 128h`.
- `OLDER_THAN`: **@every 8760h**: any action older than this expression will be deleted from database, suggest using `8760h` (1 year) because that's the max length of heatmap.
-
 ## Git (`git`)

 - `PATH`: **""**: The path of git executable. If empty, Gitea searches through the PATH environment.
@@ -838,7 +780,7 @@ NB: You must have `DISABLE_ROUTER_LOG` set to `false` for this option to take ef
 - `PULL_REQUEST_PUSH_MESSAGE`: **true**: Respond to pushes to a non-default branch with a URL for creating a Pull Request (if the repository has them enabled)
 - `VERBOSE_PUSH`: **true**: Print status information about pushes as they are being processed.
 - `VERBOSE_PUSH_DELAY`: **5s**: Only print verbose information if push takes longer than this delay.
- `LARGE_OBJECT_THRESHOLD`: **1048576**: (Go-Git only), don't cache objects greater than this in memory. (Set to 0 to disable.)
+
 ## Git - Timeout settings (`git.timeout`)
 - `DEFAUlT`: **360**: Git operations default timeout seconds.
 - `MIGRATE`: **600**: Migrate external repositories timeout seconds.
@@ -866,9 +808,7 @@ NB: You must have `DISABLE_ROUTER_LOG` set to `false` for this option to take ef
 - `ACCESS_TOKEN_EXPIRATION_TIME`: **3600**: Lifetime of an OAuth2 access token in seconds
 - `REFRESH_TOKEN_EXPIRATION_TIME`: **730**: Lifetime of an OAuth2 refresh token in hours
 - `INVALIDATE_REFRESH_TOKENS`: **false**: Check if refresh token has already been used
- `JWT_SIGNING_ALGORITHM`: **RS256**: Algorithm used to sign OAuth2 tokens. Valid values: \[`HS256`, `HS384`, `HS512`, `RS256`, `RS384`, `RS512`, `ES256`, `ES384`, `ES512`\]
- `JWT_SECRET`: **\<empty\>**: OAuth2 authentication secret for access and refresh tokens, change this to a unique string. This setting is only needed if `JWT_SIGNING_ALGORITHM` is set to `HS256`, `HS384` or `HS512`.
- `JWT_SIGNING_PRIVATE_KEY_FILE`: **jwt/private.pem**: Private key file path used to sign OAuth2 tokens. The path is relative to `APP_DATA_PATH`. This setting is only needed if `JWT_SIGNING_ALGORITHM` is set to `RS256`, `RS384`, `RS512`, `ES256`, `ES384` or `ES512`. The file must contain a RSA or ECDSA private key in the PKCS8 format. If no key exists a 4096 bit key will be created for you.
+- `JWT_SECRET`: **\<empty\>**: OAuth2 authentication secret for access and refresh tokens, change this a unique string.
 - `MAX_TOKEN_LENGTH`: **32767**: Maximum length of token/cookie to accept from OAuth2 provider

 ## i18n (`i18n`)
@@ -887,16 +827,14 @@ Gitea can support Markup using external tools. The example below will add a mark
 ```ini
 [markup.asciidoc]
 ENABLED = true
-NEED_POSTPROCESS = true
 FILE_EXTENSIONS = .adoc,.asciidoc
 RENDER_COMMAND = "asciidoc --out-file=- -"
 IS_INPUT_FILE = false
 ```

 - ENABLED: **false** Enable markup support; set to **true** to enable this renderer.
- NEED\_POSTPROCESS: **true** set to **true** to replace links / sha1 and etc.
 - FILE\_EXTENSIONS: **\<empty\>** List of file extensions that should be rendered by an external
-   command. Multiple extensions needs a comma as splitter.
+   command. Multiple extentions needs a comma as splitter.
 - RENDER\_COMMAND: External command to render all matching extensions.
 - IS\_INPUT\_FILE: **false** Input is not a standard input but a file param followed `RENDER_COMMAND`.

@@ -914,21 +852,17 @@ Gitea supports customizing the sanitization policy for rendered HTML. The exampl
 ELEMENT = span
 ALLOW_ATTR = class
 REGEXP = ^\s*((math(\s+|$)|inline(\s+|$)|display(\s+|$)))+
-ALLOW_DATA_URI_IMAGES = true
 ```

 - `ELEMENT`: The element this policy applies to. Must be non-empty.
 - `ALLOW_ATTR`: The attribute this policy allows. Must be non-empty.
 - `REGEXP`: A regex to match the contents of the attribute against. Must be present but may be empty for unconditional whitelisting of this attribute.
- - `ALLOW_DATA_URI_IMAGES`: **false** Allow data uri images (`<img src="data:image/png;base64,..."/>`).

 Multiple sanitisation rules can be defined by adding unique subsections, e.g. `[markup.sanitizer.TeX-2]`.
-To apply a sanitisation rules only for a specify external renderer they must use the renderer name, e.g. `[markup.sanitizer.asciidoc.rule-1]`.
-If the rule is defined above the renderer ini section or the name does not match a renderer it is applied to every renderer.

 ## Time (`time`)

- `FORMAT`: Time format to display on UI. i.e. RFC1123 or 2006-01-02 15:04:05
+- `FORMAT`: Time format to diplay on UI. i.e. RFC1123 or 2006-01-02 15:04:05
 - `DEFAULT_UI_LOCATION`: Default location of time on the UI, so that we can display correct user's time on UI. i.e. Shanghai/Asia

 ## Task (`task`)
@@ -1002,23 +936,6 @@ MINIO_USE_SSL = false

 And used by `[attachment]`, `[lfs]` and etc. as `STORAGE_TYPE`.

-## Repository Archive Storage (`storage.repo-archive`)
-
-Configuration for repository archive storage. It will inherit from default `[storage]` or
-`[storage.xxx]` when set `STORAGE_TYPE` to `xxx`. The default of `PATH`
-is `data/repo-archive` and the default of `MINIO_BASE_PATH` is `repo-archive/`.
-
- `STORAGE_TYPE`: **local**: Storage type for repo archive, `local` for local disk or `minio` for s3 compatible object storage service or other name defined with `[storage.xxx]`
- `SERVE_DIRECT`: **false**: Allows the storage driver to redirect to authenticated URLs to serve files directly. Currently, only Minio/S3 is supported via signed URLs, local does nothing.
- `PATH`: **./data/repo-archive**: Where to store archive files, only available when `STORAGE_TYPE` is `local`.
- `MINIO_ENDPOINT`: **localhost:9000**: Minio endpoint to connect only available when `STORAGE_TYPE` is `minio`
- `MINIO_ACCESS_KEY_ID`: Minio accessKeyID to connect only available when `STORAGE_TYPE` is `minio`
- `MINIO_SECRET_ACCESS_KEY`: Minio secretAccessKey to connect only available when `STORAGE_TYPE is` `minio`
- `MINIO_BUCKET`: **gitea**: Minio bucket to store the lfs only available when `STORAGE_TYPE` is `minio`
- `MINIO_LOCATION`: **us-east-1**: Minio location to create bucket only available when `STORAGE_TYPE` is `minio`
- `MINIO_BASE_PATH`: **repo-archive/**: Minio base path on the bucket only available when `STORAGE_TYPE` is `minio`
- `MINIO_USE_SSL`: **false**: Minio enabled ssl only available when `STORAGE_TYPE` is `minio`
-
 ## Other (`other`)

 - `SHOW_FOOTER_BRANDING`: **false**: Show Gitea branding in the footer.
--- a/docs/content/doc/advanced/config-cheat-sheet.zh-cn.md
+++ b/docs/content/doc/advanced/config-cheat-sheet.zh-cn.md
@@ -245,11 +245,6 @@ test01.xls: application/vnd.ms-excel; charset=binary

 - `ENABLED`: 是否在后台运行定期任务。
 - `RUN_AT_START`: 是否启动时自动运行。
- `SCHEDULE` 所接受的格式
-   - 完整 crontab 控制, 例如 `* * * * * ?`
-   - 描述符, 例如 `@midnight`, `@every 1h30m` ...
-   - 更多细节参见 [cron api文档](https://pkg.go.dev/github.com/gogs/cron@v0.0.0-20171120032916-9f6c956d3e14)
-

 ### Cron - Update Mirrors (`cron.update_mirrors`)

@@ -257,18 +252,18 @@ test01.xls: application/vnd.ms-excel; charset=binary

 ### Cron - Repository Health Check (`cron.repo_health_check`)

- `SCHEDULE`: 仓库健康监测的Cron语法，比如：`@midnight`。
+- `SCHEDULE`: 仓库健康监测的Cron语法，比如：`@every 24h`。
 - `TIMEOUT`: 仓库健康监测的超时时间，比如：`60s`.
 - `ARGS`: 执行 `git fsck` 命令的参数，比如：`--unreachable --tags`。

 ### Cron - Repository Statistics Check (`cron.check_repo_stats`)

 - `RUN_AT_START`: 是否启动时自动运行仓库统计。
- `SCHEDULE`: 仓库统计时的Cron 语法，比如：`@midnight`.
+- `SCHEDULE`: 仓库统计时的Cron 语法，比如：`@every 24h`.

 ### Cron - Update Migration Poster ID (`cron.update_migration_poster_id`)

- `SCHEDULE`: **@midnight** : 每次同步的间隔时间。此任务总是在启动时自动进行。
+- `SCHEDULE`: **@every 24h** : 每次同步的间隔时间。此任务总是在启动时自动进行。

 ## Git (`git`)

@@ -302,14 +297,12 @@ test01.xls: application/vnd.ms-excel; charset=binary
 ```ini
 [markup.asciidoc]
 ENABLED = false
-NEED_POSTPROCESS = true
 FILE_EXTENSIONS = .adoc,.asciidoc
 RENDER_COMMAND = "asciidoc --out-file=- -"
 IS_INPUT_FILE = false
 ```

 - ENABLED: 是否启用，默认为false。
- NEED\_POSTPROCESS: **true** 设置为 true 则会替换渲染文件中的内部链接和Commit ID 等。
 - FILE_EXTENSIONS: 关联的文档的扩展名，多个扩展名用都好分隔。
 - RENDER_COMMAND: 工具的命令行命令及参数。
 - IS_INPUT_FILE: 输入方式是最后一个参数为文件路径还是从标准输入读取。
@@ -382,21 +375,6 @@ MINIO_USE_SSL = false

 然后你在 `[attachment]`, `[lfs]` 等中可以把这个名字用作 `STORAGE_TYPE` 的值。

-## Repository Archive Storage (`storage.repo-archive`)
-
-Repository archive 的存储配置。 如果 `STORAGE_TYPE` 为空，则此配置将从 `[storage]` 继承。如果不为 `local` 或者 `minio` 而为 `xxx`， 则从 `[storage.xxx]` 继承。当继承时， `PATH` 默认为 `data/repo-archive`，`MINIO_BASE_PATH` 默认为 `repo-archive/`。
-
- `STORAGE_TYPE`: **local**: Repository archive 的存储类型，`local` 将存储到磁盘，`minio` 将存储到 s3 兼容的对象服务。
- `SERVE_DIRECT`: **false**: 允许直接重定向到存储系统。当前，仅 Minio/S3 是支持的。
- `PATH`: 存放 Repository archive 上传的文件的地方，默认是 `data/repo-archive`。
- `MINIO_ENDPOINT`: **localhost:9000**: Minio 地址，仅当 `STORAGE_TYPE` 为 `minio` 时有效。
- `MINIO_ACCESS_KEY_ID`: Minio accessKeyID，仅当 `STORAGE_TYPE` 为 `minio` 时有效。
- `MINIO_SECRET_ACCESS_KEY`: Minio secretAccessKey，仅当 `STORAGE_TYPE` 为 `minio` 时有效。
- `MINIO_BUCKET`: **gitea**: Minio bucket，仅当 `STORAGE_TYPE` 为 `minio` 时有效。
- `MINIO_LOCATION`: **us-east-1**: Minio location ，仅当 `STORAGE_TYPE` 为 `minio` 时有效。
- `MINIO_BASE_PATH`: **repo-archive/**: Minio base path ，仅当 `STORAGE_TYPE` 为 `minio` 时有效。
- `MINIO_USE_SSL`: **false**: Minio 是否启用 ssl ，仅当 `STORAGE_TYPE` 为 `minio` 时有效。
-
 ## Other (`other`)

 - `SHOW_FOOTER_BRANDING`: 为真则在页面底部显示Gitea的字样。
--- a/docs/content/doc/advanced/customizing-gitea.en-us.md
+++ b/docs/content/doc/advanced/customizing-gitea.en-us.md
@@ -35,14 +35,14 @@ Again `gitea help` will allow you review this variable and you can override it u
 `--config` option on the `gitea` binary.

 - [Quick Cheat Sheet](https://docs.gitea.io/en-us/config-cheat-sheet/)
- [Complete List](https://github.com/go-gitea/gitea/blob/main/custom/conf/app.example.ini)
+- [Complete List](https://github.com/go-gitea/gitea/blob/master/custom/conf/app.example.ini)

 If the `CustomPath` folder can't be found despite checking `gitea help`, check the `GITEA_CUSTOM`
 environment variable; this can be used to override the default path to something else.
 `GITEA_CUSTOM` might, for example, be set by an init script. You can check whether the value
 is set under the "Configuration" tab on the site administration page.

- [List of Environment Variables](https://docs.gitea.io/en-us/environment-variables/)
+- [List of Environment Variables](https://docs.gitea.io/en-us/specific-variables/)

 **Note:** Gitea must perform a full restart to see configuration changes.

@@ -56,20 +56,24 @@ To make Gitea serve custom public files (like pages and images), use the folder
 `$GITEA_CUSTOM/public/` as the webroot. Symbolic links will be followed.

 For example, a file `image.png` stored in `$GITEA_CUSTOM/public/`, can be accessed with
-the url `http://gitea.domain.tld/assets/image.png`.
+the url `http://gitea.domain.tld/image.png`.

-## Changing the logo
+## Changing the default logo

-To build a custom logo clone the Gitea source repository, replace `assets/logo.svg` and run
-`make generate-images`. This will update below output files which you can then place in `$GITEA_CUSTOM/public/img` on your server:
+To build a custom logo replace `assets/logo.svg` and run `make generate-images`. This will update
+these customizable logo files which you can then place in `$GITEA_CUSTOM/public/img` on your server:

- `public/img/logo.svg` - Used for favicon, site icon, app icon
- `public/img/logo.png` - Used for Open Graph
- `public/img/favicon.png` - Used as fallback for browsers that don't support SVG favicons
- `public/img/avatar_default.png` - Used as the default avatar image
- `public/img/apple-touch-icon.png` - Used on iOS devices for bookmarks
+- `public/img/logo.svg`
+- `public/img/logo.png`
+- `public/img/favicon.png`
+- `public/img/avatar_default.png`
+- `public/img/apple-touch-icon.png`

-In case the source image is not in vector format, you can attempt to convert a raster image using tools like [this](https://www.aconvert.com/image/png-to-svg/).
+## Changing the default avatar
+
+Either generate it via above method or place the png image at the following path:
+
+- `$GITEA_CUSTOM/public/img/avatar_default.png`

 ## Customizing Gitea pages and resources

@@ -83,14 +87,14 @@ directory at the top of this document).
 Every single page of Gitea can be changed. Dynamic content is generated using [go templates](https://golang.org/pkg/html/template/),
 which can be modified by placing replacements below the `$GITEA_CUSTOM/templates` directory.

-To obtain any embedded file (including templates), the [`gitea embedded` tool]({{< relref "doc/advanced/cmd-embedded.en-us.md" >}}) can be used. Alternatively, they can be found in the [`templates`](https://github.com/go-gitea/gitea/tree/main/templates) directory of Gitea source (Note: the example link is from the `main` branch. Make sure to use templates compatible with the release you are using).
+To obtain any embedded file (including templates), the [`gitea embedded` tool]({{< relref "doc/advanced/cmd-embedded.en-us.md" >}}) can be used. Alternatively, they can be found in the [`templates`](https://github.com/go-gitea/gitea/tree/master/templates) directory of Gitea source (Note: the example link is from the `master` branch. Make sure to use templates compatible with the release you are using).

 Be aware that any statement contained inside `{{` and `}}` are Gitea's template syntax and
 shouldn't be touched without fully understanding these components.

 ### Customizing startpage / homepage

-Copy [`home.tmpl`](https://github.com/go-gitea/gitea/blob/main/templates/home.tmpl) for your version of Gitea from `templates` to `$GITEA_CUSTOM/templates`.
+Copy [`home.tmpl`](https://github.com/go-gitea/gitea/blob/master/templates/home.tmpl) for your version of Gitea from `templates` to `$GITEA_CUSTOM/templates`.
 Edit as you wish.
 Dont forget to restart your gitea to apply the changes.

@@ -109,7 +113,7 @@ For more information, see [Adding Legal Pages](https://docs.gitea.io/en-us/addin
 You can add new tabs in the same way, putting them in `extra_tabs.tmpl`.
 The exact HTML needed to match the style of other tabs is in the file
 `templates/repo/header.tmpl`
-([source in GitHub](https://github.com/go-gitea/gitea/blob/main/templates/repo/header.tmpl))
+([source in GitHub](https://github.com/go-gitea/gitea/blob/master/templates/repo/header.tmpl))

 ### Other additions to the page

@@ -138,7 +142,7 @@ copy javascript files from https://gitea.com/davidsvantesson/plantuml-code-highl
 <script src="https://your-server.com/plantuml_codeblock_parse.js"></script>
 <script>
  <!-- Replace call with address to your plantuml server-->
-  parsePlantumlCodeBlocks("http://www.plantuml.com/plantuml");
+  parsePlantumlCodeBlocks("http://www.plantuml..com/plantuml");
 </script>
 {{end}}
 ```
@@ -254,7 +258,7 @@ Then restart gitea and open a STL file on your gitea instance.

 The `$GITEA_CUSTOM/templates/mail` folder allows changing the body of every mail of Gitea.
 Templates to override can be found in the
-[`templates/mail`](https://github.com/go-gitea/gitea/tree/main/templates/mail)
+[`templates/mail`](https://github.com/go-gitea/gitea/tree/master/templates/mail)
 directory of Gitea source.
 Override by making a copy of the file under `$GITEA_CUSTOM/templates/mail` using a
 full path structure matching source.
@@ -278,7 +282,7 @@ To add custom .gitignore, add a file with existing [.gitignore rules](https://gi

 ### Labels

-To add a custom label set, add a file that follows the [label format](https://github.com/go-gitea/gitea/blob/main/options/label/Default) to `$GITEA_CUSTOM/options/label`
+To add a custom label set, add a file that follows the [label format](https://github.com/go-gitea/gitea/blob/master/options/label/Default) to `$GITEA_CUSTOM/options/label`
 `#hex-color label name ; label description`

 ### Licenses
@@ -289,7 +293,7 @@ To add a custom license, add a file with the license text to `$GITEA_CUSTOM/opti

 Locales are managed via our [crowdin](https://crowdin.com/project/gitea).
 You can override a locale by placing an altered locale file in `$GITEA_CUSTOM/options/locale`.
-Gitea's default locale files can be found in the [`options/locale`](https://github.com/go-gitea/gitea/tree/main/options/locale) source folder and these should be used as examples for your changes.
+Gitea's default locale files can be found in the [`options/locale`](https://github.com/go-gitea/gitea/tree/master/options/locale) source folder and these should be used as examples for your changes.

 To add a completely new locale, as well as placing the file in the above location, you will need to add the new lang and name to the `[i18n]` section in your `app.ini`. Keep in mind that Gitea will use those settings as **overrides**, so if you want to keep the other languages as well you will need to copy/paste the default values and add your own to them.

--- a/docs/content/doc/advanced/customizing-gitea.zh-cn.md
+++ b/docs/content/doc/advanced/customizing-gitea.zh-cn.md
@@ -40,7 +40,7 @@ Gitea 引用 `custom` 目录中的自定义配置文件来覆盖配置、模板

 将自定义的公共文件（比如页面和图片）作为 webroot 放在 `custom/public/` 中来让 Gitea 提供这些自定义内容（符号链接将被追踪）。

-举例说明：`image.png` 存放在 `custom/public/`中，那么它可以通过链接 http://gitea.domain.tld/assets/image.png 访问。
+举例说明：`image.png` 存放在 `custom/public/`中，那么它可以通过链接 http://gitea.domain.tld/image.png 访问。

 ## 修改默认头像

--- a/docs/content/doc/advanced/external-renderers.en-us.md
+++ b/docs/content/doc/advanced/external-renderers.en-us.md
@@ -64,13 +64,13 @@ IS_INPUT_FILE = false
 [markup.jupyter]
 ENABLED = true
 FILE_EXTENSIONS = .ipynb
-RENDER_COMMAND = "jupyter nbconvert --stdin --stdout --to html --template basic"
-IS_INPUT_FILE = false
+RENDER_COMMAND = "jupyter nbconvert --stdout --to html --template basic "
+IS_INPUT_FILE = true

 [markup.restructuredtext]
 ENABLED = true
 FILE_EXTENSIONS = .rst
-RENDER_COMMAND = "timeout 30s pandoc +RTS -M512M -RTS -f rst"
+RENDER_COMMAND = rst2html.py
 IS_INPUT_FILE = false
 ```

@@ -90,79 +90,11 @@ FILE_EXTENSIONS = .md,.markdown
 RENDER_COMMAND  = pandoc -f markdown -t html --katex
 ```

-You must define `ELEMENT` and `ALLOW_ATTR` in each section.
+You must define `ELEMENT`, `ALLOW_ATTR`, and `REGEXP` in each section.

 To define multiple entries, add a unique alphanumeric suffix (e.g., `[markup.sanitizer.1]` and `[markup.sanitizer.something]`).

-To apply a sanitisation rules only for a specify external renderer they must use the renderer name, e.g. `[markup.sanitizer.asciidoc.rule-1]`, `[markup.sanitizer.<renderer>.rule-1]`.
-
-**Note**: If the rule is defined above the renderer ini section or the name does not match a renderer it is applied to every renderer.
-
 Once your configuration changes have been made, restart Gitea to have changes take effect.

 **Note**: Prior to Gitea 1.12 there was a single `markup.sanitiser` section with keys that were redefined for multiple rules, however,
 there were significant problems with this method of configuration necessitating configuration through multiple sections.
-
-### Example: Office DOCX
-
-Display Office DOCX files with [`pandoc`](https://pandoc.org/):
-```ini
-[markup.docx]
-ENABLED = true
-FILE_EXTENSIONS = .docx
-RENDER_COMMAND = "pandoc --from docx --to html --self-contained --template /path/to/basic.html"
-
-[markup.sanitizer.docx.img]
-ALLOW_DATA_URI_IMAGES = true
-```
-
-The template file has the following content:
-```
-$body$
-```
-
-### Example: Jupyter Notebook
-
-Display Jupyter Notebook files with [`nbconvert`](https://github.com/jupyter/nbconvert):
-```ini
-[markup.jupyter]
-ENABLED = true
-FILE_EXTENSIONS = .ipynb
-RENDER_COMMAND = "jupyter-nbconvert --stdin --stdout --to html --template basic"
-
-[markup.sanitizer.jupyter.img]
-ALLOW_DATA_URI_IMAGES = true
-```
-
-## Customizing CSS
-The external renderer is specified in the .ini in the format `[markup.XXXXX]` and the HTML supplied by your external renderer will be wrapped in a `<div>` with classes `markup` and `XXXXX`. The `markup` class provides out of the box styling (as does `markdown` if `XXXXX` is `markdown`). Otherwise you can use these classes to specifically target the contents of your rendered HTML. 
-
-And so you could write some CSS:
-```css
-.markup.XXXXX html {
-  font-size: 100%;
-  overflow-y: scroll;
-  -webkit-text-size-adjust: 100%;
-  -ms-text-size-adjust: 100%;
-}
-
-.markup.XXXXX body {
-  color: #444;
-  font-family: Georgia, Palatino, 'Palatino Linotype', Times, 'Times New Roman', serif;
-  font-size: 12px;
-  line-height: 1.7;
-  padding: 1em;
-  margin: auto;
-  max-width: 42em;
-  background: #fefefe;
-}
-
-.markup.XXXXX p {
-  color: orangered;
-}
-```
-
-Add your stylesheet to your custom directory e.g `custom/public/css/my-style-XXXXX.css` and import it using a custom header file `custom/templates/custom/header.tmpl`:
-```html
-<link type="text/css" href="{{AppSubUrl}}/css/my-style-XXXXX.css" />
-```
--- a/docs/content/doc/advanced/logging-documentation.en-us.md
+++ b/docs/content/doc/advanced/logging-documentation.en-us.md
@@ -282,7 +282,7 @@ ROUTER = console
 COLORIZE = false ; this can be true if you can strip out the ansi coloring
 ```

-Sometimes it will be helpful get some specific `TRACE` level logging restricted
+Sometimes it will be helpful get some specific `TRACE` level logging retricted
 to messages that match a specific `EXPRESSION`. Adjusting the `MODE` in the
 `[log]` section to `MODE = console,traceconsole` to add a new logger output
 `traceconsole` and then adding its corresponding section would be helpful:
@@ -437,8 +437,7 @@ Gitea includes built-in log rotation, which should be enough for most deployment

 - Disable built-in log rotation by setting `LOG_ROTATE` to `false` in your `app.ini`.
 - Install `logrotate`.
- Configure `logrotate` to match your deployment requirements, see `man 8 logrotate` for configuration syntax details. In the `postrotate/endscript` block send Gitea a `USR1` signal via `kill -USR1` or `kill -10` to the `gitea` process itself, or run `gitea manager logging release-and-reopen` (with the appropriate environment). Ensure that your configurations apply to all files emitted by Gitea loggers as described in the above sections.
+- Configure `logrotate` to match your deployment requirements, see `man 8 logrotate` for configuration syntax details. In the `postrotate/endscript` block send Gitea a `USR1` signal via `kill -USR1` or `kill -10`, or run `gitea manager logging release-and-reopen` (with the appropriate environment). Ensure that your configurations apply to all files emitted by Gitea loggers as described in the above sections.
 - Always do `logrotate /etc/logrotate.conf --debug` to test your configurations.
- If you are using docker and are running from outside of the container you can use `docker exec -u $OS_USER $CONTAINER_NAME sh -c 'gitea manager logging release-and-reopen'` or `docker exec $CONTAINER_NAME sh -c '/bin/s6-svc -1 /etc/s6/gitea/'` or send `USR1` directly to the gitea process itself.

 The next `logrotate` jobs will include your configurations, so no restart is needed. You can also immediately reload `logrotate` with `logrotate /etc/logrotate.conf --force`.
--- a/docs/content/doc/advanced/mail-templates-us.md
+++ b/docs/content/doc/advanced/mail-templates-us.md
@@ -130,7 +130,7 @@ did not include a subject part), Gitea's **internal default** will be used.
 The internal default (fallback) subject is the equivalent of:

 ```sh
-{{.SubjectPrefix}}[{{.Repo}}] {{.Issue.Title}} (#{{.Issue.Index}})
+{{.SubjectPrefix}}[{{.Repo}}] {{.Issue.Title}} (#.Issue.Index)
 ```

 For example: `Re: [mike/stuff] New color palette (#38)`
--- a/docs/content/doc/advanced/protected-tags.en-us.md
+++ b/docs/content/doc/advanced/protected-tags.en-us.md
@@ -1,57 +0,0 @@
---
-date: "2021-05-14T00:00:00-00:00"
-title: "Protected tags"
-slug: "protected-tags"
-weight: 45
-toc: false
-draft: false
-menu:
-  sidebar:
-    parent: "advanced"
-    name: "Protected tags"
-    weight: 45
-    identifier: "protected-tags"
---
-
-# Protected tags
-
-Protected tags allow control over who has permission to create or update git tags. Each rule allows you to match either an individual tag name, or use an appropriate pattern to control multiple tags at once. 
-
-**Table of Contents**
-
-{{< toc >}}
-
-## Setting up protected tags
-
-To protect a tag, you need to follow these steps:
-
-1. Go to the repository’s **Settings** > **Tags** page.
-1. Type a pattern to match a name. You can use a single name, a [glob pattern](https://pkg.go.dev/github.com/gobwas/glob#Compile) or a regular expression.
-1. Choose the allowed users and/or teams. If you leave these fields empty no one is allowed to create or modify this tag.
-1. Select **Save** to save the configuration.
-
-## Pattern protected tags
-
-The pattern uses [glob](https://pkg.go.dev/github.com/gobwas/glob#Compile) or regular expressions to match a tag name. For regular expressions you need to enclose the pattern in slashes.
-
-Examples:
-
-| Type  | Pattern Protected Tag    | Possible Matching Tags                  |
-| ----- | ------------------------ | --------------------------------------- |
-| Glob  | `v*`                     | `v`, `v-1`, `version2`                  |
-| Glob  | `v[0-9]`                 | `v0`, `v1` up to `v9`                   |
-| Glob  | `*-release`              | `2.1-release`, `final-release`          |
-| Glob  | `gitea`                  | only `gitea`                            |
-| Glob  | `*gitea*`                | `gitea`, `2.1-gitea`, `1_gitea-release` |
-| Glob  | `{v,rel}-*`              | `v-`, `v-1`, `v-final`, `rel-`, `rel-x` |
-| Glob  | `*`                      | matches all possible tag names          |
-| Regex | `/\Av/`                  | `v`, `v-1`, `version2`                  |
-| Regex | `/\Av[0-9]\z/`           | `v0`, `v1` up to `v9`                   |
-| Regex | `/\Av\d+\.\d+\.\d+\z/`   | `v1.0.17`, `v2.1.0`                     |
-| Regex | `/\Av\d+(\.\d+){0,2}\z/` | `v1`, `v2.1`, `v1.2.34`                 |
-| Regex | `/-release\z/`           | `2.1-release`, `final-release`          |
-| Regex | `/gitea/`                | `gitea`, `2.1-gitea`, `1_gitea-release` |
-| Regex | `/\Agitea\z/`            | only `gitea`                            |
-| Regex | `/^gitea$/`              | only `gitea`                            |
-| Regex | `/\A(v\|rel)-/`          | `v-`, `v-1`, `v-final`, `rel-`, `rel-x` |
-| Regex | `/.+/`                   | matches all possible tag names          |
--- a/docs/content/doc/advanced/repo-mirror.en-us.md
+++ b/docs/content/doc/advanced/repo-mirror.en-us.md
@@ -1,88 +0,0 @@
---
-date: "2021-05-13T00:00:00-00:00"
-title: "Repository Mirror"
-slug: "repo-mirror"
-weight: 45
-toc: false
-draft: false
-menu:
-  sidebar:
-    parent: "advanced"
-    name: "Repository Mirror"
-    weight: 45
-    identifier: "repo-mirror"
---
-
-# Repository Mirror
-
-Repository mirroring allows for the mirroring of repositories to and from external sources. You can use it to mirror branches, tags, and commits between repositories.
-
-**Table of Contents**
-
-{{< toc >}}
-
-## Use cases
-
-The following are some possible use cases for repository mirroring:
-
- You migrated to Gitea but still need to keep your project in another source. In that case, you can simply set it up to mirror to Gitea (pull) and all the essential history of commits, tags, and branches are available in your Gitea instance.
- You have old projects in another source that you don’t use actively anymore, but don’t want to remove for archiving purposes. In that case, you can create a push mirror so that your active Gitea repository can push its changes to the old location.
-
-## Pulling from a remote repository
-
-For an existing remote repository, you can set up pull mirroring as follows:
-
-1. Select **New Migration** in the **Create...** menu on the top right.
-2. Select the remote repository service.
-3. Enter a repository URL.
-4. If the repository needs authentication fill in your authentication information.
-5. Check the box **This repository will be a mirror**.
-5. Select **Migrate repository** to save the configuration.
-
-The repository now gets mirrored periodically from the remote repository. You can force a sync by selecting **Synchronize Now** in the repository settings.
-
-## Pushing to a remote repository
-
-For an existing repository, you can set up push mirroring as follows:
-
-1. In your repository, go to **Settings** > **Repository**, and then the **Mirror Settings** section.
-2. Enter a repository URL.
-3. If the repository needs authentication expand the **Authorization** section and fill in your authentication information.
-4. Select **Add Push Mirror** to save the configuration.
-
-The repository now gets mirrored periodically to the remote repository. You can force a sync by selecting **Synchronize Now**. In case of an error a message displayed to help you resolve it.
-
-:exclamation::exclamation: **NOTE:** This will force push to the remote repository. This will overwrite any changes in the remote repository! :exclamation::exclamation:
-
-### Setting up a push mirror from Gitea to GitHub
-
-To set up a mirror from Gitea to GitHub, you need to follow these steps:
-
-1. Create a [GitHub personal access token](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token) with the *public_repo* box checked.
-2. Fill in the **Git Remote Repository URL**: `https://github.com/<your_github_group>/<your_github_project>.git`.
-3. Fill in the **Authorization** fields with your GitHub username and the personal access token.
-4. Select **Add Push Mirror** to save the configuration.
-
-The repository pushes shortly thereafter. To force a push, select the **Synchronize Now** button.
-
-### Setting up a push mirror from Gitea to GitLab
-
-To set up a mirror from Gitea to GitLab, you need to follow these steps:
-
-1. Create a [GitLab personal access token](https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html) with *write_repository* scope.
-2. Fill in the **Git Remote Repository URL**: `https://<destination host>/<your_gitlab_group_or_name>/<your_gitlab_project>.git`.
-3. Fill in the **Authorization** fields with `oauth2` as **Username** and your GitLab personal access token as **Password**.
-4. Select **Add Push Mirror** to save the configuration.
-
-The repository pushes shortly thereafter. To force a push, select the **Synchronize Now** button.
-
-### Setting up a push mirror from Gitea to Bitbucket
-
-To set up a mirror from Gitea to Bitbucket, you need to follow these steps:
-
-1. Create a [Bitbucket app password](https://support.atlassian.com/bitbucket-cloud/docs/app-passwords/) with the *Repository Write* box checked.
-2. Fill in the **Git Remote Repository URL**: `https://bitbucket.org/<your_bitbucket_group_or_name>/<your_bitbucket_project>.git`.
-3. Fill in the **Authorization** fields with your Bitbucket username and the app password as **Password**.
-4. Select **Add Push Mirror** to save the configuration.
-
-The repository pushes shortly thereafter. To force a push, select the **Synchronize Now** button.
--- a/docs/content/doc/advanced/signing.en-us.md
+++ b/docs/content/doc/advanced/signing.en-us.md
@@ -109,7 +109,7 @@ when creating a repository. The possible values are:
 - `always`: Always sign

 Options other than `never` and `always` can be combined as a comma
-separated list. The commit will be signed if all selected options are true.
+separated list.

 ### `WIKI`

@@ -123,7 +123,7 @@ The possible values are:
 - `always`: Always sign

 Options other than `never` and `always` can be combined as a comma
-separated list. The commit will be signed if all selected options are true.
+separated list.

 ### `CRUD_ACTIONS`

@@ -137,7 +137,7 @@ editor or API CRUD actions. The possible values are:
 - `always`: Always sign

 Options other than `never` and `always` can be combined as a comma
-separated list. The change will be signed if all selected options are true.
+separated list.

 ### `MERGES`

@@ -154,7 +154,7 @@ The possible options are:
 - `always`: Always sign

 Options other than `never` and `always` can be combined as a comma
-separated list. The merge will be signed if all selected options are true.
+separated list.

 ## Obtaining the Public Key of the Signing Key

--- a/docs/content/doc/developers/api-usage.en-us.md
+++ b/docs/content/doc/developers/api-usage.en-us.md
@@ -40,42 +40,8 @@ better understand this by looking at the code -- as of this writing,
 Gitea parses queries and headers to find the token in
 [modules/auth/auth.go](https://github.com/go-gitea/gitea/blob/6efdcaed86565c91a3dc77631372a9cc45a58e89/modules/auth/auth.go#L47).

-## Generating and listing API tokens
-
-A new token can be generated with a `POST` request to
-`/users/:name/tokens`.
-
-Note that `/users/:name/tokens` is a special endpoint and requires you
-to authenticate using `BasicAuth` and a password, as follows:
-
-
-```sh
-$ curl -XPOST -H "Content-Type: application/json"  -k -d '{"name":"test"}' -u username:password https://gitea.your.host/api/v1/users/<username>/tokens
-{"id":1,"name":"test","sha1":"9fcb1158165773dd010fca5f0cf7174316c3e37d","token_last_eight":"16c3e37d"}
-```
-
-The ``sha1`` (the token) is only returned once and is not stored in
-plain-text.  It will not be displayed when listing tokens with a `GET`
-request; e.g.
-
-```sh
-$ curl --request GET --url https://yourusername:password@gitea.your.host/api/v1/users/<username>/tokens
-[{"name":"test","sha1":"","token_last_eight:"........":},{"name":"dev","sha1":"","token_last_eight":"........"}]
-```
-
-To use the API with basic authentication with two factor authentication
-enabled, you'll need to send an additional header that contains the one
-time password (6 digitrotating token).
-An example of the header is `X-Gitea-OTP: 123456` where `123456`
-is where you'd place the code from your authenticator.
-Here is how the request would look like in curl:
-
-```sh
-$ curl -H "X-Gitea-OTP: 123456" --request GET --url https://yourusername:yourpassword@gitea.your.host/api/v1/users/yourusername/tokens
-```
-
-You can also create an API key token via your Gitea installation's web
-interface: `Settings | Applications | Generate New Token`.
+You can create an API key token via your Gitea installation's web interface:
+`Settings | Applications | Generate New Token`.

 ## OAuth2 Provider

@@ -113,8 +79,25 @@ API Reference guide is auto-generated by swagger and available on:
 or on
 [gitea demo instance](https://try.gitea.io/api/swagger)

-The OpenAPI document is at:
-`https://gitea.your.host/swagger.v1.json`
+## Listing your issued tokens via the API
+
+As mentioned in
+[#3842](https://github.com/go-gitea/gitea/issues/3842#issuecomment-397743346),
+`/users/:name/tokens` is special and requires you to authenticate
+using BasicAuth, as follows:
+
+### Using basic authentication:
+
+```sh
+$ curl --request GET --url https://yourusername:yourpassword@gitea.your.host/api/v1/users/yourusername/tokens
+[{"name":"test","sha1":"..."},{"name":"dev","sha1":"..."}]
+```
+
+As of v1.8.0 of Gitea, if using basic authentication with the API and your user has two factor authentication enabled, you'll need to send an additional header that contains the one time password (6 digit rotating token). An example of the header is `X-Gitea-OTP: 123456` where `123456` is where you'd place the code from your authenticator. Here is how the request would look like in curl:
+
+```sh
+$ curl -H "X-Gitea-OTP: 123456" --request GET --url https://yourusername:yourpassword@gitea.your.host/api/v1/users/yourusername/tokens
+```

 ## Sudo

--- a/docs/content/doc/developers/hacking-on-gitea.en-us.md
+++ b/docs/content/doc/developers/hacking-on-gitea.en-us.md
@@ -73,8 +73,6 @@ One of these three distributions of Make will run on Windows:
  - The binary is called `mingw32-make.exe` instead of `make.exe`. Add the `bin` folder to `PATH`.
 - [Chocolatey package](https://chocolatey.org/packages/make). Run `choco install make`

-**Note**: If you are attempting to build using make with Windows Command Prompt, you may run into issues. The above prompts (git bash, or mingw) are recommended, however if you only have command prompt (or potentially powershell) you can set environment variables using the [set](https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/set_1) command, e.g. `set TAGS=bindata`.
-
 ## Downloading and cloning the Gitea source code

 The recommended method of obtaining the source code is by using `git clone`.
@@ -88,7 +86,7 @@ from within the `$GOPATH`, hence the `go get` approach is no longer recommended.

 ## Forking Gitea

-Download the main Gitea source code as above. Then, fork the
+Download the master Gitea source code as above. Then, fork the
 [Gitea repository](https://github.com/go-gitea/gitea) on GitHub,
 and either switch the git remote origin for your fork or add your fork as another remote:

@@ -125,11 +123,11 @@ TAGS="bindata sqlite sqlite_unlock_notify" make build

 The `build` target will execute both `frontend` and `backend` sub-targets. If the `bindata` tag is present, the frontend files will be compiled into the binary. It is recommended to leave out the tag when doing frontend development so that changes will be reflected.

-See `make help` for all available `make` targets. Also see [`.drone.yml`](https://github.com/go-gitea/gitea/blob/main/.drone.yml) to see how our continuous integration works.
+See `make help` for all available `make` targets. Also see [`.drone.yml`](https://github.com/go-gitea/gitea/blob/master/.drone.yml) to see how our continuous integration works.

 ## Building continuously

-To run and continuously rebuild when source files change:
+To run and continously rebuild when source files change:

 ```bash
 make watch
@@ -218,7 +216,7 @@ You should validate your generated Swagger file and spell-check it with:
 make swagger-validate misspell-check
 ```

-You should commit the changed swagger JSON file. The continuous integration
+You should commit the changed swagger JSON file. The continous integration
 server will check that this has been done using:

 ```bash
@@ -278,7 +276,7 @@ require `git lfs` to be installed. Other database tests are available but
 may need adjustment to the local environment.

 Look at
-[`integrations/README.md`](https://github.com/go-gitea/gitea/blob/main/integrations/README.md)
+[`integrations/README.md`](https://github.com/go-gitea/gitea/blob/master/integrations/README.md)
 for more information and how to run a single test.

 Our continuous integration will test the code passes its unit tests and that
@@ -306,19 +304,19 @@ be cleaned up.

 A `launch.json` and `tasks.json` are provided within `contrib/ide/vscode` for
 Visual Studio Code. Look at
-[`contrib/ide/README.md`](https://github.com/go-gitea/gitea/blob/main/contrib/ide/README.md)
+[`contrib/ide/README.md`](https://github.com/go-gitea/gitea/blob/master/contrib/ide/README.md)
 for more information.

 ## Submitting PRs

 Once you're happy with your changes, push them up and open a pull request. It
 is recommended that you allow Gitea Managers and Owners to modify your PR
-branches as we will need to update it to main before merging and/or may be
+branches as we will need to update it to master before merging and/or may be
 able to help fix issues directly.

 Any PR requires two approvals from the Gitea maintainers and needs to pass the
-continuous integration. Take a look at our
-[`CONTRIBUTING.md`](https://github.com/go-gitea/gitea/blob/main/CONTRIBUTING.md)
+continous integration. Take a look at our
+[`CONTRIBUTING.md`](https://github.com/go-gitea/gitea/blob/master/CONTRIBUTING.md)
 document.

 If you need more help pop on to [Discord](https://discord.gg/gitea) #Develop
--- a/docs/content/doc/developers/integrations.en-us.md
+++ b/docs/content/doc/developers/integrations.en-us.md
@@ -20,7 +20,7 @@ projects.

 We are curating a list over at [awesome-gitea](https://gitea.com/gitea/awesome-gitea) to track these!

-If you are looking for [CI/CD](https://gitea.com/gitea/awesome-gitea#user-content-devops),
-an [SDK](https://gitea.com/gitea/awesome-gitea#user-content-sdk),
-or even some extra [themes](https://gitea.com/gitea/awesome-gitea#user-content-themes),
+If you are looking for [CI/CD](https://gitea.com/gitea/awesome-gitea#devops),
+an [SDK](https://gitea.com/gitea/awesome-gitea#sdk),
+or even some extra [themes](https://gitea.com/gitea/awesome-gitea#themes),
 you can find them listed in the [awesome-gitea](https://gitea.com/gitea/awesome-gitea) repository!
--- a/docs/content/doc/developers/integrations.zh-tw.md
+++ b/docs/content/doc/developers/integrations.zh-tw.md
@@ -19,4 +19,4 @@ Gitea 有著很棒的第三方整合社群， 以及其它有著一流支援的

 我們持續的整理一份清單以追蹤他們！請到 [awesome-gitea](https://gitea.com/gitea/awesome-gitea) 查看。

-如果您正在找尋有關 [CI/CD](https://gitea.com/gitea/awesome-gitea#user-content-devops)、[SDK](https://gitea.com/gitea/awesome-gitea#user-content-sdk) 或是其它佈景主題，您可以在存儲庫 [awesome-gitea](https://gitea.com/gitea/awesome-gitea) 找到他們。
+如果您正在找尋有關 [CI/CD](https://gitea.com/gitea/awesome-gitea#devops)、[SDK](https://gitea.com/gitea/awesome-gitea#sdk) 或是其它佈景主題，您可以在存儲庫 [awesome-gitea](https://gitea.com/gitea/awesome-gitea) 找到他們。
--- a/docs/content/doc/developers/migrations.en-us.md
+++ b/docs/content/doc/developers/migrations.en-us.md
@@ -20,7 +20,7 @@ repository data from other git host platforms to Gitea or, in the future, migrat
 git host platforms.  
 Currently, migrations from Github, Gitlab, and other Gitea instances are implemented.

-First of all, Gitea defines some standard objects in packages [modules/migrations/base](https://github.com/go-gitea/gitea/tree/main/modules/migrations/base).  
+First of all, Gitea defines some standard objects in packages [modules/migrations/base](https://github.com/go-gitea/gitea/tree/master/modules/migrations/base).  
 They are `Repository`, `Milestone`, `Release`, `ReleaseAsset`, `Label`, `Issue`, `Comment`, `PullRequest`, `Reaction`, `Review`, `ReviewComment`.

 ## Downloader Interfaces
@@ -31,11 +31,11 @@ To migrate from a new git host platform, there are two steps to be updated.
 - You should implement a `DownloaderFactory` which will be used to detect if the URL matches and create the above `Downloader`.
   - You'll need to register the `DownloaderFactory` via `RegisterDownloaderFactory` on `init()`.

-You can find these interfaces in [downloader.go](https://github.com/go-gitea/gitea/blob/main/modules/migrations/base/downloader.go).
+You can find these interfaces in [downloader.go](https://github.com/go-gitea/gitea/blob/master/modules/migrations/base/downloader.go).

 ## Uploader Interface

 Currently, only a `GiteaLocalUploader` is implemented, so we only save downloaded
 data via this `Uploader` to the local Gitea instance. Other uploaders are not supported at this time.

-You can find these interfaces in [uploader.go](https://github.com/go-gitea/gitea/blob/main/modules/migrations/base/uploader.go).
+You can find these interfaces in [uploader.go](https://github.com/go-gitea/gitea/blob/master/modules/migrations/base/uploader.go).
--- a/docs/content/doc/developers/oauth2-provider.md
+++ b/docs/content/doc/developers/oauth2-provider.md
@@ -24,12 +24,9 @@ Gitea supports acting as an OAuth2 provider to allow third party applications to
 ## Endpoints

 | Endpoint               | URL                         |
-| ------------------------ | ----------------------------------- |
-| OpenID Connect Discovery | `/.well-known/openid-configuration` |
+| ---------------------- | --------------------------- |
 | Authorization Endpoint | `/login/oauth/authorize`    |
 | Access Token Endpoint  | `/login/oauth/access_token` |
-| OpenID Connect UserInfo  | `/login/oauth/userinfo`             |
-| JSON Web Key Set         | `/login/oauth/keys`                 |

 ## Supported OAuth2 Grants

--- a/docs/content/doc/features/authentication.en-us.md
+++ b/docs/content/doc/features/authentication.en-us.md
@@ -88,8 +88,8 @@ Adds the following fields:
 - Bind Password (optional)

  - The password for the Bind DN specified above, if any. _Note: The password
-    is stored encrypted with the SECRET_KEY on the server. It is still recommended
-    to ensure that the Bind DN has as few privileges as possible._
+    is stored in plaintext at the server. As such, ensure that the Bind DN
+    has as few privileges as possible._

 - User Search Base **(required)**

@@ -259,7 +259,7 @@ Before activating SSPI single sign-on authentication (SSO) you have to prepare y

 - Create a service principal name for the host where `gitea.exe` is running with class `HTTP`:

-  - Start `Command Prompt` or `PowerShell` as a privileged domain user (eg. Domain Administrator)
+  - Start `Command Prompt` or `PowerShell` as a priviledged domain user (eg. Domain Administrator)
  - Run the command below, replacing `host.domain.local` with the fully qualified domain name (FQDN) of the server where the web application will be running, and `domain\user` with the name of the account created in the previous step:

  ```sh
@@ -283,7 +283,7 @@ Before activating SSPI single sign-on authentication (SSO) you have to prepare y
 - Click the `Sign In` button on the dashboard and choose SSPI to be automatically logged in with the same user that is currently logged on to the computer

 - If it does not work, make sure that:
-  - You are not running the web browser on the same server where gitea is running. You should be running the web browser on a domain joined computer (client) that is different from the server. If both the client and server are running on the same computer NTLM will be preferred over Kerberos.
+  - You are not running the web browser on the same server where gitea is running. You should be running the web browser on a domain joined computer (client) that is different from the server. If both the client and server are runnning on the same computer NTLM will be prefered over Kerberos.
  - There is only one `HTTP/...` SPN for the host
  - The SPN contains only the hostname, without the port
  - You have added the URL of the web app to the `Local intranet zone`
--- a/docs/content/doc/help/faq.en-us.md
+++ b/docs/content/doc/help/faq.en-us.md
@@ -85,12 +85,6 @@ If certain clone options aren't showing up (HTTP/S or SSH), the following option
 `DISABLE_SSH`: if set to true, there will be no SSH link  
 `SSH_EXPOSE_ANONYMOUS`: if set to false, SSH links will be hidden for anonymous users

-## File upload fails with: 413 Request Entity Too Large
-
-This error occurs when the reverse proxy limits the file upload size.
-
-See the [reverse proxy guide]({{< relref "doc/usage/reverse-proxies.en-us.md" >}}) for a solution with nginx.
-
 ## Custom Templates not loading or working incorrectly

 Gitea's custom templates must be added to the correct location or Gitea will not find and use them.  
@@ -148,7 +142,7 @@ The current way to achieve this is to create/modify a user with a max repo creat

 Restricted users are limited to a subset of the content based on their organization/team memberships and collaborations, ignoring the public flag on organizations/repos etc.\_\_

-Example use case: A company runs a Gitea instance that requires login. Most repos are public (accessible/browsable by all co-workers).
+Example use case: A company runs a Gitea instance that requires login. Most repos are public (accessible/browseable by all co-workers).

 At some point, a customer or third party needs access to a specific repo and only that repo. Making such a customer account restricted and granting any needed access using team membership(s) and/or collaboration(s) is a simple way to achieve that without the need to make everything private.

@@ -331,12 +325,6 @@ is too small. Gitea requires that the `ROWFORMAT` for its tables is `DYNAMIC`.
 If you are receiving an error line containing `Error 1071: Specified key was too long; max key length is 1000 bytes...`
 then you are attempting to run Gitea on tables which use the ISAM engine. While this may have worked by chance in previous versions of Gitea, it has never been officially supported and
 you must use InnoDB. You should run `ALTER TABLE table_name ENGINE=InnoDB;` for each table in the database.
-If you are using MySQL 5, another possible fix is
-```mysql
-SET GLOBAL innodb_file_format=Barracuda;
-SET GLOBAL innodb_file_per_table=1;
-SET GLOBAL innodb_large_prefix=1;
-```

 ## Why Are Emoji Broken On MySQL

--- a/docs/content/doc/help/seek-help.en-us.md
+++ b/docs/content/doc/help/seek-help.en-us.md
@@ -33,4 +33,4 @@ If you found a bug, please create an [issue on GitHub](https://github.com/go-git

 ## Chinese Support

-Support for the Chinese language is provided at [Our discourse](https://discourse.gitea.io/c/5-category/5).
+Support for the Chinese language is provided at [gocn.vip](https://gocn.vip/topic/gitea).
--- a/docs/content/doc/help/seek-help.zh-cn.md
+++ b/docs/content/doc/help/seek-help.zh-cn.md
@@ -18,6 +18,6 @@ menu:
 如果您在使用或者开发过程中遇到问题，请到以下渠道咨询：

 - 到[Github issue](https://github.com/go-gitea/gitea/issues)提问(因为项目维护人员来自世界各地，为保证沟通顺畅，请使用英文提问)
- 中文问题到 [Gitea 论坛](https://discourse.gitea.io/c/5-category/5)提问
+- 中文问题到[gocn.vip](https://gocn.vip/topic/gitea)提问
 - 访问 [Discord server - 英文](https://discord.gg/Gitea)
 - 加入 QQ群 328432459 获得进一步的支持
--- a/docs/content/doc/installation/from-binary.en-us.md
+++ b/docs/content/doc/installation/from-binary.en-us.md
@@ -32,17 +32,13 @@ chmod +x gitea
 ```

 ## Verify GPG signature
-Gitea signs all binaries with a [GPG key](https://keys.openpgp.org/search?q=teabot%40gitea.io) to prevent against unwanted modification of binaries.
-To validate the binary, download the signature file which ends in `.asc` for the binary you downloaded and use the gpg command line tool.
+Gitea signs all binaries with a [GPG key](https://keys.openpgp.org/search?q=teabot%40gitea.io) to prevent against unwanted modification of binaries. To validate the binary, download the signature file which ends in `.asc` for the binary you downloaded and use the gpg command line tool.

 ```sh
 gpg --keyserver keys.openpgp.org --recv 7C9E68152594688862D62AF62D9AE806EC1592E2
 gpg --verify gitea-{{< version >}}-linux-amd64.asc gitea-{{< version >}}-linux-amd64
 ```

-Look for the text `Good signature from "Teabot <teabot@gitea.io>"` to assert a good binary,
-despite warnings like `This key is not certified with a trusted signature!`.
-
 ## Recommended server configuration

 **NOTE:** Many of the following directories can be configured using [Environment Variables]({{< relref "doc/advanced/environment-variables.en-us.md" >}}) as well!
@@ -83,7 +79,7 @@ chmod 770 /etc/gitea
 chmod 750 /etc/gitea
 chmod 640 /etc/gitea/app.ini
 ```
-If you don't want the web installer to be able to write the config file at all, it is also possible to make the config file read-only for the gitea user (owner/group `root:git`, mode `0640`), and set `INSTALL_LOCK = true`. In that case all database configuration details must be set beforehand in the config file, as well as the `SECRET_KEY` and `INTERNAL_TOKEN` values. See the [command line documentation]({{< relref "doc/usage/command-line.en-us.md" >}}) for information on using `gitea generate secret INTERNAL_TOKEN`.
+If you don't want the web installer to be able to write the config file at all, it is also possible to make the config file read-only for the gitea user (owner/group `root:root`, mode `0660`), and set `INSTALL_LOCK = true`. In that case all database configuration details must be set beforehand in the config file, as well as the `SECRET_KEY` and `INTERNAL_TOKEN` values. See the [command line documentation]({{< relref "doc/usage/command-line.en-us.md" >}}) for information on using `gitea generate secret INTERNAL_TOKEN`.

 ### Configure Gitea's working directory

--- a/docs/content/doc/installation/from-package.en-us.md
+++ b/docs/content/doc/installation/from-package.en-us.md
@@ -2,7 +2,7 @@
 date: "2016-12-01T16:00:00+02:00"
 title: "Installation from package"
 slug: "install-from-package"
-weight: 20
+weight: 10
 toc: false
 draft: false
 menu:
@@ -92,6 +92,18 @@ is in `/usr/local/etc/rc.d/gitea`.

 To enable Gitea to run as a service, run `sysrc gitea_enable=YES` and start it with `service gitea start`.

+## Cloudron
+
+Gitea is available as a 1-click install on [Cloudron](https://cloudron.io).
+Cloudron makes it easy to run apps like Gitea on your server and keep them up-to-date and secure.
+
+[![Install](/cloudron.svg)](https://cloudron.io/button.html?app=io.gitea.cloudronapp)
+
+The Gitea package is maintained [here](https://git.cloudron.io/cloudron/gitea-app).
+
+There is a [demo instance](https://my.demo.cloudron.io) (username: cloudron password: cloudron) where
+you can experiment with running Gitea.
+
 ## Third-party

 Various other third-party packages of Gitea exist.
--- a/docs/content/doc/installation/from-source.en-us.md
+++ b/docs/content/doc/installation/from-source.en-us.md
@@ -54,8 +54,8 @@ git clone https://github.com/go-gitea/gitea
 no longer necessary.)

 Decide which version of Gitea to build and install. Currently, there are
-multiple options to choose from. The `main` branch represents the current
-development version. To build with main, skip to the [build section](#build).
+multiple options to choose from. The `master` branch represents the current
+development version. To build with master, skip to the [build section](#build).

 To work with tagged releases, the following commands can be used:

@@ -89,7 +89,7 @@ To build from source, the following programs must be present on the system:
 - `node` {{< min-node-version >}} or higher with `npm`, see [here](https://nodejs.org/en/download/)
 - `make`, see <a href='{{< relref "doc/developers/hacking-on-gitea.en-us.md" >}}#installing-make'>here</a>

-Various [make tasks](https://github.com/go-gitea/gitea/blob/main/Makefile)
+Various [make tasks](https://github.com/go-gitea/gitea/blob/master/Makefile)
 are provided to keep the build process as simple as possible.

 Depending on requirements, the following build tags can be included.
--- a/docs/content/doc/installation/on-cloud-provider.md
+++ b/docs/content/doc/installation/on-cloud-provider.md
@@ -1,44 +0,0 @@
---
-date: "2016-12-01T16:00:00+02:00"
-title: "Install on Cloud Provider"
-slug: "install-on-cloud-provider"
-weight: 20
-toc: false
-draft: false
-menu:
-  sidebar:
-    parent: "installation"
-    name: "On cloud provider"
-    weight: 20
-    identifier: "install-on-cloud-provider"
---
-
-# Installation on Cloud Provider
-
-**Table of Contents**
-
-{{< toc >}}
-
-## Cloudron
-
-Gitea is available as a 1-click install on [Cloudron](https://cloudron.io).
-Cloudron makes it easy to run apps like Gitea on your server and keep them up-to-date and secure.
-
-[![Install](/cloudron.svg)](https://cloudron.io/button.html?app=io.gitea.cloudronapp)
-
-The Gitea package is maintained [here](https://git.cloudron.io/cloudron/gitea-app).
-
-There is a [demo instance](https://my.demo.cloudron.io) (username: cloudron password: cloudron) where
-you can experiment with running Gitea.
-
-## Vultr
-
-Gitea can found in [Vultr](https://www.vultr.com)'s marketplace.
-
-To deploy it have a look at https://www.vultr.com/marketplace/apps/gitea.
-
-## DigitalOcean
-
-[DigitalOcean](https://www.digitalocean.com) has gitea as droplet in his marketplace.
-
-Just create a new [Gitea Droplet](https://marketplace.digitalocean.com/apps/gitea).
--- a/docs/content/doc/installation/with-docker-rootless.en-us.md
+++ b/docs/content/doc/installation/with-docker-rootless.en-us.md
@@ -32,14 +32,15 @@ image as a service. Since there is no database available, one can be initialized
 Create a directory for `data` and `config` then paste the following content into a file named `docker-compose.yml`.
 Note that the volume should be owned by the user/group with the UID/GID specified in the config file. By default Gitea in docker will use uid:1000 gid:1000. If needed you can set ownership on those folders with the command: `sudo chown 1000:1000 config/ data/`
 If you don't give the volume correct permissions, the container may not start.
-For a stable release you could use `:latest-rootless`, `:1-rootless` or specify a certain release like `:{{< version >}}-rootless`, but if you'd like to use the latest development version then `:dev-rootless` would be an appropriate tag.
+Also be aware that the tag `:latest-rootless` will install the current development version.
+For a stable release you can use `:1-rootless` or specify a certain release like `:{{< version >}}-rootless`.

 ```yaml
 version: "2"

 services:
  server:
-    image: gitea/gitea:{{< version >}}-rootless
+    image: gitea/gitea:latest-rootless
    restart: always
    volumes:
      - ./data:/var/lib/gitea
@@ -62,7 +63,7 @@ version: "2"

 services:
  server:
-    image: gitea/gitea:{{< version >}}-rootless
+    image: gitea/gitea:latest-rootless
    restart: always
    volumes:
      - ./data:/var/lib/gitea
@@ -86,13 +87,13 @@ version: "2"

 services:
  server:
-    image: gitea/gitea:{{< version >}}-rootless
+    image: gitea/gitea:latest-rootless
 +    environment:
-+      - GITEA__database__DB_TYPE=mysql
-+      - GITEA__database__HOST=db:3306
-+      - GITEA__database__NAME=gitea
-+      - GITEA__database__USER=gitea
-+      - GITEA__database__PASSWD=gitea
+      - DB_TYPE=mysql
+      - DB_HOST=db:3306
+      - DB_NAME=gitea
+      - DB_USER=gitea
+      - DB_PASSWD=gitea
    restart: always
    volumes:
      - ./data:/var/lib/gitea
@@ -106,7 +107,7 @@ services:
 +      - db
 +
 +  db:
-+    image: mysql:8
+    image: mysql:5.7
 +    restart: always
 +    environment:
 +      - MYSQL_ROOT_PASSWORD=gitea
@@ -127,13 +128,13 @@ version: "2"

 services:
  server:
-    image: gitea/gitea:{{< version >}}-rootless
+    image: gitea/gitea:latest-rootless
    environment:
-+      - GITEA__database__DB_TYPE=postgres
-+      - GITEA__database__HOST=db:5432
-+      - GITEA__database__NAME=gitea
-+      - GITEA__database__USER=gitea
-+      - GITEA__database__PASSWD=gitea
+      - DB_TYPE=postgres
+      - DB_HOST=db:5432
+      - DB_NAME=gitea
+      - DB_USER=gitea
+      - DB_PASSWD=gitea
    restart: always
    volumes:
      - ./data:/var/lib/gitea
@@ -147,7 +148,7 @@ services:
 +      - db
 +
 +  db:
-+    image: postgres:13
+    image: postgres:9.6
 +    restart: always
 +    environment:
 +      - POSTGRES_USER=gitea
@@ -173,7 +174,7 @@ version: "2"
 +
 services:
  server:
-    image: gitea/gitea:{{< version >}}-rootless
+    image: gitea/gitea:latest-rootless
    restart: always
    volumes:
 -      - ./data:/var/lib/gitea
@@ -200,7 +201,7 @@ version: "2"

 services:
  server:
-    image: gitea/gitea:{{< version >}}-rootless
+    image: gitea/gitea:latest-rootless
    restart: always
 +    user: 1001
    volumes:
@@ -232,6 +233,31 @@ favorite browser to finalize the installation. Visit http://server-ip:3000 and f
 installation wizard. If the database was started with the `docker-compose` setup as
 documented above, please note that `db` must be used as the database hostname.

+## Environments variables
+
+You can configure some of Gitea's settings via environment variables:
+
+(Default values are provided in **bold**)
+
+* `APP_NAME`: **"Gitea: Git with a cup of tea"**: Application name, used in the page title.
+* `RUN_MODE`: **prod**: Application run mode, affects performance and debugging. Either "dev", "prod" or "test".
+* `SSH_DOMAIN`: **localhost**: Domain name of this server, used for the displayed clone URL in Gitea's UI.
+* `SSH_PORT`: **2222**: SSH port displayed in clone URL.
+* `SSH_LISTEN_PORT`: **%(SSH\_PORT)s**: Port for the built-in SSH server.
+* `DISABLE_SSH`: **false**: Disable SSH feature when it's not available.
+* `HTTP_PORT`: **3000**: HTTP listen port.
+* `ROOT_URL`: **""**: Overwrite the automatically generated public URL. This is useful if the internal and the external URL don't match (e.g. in Docker).
+* `LFS_START_SERVER`: **false**: Enables git-lfs support.
+* `DB_TYPE`: **sqlite3**: The database type in use \[mysql, postgres, mssql, sqlite3\].
+* `DB_HOST`: **localhost:3306**: Database host address and port.
+* `DB_NAME`: **gitea**: Database name.
+* `DB_USER`: **root**: Database username.
+* `DB_PASSWD`: **"\<empty>"**: Database user password. Use \`your password\` for quoting if you use special characters in the password.
+* `INSTALL_LOCK`: **false**: Disallow access to the install page.
+* `SECRET_KEY`: **""**: Global secret key. This should be changed. If this has a value and `INSTALL_LOCK` is empty, `INSTALL_LOCK` will automatically set to `true`.
+* `DISABLE_REGISTRATION`: **false**: Disable registration, after which only admin can create accounts for users.
+* `REQUIRE_SIGNIN_VIEW`: **false**: Enable this to force users to log in to view any page.
+
 # Customization

 Customization files described [here](https://docs.gitea.io/en-us/customizing-gitea/) should
@@ -261,11 +287,11 @@ docker-compose up -d
 - Rename folder (inside volume) gitea to custom
 - Edit app.ini if needed
  - Set START_SSH_SERVER = true
- Use image gitea/gitea:{{< version >}}-rootless
+- Use image gitea/gitea:latest-rootless

 ## Managing Deployments With Environment Variables

-In addition to the environment variables above, any settings in `app.ini` can be set or overridden with an environment variable of the form: `GITEA__SECTION_NAME__KEY_NAME`. These settings are applied each time the docker container starts. Full information [here](https://github.com/go-gitea/gitea/tree/main/contrib/environment-to-ini).
+In addition to the environment variables above, any settings in `app.ini` can be set or overridden with an environment variable of the form: `GITEA__SECTION_NAME__KEY_NAME`. These settings are applied each time the docker container starts. Full information [here](https://github.com/go-gitea/gitea/tree/master/contrib/environment-to-ini).

 These environment variables can be passed to the docker container in `docker-compose.yml`. The following example will enable an smtp mail server if the required env variables `GITEA__mailer__FROM`, `GITEA__mailer__HOST`, `GITEA__mailer__PASSWD` are set on the host or in a `.env` file in the same directory as `docker-compose.yml`:

--- a/docs/content/doc/installation/with-docker.en-us.md
+++ b/docs/content/doc/installation/with-docker.en-us.md
@@ -34,7 +34,8 @@ image as a service. Since there is no database available, one can be initialized
 Create a directory like `gitea` and paste the following content into a file named `docker-compose.yml`.
 Note that the volume should be owned by the user/group with the UID/GID specified in the config file.
 If you don't give the volume correct permissions, the container may not start.
-For a stable release you can use `:latest`, `:1` or specify a certain release like `:{{< version >}}`, but if you'd like to use the latest development version of Gitea then you could use the `:dev` tag.
+Also be aware that the tag `:latest` will install the current development version.
+For a stable release you can use `:1` or specify a certain release like `:{{< version >}}`.

 ```yaml
 version: "3"
@@ -117,11 +118,11 @@ services:
    environment:
      - USER_UID=1000
      - USER_GID=1000
-+     - GITEA__database__DB_TYPE=mysql
-+     - GITEA__database__HOST=db:3306
-+     - GITEA__database__NAME=gitea
-+     - GITEA__database__USER=gitea
-+     - GITEA__database__PASSWD=gitea
+     - DB_TYPE=mysql
+     - DB_HOST=db:3306
+     - DB_NAME=gitea
+     - DB_USER=gitea
+     - DB_PASSWD=gitea
    restart: always
    networks:
      - gitea
@@ -136,7 +137,7 @@ services:
 +      - db
 +
 +  db:
-+    image: mysql:8
+    image: mysql:5.7
 +    restart: always
 +    environment:
 +      - MYSQL_ROOT_PASSWORD=gitea
@@ -168,11 +169,11 @@ services:
    environment:
      - USER_UID=1000
      - USER_GID=1000
-+     - GITEA__database__DB_TYPE=postgres
-+     - GITEA__database__HOST=db:5432
-+     - GITEA__database__NAME=gitea
-+     - GITEA__database__USER=gitea
-+     - GITEA__database__PASSWD=gitea
+     - DB_TYPE=postgres
+     - DB_HOST=db:5432
+     - DB_NAME=gitea
+     - DB_USER=gitea
+     - DB_PASSWD=gitea
    restart: always
    networks:
      - gitea
@@ -187,7 +188,7 @@ services:
 +      - db
 +
 +  db:
-+    image: postgres:13
+    image: postgres:9.6
 +    restart: always
 +    environment:
 +      - POSTGRES_USER=gitea
@@ -255,9 +256,31 @@ favorite browser to finalize the installation. Visit http://server-ip:3000 and f
 installation wizard. If the database was started with the `docker-compose` setup as
 documented above, please note that `db` must be used as the database hostname.

-## Configure the user inside Gitea using environment variables 
+## Environment variables

- `USER`: **git**: The username of the user that runs Gitea within the container.
+You can configure some of Gitea's settings via environment variables:
+
+(Default values are provided in **bold**)
+
+- `APP_NAME`: **"Gitea: Git with a cup of tea"**: Application name, used in the page title.
+- `RUN_MODE`: **prod**: Application run mode, affects performance and debugging. Either "dev", "prod" or "test".
+- `DOMAIN`: **localhost**: Domain name of this server, used for the displayed http clone URL in Gitea's UI.
+- `SSH_DOMAIN`: **localhost**: Domain name of this server, used for the displayed ssh clone URL in Gitea's UI. If the install page is enabled, SSH Domain Server takes DOMAIN value in the form (which overwrite this setting on save).
+- `SSH_PORT`: **22**: SSH port displayed in clone URL.
+- `SSH_LISTEN_PORT`: **%(SSH_PORT)s**: Port for the built-in SSH server.
+- `DISABLE_SSH`: **false**: Disable SSH feature when it's not available. If you want to disable SSH feature, you should set SSH port to `0` when installing Gitea.
+- `HTTP_PORT`: **3000**: HTTP listen port.
+- `ROOT_URL`: **""**: Overwrite the automatically generated public URL. This is useful if the internal and the external URL don't match (e.g. in Docker).
+- `LFS_START_SERVER`: **false**: Enables git-lfs support.
+- `DB_TYPE`: **sqlite3**: The database type in use \[mysql, postgres, mssql, sqlite3\].
+- `DB_HOST`: **localhost:3306**: Database host address and port.
+- `DB_NAME`: **gitea**: Database name.
+- `DB_USER`: **root**: Database username.
+- `DB_PASSWD`: **"\<empty>"**: Database user password. Use \`your password\` for quoting if you use special characters in the password.
+- `INSTALL_LOCK`: **false**: Disallow access to the install page.
+- `SECRET_KEY`: **""**: Global secret key. This should be changed. If this has a value and `INSTALL_LOCK` is empty, `INSTALL_LOCK` will automatically set to `true`.
+- `DISABLE_REGISTRATION`: **false**: Disable registration, after which only admin can create accounts for users.
+- `REQUIRE_SIGNIN_VIEW`: **false**: Enable this to force users to log in to view any page.
 - `USER_UID`: **1000**: The UID (Unix user ID) of the user that runs Gitea within the container. Match this to the UID of the owner of the `/data` volume if using host volumes (this is not necessary with named volumes).
 - `USER_GID`: **1000**: The GID (Unix group ID) of the user that runs Gitea within the container. Match this to the GID of the owner of the `/data` volume if using host volumes (this is not necessary with named volumes).

--- a/docs/content/doc/installation/with-docker.zh-cn.md
+++ b/docs/content/doc/installation/with-docker.zh-cn.md
@@ -122,7 +122,7 @@ services:
 +      - db
 +
 +  db:
-+    image: mysql:8
+    image: mysql:5.7
 +    restart: always
 +    environment:
 +      - MYSQL_ROOT_PASSWORD=gitea
@@ -172,7 +172,7 @@ services:
 +      - db
 +
 +  db:
-+    image: postgres:13
+    image: postgres:9.6
 +    restart: always
 +    environment:
 +      - POSTGRES_USER=gitea
--- a/docs/content/doc/upgrade/from-gogs.en-us.md
+++ b/docs/content/doc/upgrade/from-gogs.en-us.md
@@ -96,7 +96,7 @@ See [#4286](https://github.com/go-gitea/gitea/issues/4286).

 ## Add Gitea to startup on Unix

-Update the appropriate file from [gitea/contrib](https://github.com/go-gitea/gitea/tree/main/contrib)
+Update the appropriate file from [gitea/contrib](https://github.com/go-gitea/gitea/tree/master/contrib)
 with the right environment variables.

 For distros with systemd:
--- a/docs/content/doc/usage/command-line.en-us.md
+++ b/docs/content/doc/usage/command-line.en-us.md
@@ -46,8 +46,6 @@ Starts the server:
  - `--port number`, `-p number`: Port number. Optional. (default: 3000). Overrides configuration file.
  - `--install-port number`: Port number to run the install page on. Optional. (default: 3000). Overrides configuration file.
  - `--pid path`, `-P path`: Pidfile path. Optional.
-  - `--quiet`, `-q`: Only emit Fatal logs on the console for logs emitted before logging set up.
-  - `--verbose`: Emit tracing logs on the console for logs emitted before logging is set-up.
 - Examples:
  - `gitea web`
  - `gitea web --port 80`
--- a/docs/content/doc/usage/email-setup.en-us.md
+++ b/docs/content/doc/usage/email-setup.en-us.md
@@ -19,15 +19,12 @@ menu:

 {{< toc >}}

-Gitea has mailer functionality for sending transactional emails (such as registration confirmation). It can be configured to either use Sendmail (or compatible MTAs like Postfix and msmtp) or directly use SMTP server.
+To use Gitea's built-in Email support, update the `app.ini` config file [mailer] section:

-## Using Sendmail
+## Sendmail version

-Use `sendmail` command as mailer.
-
-Note: For use in the official Gitea Docker image, please configure with the SMTP version (see the following section).
-
-Note: For Internet-facing sites consult documentation of your MTA for instructions to send emails over TLS. Also set up SPF, DMARC, and DKIM DNS records to make emails sent be accepted as legitimate by various email providers.
+Use the operating system’s sendmail command instead of SMTP. This is common on Linux servers.  
+Note: For use in the official Gitea Docker image, please configure with the SMTP version.

 ```ini
 [mailer]
@@ -37,9 +34,7 @@ MAILER_TYPE   = sendmail
 SENDMAIL_PATH = /usr/sbin/sendmail
 ```

-## Using SMTP
-
-Directly use SMTP server as relay. This option is useful if you don't want to set up MTA on your instance but you have an account at email provider.
+## SMTP version

 ```ini
 [mailer]
@@ -52,19 +47,17 @@ USER           = gitea@mydomain.com
 PASSWD         = `password`
 ```

-Restart Gitea for the configuration changes to take effect.
+- Restart Gitea for the configuration changes to take effect.

-To send a test email to validate the settings, go to Gitea > Site Administration > Configuration > SMTP Mailer Configuration.
+- To send a test email to validate the settings, go to Gitea > Site Administration > Configuration > SMTP Mailer Configuration.

 For the full list of options check the [Config Cheat Sheet]({{< relref "doc/advanced/config-cheat-sheet.en-us.md" >}})

-Please note: authentication is only supported when the SMTP server communication is encrypted with TLS or `HOST=localhost`. TLS encryption can be through:
-  - STARTTLS (also known as Opportunistic TLS) via port 587. Initial connection is done over cleartext, but then be upgraded over TLS if the server supports it.
-  - SMTPS connection (SMTP over TLS) via the default port 465. Connection to the server use TLS from the beginning.
+- Please note: authentication is only supported when the SMTP server communication is encrypted with TLS or `HOST=localhost`. TLS encryption can be through:
+  - Via the server supporting TLS through STARTTLS - usually provided on port 587. (Also known as Opportunistic TLS.)
+  - SMTPS connection (SMTP over transport layer security) via the default port 465.
  - Forced SMTPS connection with `IS_TLS_ENABLED=true`. (These are both known as Implicit TLS.)
-This is due to protections imposed by the Go internal libraries against STRIPTLS attacks.
-
-Note that Implicit TLS is recommended by [RFC8314](https://tools.ietf.org/html/rfc8314#section-3) since 2018.
+- This is due to protections imposed by the Go internal libraries against STRIPTLS attacks.

 ### Gmail

@@ -81,4 +74,3 @@ MAILER_TYPE    = smtp
 IS_TLS_ENABLED = true
 HELO_HOSTNAME  = example.com
 ```
-
--- a/docs/content/doc/usage/fail2ban-setup.en-us.md
+++ b/docs/content/doc/usage/fail2ban-setup.en-us.md
@@ -29,32 +29,22 @@ on a bad authentication from the web or CLI using SSH or HTTP respectively:
 ```log
 2020/10/15 16:05:09 modules/ssh/ssh.go:143:publicKeyHandler() [W] Failed authentication attempt from xxx.xxx.xxx.xxx
 ```
-(DEPRECATED: This may be a false positive as the user may still go on to correctly authenticate.)

 ```log
 2020/10/15 16:05:09 modules/ssh/ssh.go:155:publicKeyHandler() [W] Failed authentication attempt from xxx.xxx.xxx.xxx
 ```
-(DEPRECATED: This may be a false positive as the user may still go on to correctly authenticate.)

 ```log
 2020/10/15 16:05:09 modules/ssh/ssh.go:198:publicKeyHandler() [W] Failed authentication attempt from xxx.xxx.xxx.xxx
 ```
-(DEPRECATED: This may be a false positive as the user may still go on to correctly authenticate.)

 ```log
 2020/10/15 16:05:09 modules/ssh/ssh.go:213:publicKeyHandler() [W] Failed authentication attempt from xxx.xxx.xxx.xxx
 ```
-(DEPRECATED: This may be a false positive as the user may still go on to correctly authenticate.)

 ```log
 2020/10/15 16:05:09 modules/ssh/ssh.go:227:publicKeyHandler() [W] Failed authentication attempt from xxx.xxx.xxx.xxx
 ```
-(DEPRECATED: This may be a false positive as the user may still go on to correctly authenticate.)
-
-```log
-2020/10/15 16:05:09 modules/ssh/ssh.go:249:sshConnectionFailed() [W] Failed authentication attempt from xxx.xxx.xxx.xxx
-```
-(From 1.15 this new message will available and doesn't have any of the false positive results that above messages from publicKeyHandler do. This will only be logged if the user has completely failed authentication.)

 ```log
 2020/10/15 16:08:44 ...s/context/context.go:204:HandleText() [E] invalid credentials from xxx.xxx.xxx.xxx
--- a/docs/content/doc/usage/git-lfs-support.md
+++ b/docs/content/doc/usage/git-lfs-support.md
@@ -24,5 +24,3 @@ LFS_START_SERVER = true
 ; Where your lfs files reside, default is data/lfs.
 LFS_CONTENT_PATH = /home/gitea/data/lfs
 ```
-
-**Note**: LFS server support needs at least Git v2.1.2 installed on the server
--- a/docs/content/doc/usage/reverse-proxies.en-us.md
+++ b/docs/content/doc/usage/reverse-proxies.en-us.md
@@ -120,14 +120,6 @@ server {
 }
 ```

-## Resolving Error: 413 Request Entity Too Large
-
-This error indicates nginx is configured to restrict the file upload size.
-
-In your nginx config file containing your Gitea proxy directive, find the `location { ... }` block for Gitea and add the line
-`client_max_body_size 16M;` to set this limit to 16 megabytes or any other number of choice.
-
-
 ## Apache HTTPD

 If you want Apache HTTPD to serve your Gitea instance, you can add the following to your Apache HTTPD configuration (usually located at `/etc/apache2/httpd.conf` in Ubuntu):
@@ -229,28 +221,12 @@ If you wish to run Gitea with IIS. You will need to setup IIS with URL Rewrite a
 ```xml
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <system.web>
-        <httpRuntime requestPathInvalidCharacters="" />
-    </system.web>
    <system.webServer>
-        <security>
-          <requestFiltering>
-            <hiddenSegments>
-              <clear />
-            </hiddenSegments>
-            <denyUrlSequences>
-              <clear />
-            </denyUrlSequences>
-            <fileExtensions allowUnlisted="true">
-              <clear />
-            </fileExtensions>
-          </requestFiltering>
-        </security>
        <rewrite>
-            <rules useOriginalURLEncoding="false">
+            <rules>
                <rule name="ReverseProxyInboundRule1" stopProcessing="true">
                    <match url="(.*)" />
-                    <action type="Rewrite" url="http://127.0.0.1:3000{UNENCODED_URL}" />
+                    <action type="Rewrite" url="http://127.0.0.1:3000/{R:1}" />
                    <serverVariables>
                        <set name="HTTP_X_ORIGINAL_ACCEPT_ENCODING" value="HTTP_ACCEPT_ENCODING" />
                        <set name="HTTP_ACCEPT_ENCODING" value="" />
@@ -279,16 +255,6 @@ If you wish to run Gitea with IIS. You will need to setup IIS with URL Rewrite a
            </outboundRules>
        </rewrite>
        <urlCompression doDynamicCompression="true" />
-        <handlers>
-          <clear />
-          <add name="StaticFile" path="*" verb="*" modules="StaticFileModule,DefaultDocumentModule,DirectoryListingModule" resourceType="Either" requireAccess="Read" />
-        </handlers>
-        <!-- Map all extensions to the same MIME type, so all files can be
-               downloaded. -->
-        <staticContent>
-          <clear />
-          <mimeMap fileExtension="*" mimeType="application/octet-stream" />
-        </staticContent>
    </system.webServer>
 </configuration>
 ```
--- a/docs/content/page/index.de-de.md
+++ b/docs/content/page/index.de-de.md
@@ -32,5 +32,5 @@ Gitea ist ein [Gogs](http://gogs.io)-Fork.

 ## Browser Unterstützung

- Letzten 2 Versions von Chrome, Firefox, Safari und Edge
+- Letzten 2 Versions von Chrome, Firefox, Safari, Edge (EdgeHTML) and Edge (Chromium)
 - Firefox ESR
--- a/docs/content/page/index.en-us.md
+++ b/docs/content/page/index.en-us.md
@@ -117,7 +117,7 @@ Windows, on architectures like amd64, i386, ARM, PowerPC, and others.
        - Configuration viewer
            - Everything in config file
        - System notices
-            - When something unexpected happens
+            - When somthing unexpected happens
        - Monitoring
            - Current processes
            - Cron jobs
@@ -155,7 +155,7 @@ Windows, on architectures like amd64, i386, ARM, PowerPC, and others.
            - Libravatar
            - Custom
        - Password
-        - Multiple email addresses
+        - Mutiple email addresses
        - SSH Keys
        - Connected applications
        - Two factor authentication
@@ -262,7 +262,7 @@ Windows, on architectures like amd64, i386, ARM, PowerPC, and others.

 ## Browser Support

- Last 2 versions of Chrome, Firefox, Safari and Edge
+- Last 2 versions of Chrome, Firefox, Safari, Edge (EdgeHTML) and Edge (Chromium)
 - Firefox ESR

 ## Components
--- a/docs/content/page/index.zh-tw.md
+++ b/docs/content/page/index.zh-tw.md
@@ -261,7 +261,7 @@ Gitea 是從 [Gogs](http://gogs.io) Fork 出來的，請閱讀部落格文章 [G

 ## 瀏覽器支援

- 最近 2 個版本的 Chrome, Firefox, Safari, Edge
+- 最近 2 個版本的 Chrome, Firefox, Safari, Edge (EdgeHTML), Edge (Chromium)
 - Firefox ESR

 ## 元件
--- a/go.mod
+++ b/go.mod
@@ -11,127 +11,137 @@ require (
 	gitea.com/go-chi/captcha v0.0.0-20210110083842-e7696c336a1e
 	gitea.com/go-chi/session v0.0.0-20210108030337-0cb48c5ba8ee
 	gitea.com/lunny/levelqueue v0.3.0
-	github.com/Microsoft/go-winio v0.5.0 // indirect
+	github.com/Microsoft/go-winio v0.4.16 // indirect
 	github.com/NYTimes/gziphandler v1.1.1
-	github.com/ProtonMail/go-crypto v0.0.0-20210705153151-cc34b1f6908b // indirect
-	github.com/PuerkitoBio/goquery v1.7.0
-	github.com/RoaringBitmap/roaring v0.9.1 // indirect
-	github.com/alecthomas/chroma v0.9.2
-	github.com/andybalholm/brotli v1.0.3 // indirect
-	github.com/andybalholm/cascadia v1.2.0 // indirect
-	github.com/blevesearch/bleve/v2 v2.0.6
+	github.com/PuerkitoBio/goquery v1.5.1
+	github.com/RoaringBitmap/roaring v0.5.5 // indirect
+	github.com/alecthomas/chroma v0.8.2
+	github.com/andybalholm/brotli v1.0.1 // indirect
+	github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
+	github.com/blevesearch/bleve/v2 v2.0.2
 	github.com/boombuler/barcode v1.0.1 // indirect
 	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // indirect
-	github.com/caddyserver/certmagic v0.14.0
+	github.com/caddyserver/certmagic v0.12.0
 	github.com/chi-middleware/proxy v1.1.1
 	github.com/couchbase/go-couchbase v0.0.0-20210224140812-5740cd35f448 // indirect
 	github.com/couchbase/gomemcached v0.1.2 // indirect
 	github.com/couchbase/goutils v0.0.0-20210118111533-e33d3ffb5401 // indirect
-	github.com/denisenkom/go-mssqldb v0.10.0
+	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
+	github.com/denisenkom/go-mssqldb v0.9.0
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
-	github.com/djherbis/buffer v1.2.0
-	github.com/djherbis/nio/v3 v3.0.1
+	github.com/dlclark/regexp2 v1.4.0 // indirect
 	github.com/dustin/go-humanize v1.0.0
-	github.com/editorconfig/editorconfig-core-go/v2 v2.4.2
+	github.com/editorconfig/editorconfig-core-go/v2 v2.4.1
 	github.com/emirpasic/gods v1.12.0
 	github.com/ethantkoenig/rupture v1.0.0
-	github.com/gliderlabs/ssh v0.3.3
+	github.com/gliderlabs/ssh v0.3.2
+	github.com/glycerine/go-unsnap-stream v0.0.0-20210130063903-47dfef350d96 // indirect
 	github.com/go-asn1-ber/asn1-ber v1.5.3 // indirect
 	github.com/go-chi/chi v1.5.4
-	github.com/go-chi/cors v1.2.0
-	github.com/go-enry/go-enry/v2 v2.7.1
-	github.com/go-git/go-billy/v5 v5.3.1
-	github.com/go-git/go-git/v5 v5.4.3-0.20210630082519-b4368b2a2ca4
-	github.com/go-ldap/ldap/v3 v3.3.0
-	github.com/go-redis/redis/v8 v8.11.0
-	github.com/go-sql-driver/mysql v1.6.0
-	github.com/go-swagger/go-swagger v0.27.0
-	github.com/go-testfixtures/testfixtures/v3 v3.6.1
+	github.com/go-chi/cors v1.1.1
+	github.com/go-enry/go-enry/v2 v2.6.1
+	github.com/go-git/go-billy/v5 v5.0.0
+	github.com/go-git/go-git/v5 v5.2.0
+	github.com/go-ldap/ldap/v3 v3.2.4
+	github.com/go-openapi/errors v0.20.0 // indirect
+	github.com/go-openapi/validate v0.20.2 // indirect
+	github.com/go-redis/redis/v8 v8.6.0
+	github.com/go-sql-driver/mysql v1.5.0
+	github.com/go-swagger/go-swagger v0.26.1
+	github.com/go-testfixtures/testfixtures/v3 v3.5.0
 	github.com/gobwas/glob v0.2.3
 	github.com/gogs/chardet v0.0.0-20191104214054-4b6791f73a28
 	github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14
 	github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85
-	github.com/golang/snappy v0.0.4 // indirect
+	github.com/golang/snappy v0.0.3 // indirect
 	github.com/google/go-github/v32 v32.1.0
-	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/uuid v1.2.0
 	github.com/gorilla/context v1.1.1
 	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/gorilla/sessions v1.2.1 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-retryablehttp v0.7.0 // indirect
-	github.com/hashicorp/go-version v1.3.1
-	github.com/hashicorp/golang-lru v0.5.4
+	github.com/hashicorp/go-retryablehttp v0.6.8 // indirect
+	github.com/hashicorp/go-version v1.2.1
 	github.com/huandu/xstrings v1.3.2
-	github.com/issue9/identicon v1.2.0
+	github.com/imdario/mergo v0.3.11 // indirect
+	github.com/issue9/assert v1.3.2 // indirect
+	github.com/issue9/identicon v1.0.1
 	github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7
-	github.com/json-iterator/go v1.1.11
+	github.com/json-iterator/go v1.1.10
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
-	github.com/kevinburke/ssh_config v1.1.0 // indirect
+	github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
 	github.com/keybase/go-crypto v0.0.0-20200123153347-de78d2cb44f4
-	github.com/klauspost/compress v1.13.1
-	github.com/klauspost/cpuid/v2 v2.0.8 // indirect
+	github.com/klauspost/compress v1.11.8
 	github.com/klauspost/pgzip v1.2.5 // indirect
 	github.com/lafriks/xormstore v1.4.0
-	github.com/lib/pq v1.10.2
+	github.com/lib/pq v1.9.0
+	github.com/libdns/libdns v0.2.0 // indirect
 	github.com/lunny/dingtalk_webhook v0.0.0-20171025031554-e3534c89ef96
+	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/markbates/goth v1.67.1
-	github.com/mattn/go-isatty v0.0.13
-	github.com/mattn/go-runewidth v0.0.13 // indirect
-	github.com/mattn/go-sqlite3 v1.14.7
+	github.com/mattn/go-isatty v0.0.12
+	github.com/mattn/go-runewidth v0.0.10 // indirect
+	github.com/mattn/go-sqlite3 v1.14.6
+	github.com/mgechev/dots v0.0.0-20190921121421-c36f7dcfbb81
+	github.com/mgechev/revive v1.0.3
+	github.com/mholt/acmez v0.1.3 // indirect
 	github.com/mholt/archiver/v3 v3.5.0
-	github.com/microcosm-cc/bluemonday v1.0.15
-	github.com/miekg/dns v1.1.43 // indirect
+	github.com/microcosm-cc/bluemonday v1.0.7
+	github.com/miekg/dns v1.1.40 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
-	github.com/minio/minio-go/v7 v7.0.12
+	github.com/minio/minio-go/v7 v7.0.10
 	github.com/minio/sha256-simd v1.0.0 // indirect
+	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mrjones/oauth v0.0.0-20190623134757-126b35219450 // indirect
 	github.com/msteinert/pam v0.0.0-20201130170657-e61372126161
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
-	github.com/niklasfasching/go-org v1.5.0
+	github.com/niklasfasching/go-org v1.4.0
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/oliamb/cutter v0.2.2
-	github.com/olivere/elastic/v7 v7.0.25
-	github.com/pelletier/go-toml v1.9.0 // indirect
-	github.com/pierrec/lz4/v4 v4.1.8 // indirect
+	github.com/olivere/elastic/v7 v7.0.22
+	github.com/pelletier/go-toml v1.8.1
+	github.com/pierrec/lz4/v4 v4.1.3 // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/pquerna/otp v1.3.0
-	github.com/prometheus/client_golang v1.11.0
+	github.com/prometheus/client_golang v1.9.0
+	github.com/prometheus/common v0.18.0 // indirect
+	github.com/prometheus/procfs v0.6.0 // indirect
 	github.com/quasoft/websspi v1.0.0
-	github.com/rs/xid v1.3.0 // indirect
+	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/sergi/go-diff v1.2.0
+	github.com/sergi/go-diff v1.1.0
 	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
 	github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546
+	github.com/spf13/afero v1.5.1 // indirect
 	github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
 	github.com/stretchr/testify v1.7.0
 	github.com/syndtr/goleveldb v1.0.0
+	github.com/tinylib/msgp v1.1.5 // indirect
 	github.com/tstranex/u2f v1.0.0
 	github.com/ulikunitz/xz v0.5.10 // indirect
 	github.com/unknwon/com v1.0.1
-	github.com/unknwon/i18n v0.0.0-20210321134014-0ebbf2df1c44
+	github.com/unknwon/i18n v0.0.0-20200823051745-09abd91c7f2c
 	github.com/unknwon/paginater v0.0.0-20200328080006-042474bd0eae
-	github.com/unrolled/render v1.4.0
+	github.com/unrolled/render v1.0.3
 	github.com/urfave/cli v1.22.5
-	github.com/xanzy/go-gitlab v0.50.1
+	github.com/willf/bitset v1.1.11 // indirect
+	github.com/xanzy/go-gitlab v0.44.0
+	github.com/xanzy/ssh-agent v0.3.0 // indirect
 	github.com/yohcop/openid-go v1.0.0
-	github.com/yuin/goldmark v1.4.0
-	github.com/yuin/goldmark-highlighting v0.0.0-20210516132338-9216f9c5aa01
+	github.com/yuin/goldmark v1.3.3
+	github.com/yuin/goldmark-highlighting v0.0.0-20200307114337-60d527fdb691
 	github.com/yuin/goldmark-meta v1.0.0
-	go.etcd.io/bbolt v1.3.6 // indirect
 	go.jolheiser.com/hcaptcha v0.0.4
 	go.jolheiser.com/pwn v0.0.3
-	go.uber.org/atomic v1.8.0 // indirect
-	go.uber.org/multierr v1.7.0 // indirect
-	go.uber.org/zap v1.18.1 // indirect
-	golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e
-	golang.org/x/net v0.0.0-20210614182718-04defd469f4e
-	golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914
-	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c
-	golang.org/x/text v0.3.6
-	golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6 // indirect
+	go.uber.org/multierr v1.6.0 // indirect
+	go.uber.org/zap v1.16.0 // indirect
+	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
+	golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
+	golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93
+	golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44
+	golang.org/x/text v0.3.5
+	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
 	golang.org/x/tools v0.1.0
-	google.golang.org/protobuf v1.27.1 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 	gopkg.in/ini.v1 v1.62.0
@@ -139,7 +149,7 @@ require (
 	mvdan.cc/xurls/v2 v2.2.0
 	strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251
 	xorm.io/builder v0.3.9
-	xorm.io/xorm v1.1.2
+	xorm.io/xorm v1.0.7
 )

-replace github.com/hashicorp/go-version => github.com/6543/go-version v1.3.1
+replace github.com/hashicorp/go-version => github.com/6543/go-version v1.2.4
--- a/go.sum
+++ b/go.sum
--- a/integrations/README.md
+++ b/integrations/README.md
@@ -28,7 +28,7 @@ make test-sqlite
 Setup a mysql database inside docker
 ```
 docker run -e "MYSQL_DATABASE=test" -e "MYSQL_ALLOW_EMPTY_PASSWORD=yes" -p 3306:3306 --rm --name mysql mysql:latest #(just ctrl-c to stop db and clean the container)
-docker run -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" --rm --name elasticsearch elasticsearch:7.6.0 #(in a second terminal, just ctrl-c to stop db and clean the container)
+docker run -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" --rm --name elasticsearch elasticsearch:7.6.0 #(in a secound terminal, just ctrl-c to stop db and clean the container)
 ```
 Start tests based on the database container
 ```
--- a/integrations/README_ZH.md
+++ b/integrations/README_ZH.md
@@ -26,7 +26,7 @@ make test-sqlite
 ## 如何使用 mysql 数据库进行集成测试
 首先在docker容器里部署一个 mysql 数据库
 ```
-docker run -e "MYSQL_DATABASE=test" -e "MYSQL_ALLOW_EMPTY_PASSWORD=yes" -p 3306:3306 --rm --name mysql mysql:8 #(just ctrl-c to stop db and clean the container) 
+docker run -e "MYSQL_DATABASE=test" -e "MYSQL_ALLOW_EMPTY_PASSWORD=yes" -p 3306:3306 --rm --name mysql mysql:5.7 #(just ctrl-c to stop db and clean the container) 
 ```
 之后便可以基于这个数据库进行集成测试
 ```
@@ -36,7 +36,7 @@ TEST_MYSQL_HOST=localhost:3306 TEST_MYSQL_DBNAME=test TEST_MYSQL_USERNAME=root T
 ## 如何使用 pgsql 数据库进行集成测试
 同上，首先在 docker 容器里部署一个 pgsql 数据库
 ```
-docker run -e "POSTGRES_DB=test" -p 5432:5432 --rm --name pgsql postgres:13 #(just ctrl-c to stop db and clean the container) 
+docker run -e "POSTGRES_DB=test" -p 5432:5432 --rm --name pgsql postgres:9.5 #(just ctrl-c to stop db and clean the container) 
 ```
 之后便可以基于这个数据库进行集成测试
 ```
--- a/integrations/api_admin_test.go
+++ b/integrations/api_admin_test.go
@@ -195,7 +195,7 @@ func TestAPIEditUser(t *testing.T) {
 	assert.EqualValues(t, "email is not allowed to be empty string", errMap["message"].(string))

 	user2 := models.AssertExistsAndLoadBean(t, &models.User{LoginName: "user2"}).(*models.User)
-	assert.False(t, user2.IsRestricted)
+	assert.Equal(t, false, user2.IsRestricted)
 	bTrue := true
 	req = NewRequestWithJSON(t, "PATCH", urlStr, api.EditUserOption{
 		// required
@@ -206,5 +206,5 @@ func TestAPIEditUser(t *testing.T) {
 	})
 	session.MakeRequest(t, req, http.StatusOK)
 	user2 = models.AssertExistsAndLoadBean(t, &models.User{LoginName: "user2"}).(*models.User)
-	assert.True(t, user2.IsRestricted)
+	assert.Equal(t, true, user2.IsRestricted)
 }
--- a/integrations/api_branch_test.go
+++ b/integrations/api_branch_test.go
@@ -151,26 +151,20 @@ func testAPICreateBranches(t *testing.T, giteaURL *url.URL) {
 	for _, test := range tests {
 		defer resetFixtures(t)
 		session := ctx.Session
-		testAPICreateBranch(t, session, "user2", "my-noo-repo", test.OldBranch, test.NewBranch, test.ExpectedHTTPStatus)
-	}
-}
-
-func testAPICreateBranch(t testing.TB, session *TestSession, user, repo, oldBranch, newBranch string, status int) bool {
 		token := getTokenForLoggedInUser(t, session)
-	req := NewRequestWithJSON(t, "POST", "/api/v1/repos/"+user+"/"+repo+"/branches?token="+token, &api.CreateBranchRepoOption{
-		BranchName:    newBranch,
-		OldBranchName: oldBranch,
+		req := NewRequestWithJSON(t, "POST", "/api/v1/repos/user2/my-noo-repo/branches?token="+token, &api.CreateBranchRepoOption{
+			BranchName:    test.NewBranch,
+			OldBranchName: test.OldBranch,
 		})
-	resp := session.MakeRequest(t, req, status)
+		resp := session.MakeRequest(t, req, test.ExpectedHTTPStatus)

 		var branch api.Branch
 		DecodeJSON(t, resp, &branch)

-	if status == http.StatusCreated {
-		assert.EqualValues(t, newBranch, branch.Name)
+		if test.ExpectedHTTPStatus == http.StatusCreated {
+			assert.EqualValues(t, test.NewBranch, branch.Name)
+		}
 	}
-
-	return resp.Result().StatusCode == status
 }

 func TestAPIBranchProtection(t *testing.T) {
--- a/integrations/api_gpg_keys_test.go
+++ b/integrations/api_gpg_keys_test.go
@@ -29,13 +29,14 @@ func TestGPGKeys(t *testing.T) {
 		results     []int
 	}{
 		{name: "NoLogin", makeRequest: MakeRequest, token: "",
-			results: []int{http.StatusUnauthorized, http.StatusUnauthorized, http.StatusUnauthorized, http.StatusUnauthorized, http.StatusUnauthorized, http.StatusUnauthorized, http.StatusUnauthorized, http.StatusUnauthorized, http.StatusUnauthorized},
+			results: []int{http.StatusUnauthorized, http.StatusUnauthorized, http.StatusUnauthorized, http.StatusUnauthorized, http.StatusUnauthorized, http.StatusUnauthorized, http.StatusUnauthorized, http.StatusUnauthorized},
 		},
 		{name: "LoggedAsUser2", makeRequest: session.MakeRequest, token: token,
-			results: []int{http.StatusOK, http.StatusOK, http.StatusNotFound, http.StatusNoContent, http.StatusUnprocessableEntity, http.StatusNotFound, http.StatusCreated, http.StatusNotFound, http.StatusCreated}},
+			results: []int{http.StatusOK, http.StatusOK, http.StatusNotFound, http.StatusNoContent, http.StatusUnprocessableEntity, http.StatusNotFound, http.StatusCreated, http.StatusCreated}},
 	}

 	for _, tc := range tt {
+
 		//Basic test on result code
 		t.Run(tc.name, func(t *testing.T) {
 			t.Run("ViewOwnGPGKeys", func(t *testing.T) {
@@ -60,7 +61,7 @@ func TestGPGKeys(t *testing.T) {
 			t.Run("CreateValidGPGKey", func(t *testing.T) {
 				testCreateValidGPGKey(t, tc.makeRequest, tc.token, tc.results[6])
 			})
-			t.Run("CreateValidSecondaryEmailGPGKeyNotActivated", func(t *testing.T) {
+			t.Run("CreateValidSecondaryEmailGPGKey", func(t *testing.T) {
 				testCreateValidSecondaryEmailGPGKey(t, tc.makeRequest, tc.token, tc.results[7])
 			})
 		})
@@ -74,32 +75,46 @@ func TestGPGKeys(t *testing.T) {
 		req := NewRequest(t, "GET", "/api/v1/user/gpg_keys?token="+token) //GET all keys
 		resp := session.MakeRequest(t, req, http.StatusOK)
 		DecodeJSON(t, resp, &keys)
-		assert.Len(t, keys, 1)

 		primaryKey1 := keys[0] //Primary key 1
 		assert.EqualValues(t, "38EA3BCED732982C", primaryKey1.KeyID)
-		assert.Len(t, primaryKey1.Emails, 1)
+		assert.EqualValues(t, 1, len(primaryKey1.Emails))
 		assert.EqualValues(t, "user2@example.com", primaryKey1.Emails[0].Email)
-		assert.True(t, primaryKey1.Emails[0].Verified)
+		assert.EqualValues(t, true, primaryKey1.Emails[0].Verified)

 		subKey := primaryKey1.SubsKey[0] //Subkey of 38EA3BCED732982C
 		assert.EqualValues(t, "70D7C694D17D03AD", subKey.KeyID)
-		assert.Empty(t, subKey.Emails)
+		assert.EqualValues(t, 0, len(subKey.Emails))
+
+		primaryKey2 := keys[1] //Primary key 2
+		assert.EqualValues(t, "FABF39739FE1E927", primaryKey2.KeyID)
+		assert.EqualValues(t, 1, len(primaryKey2.Emails))
+		assert.EqualValues(t, "user21@example.com", primaryKey2.Emails[0].Email)
+		assert.EqualValues(t, false, primaryKey2.Emails[0].Verified)

 		var key api.GPGKey
 		req = NewRequest(t, "GET", "/api/v1/user/gpg_keys/"+strconv.FormatInt(primaryKey1.ID, 10)+"?token="+token) //Primary key 1
 		resp = session.MakeRequest(t, req, http.StatusOK)
 		DecodeJSON(t, resp, &key)
 		assert.EqualValues(t, "38EA3BCED732982C", key.KeyID)
-		assert.Len(t, key.Emails, 1)
+		assert.EqualValues(t, 1, len(key.Emails))
 		assert.EqualValues(t, "user2@example.com", key.Emails[0].Email)
-		assert.True(t, key.Emails[0].Verified)
+		assert.EqualValues(t, true, key.Emails[0].Verified)

 		req = NewRequest(t, "GET", "/api/v1/user/gpg_keys/"+strconv.FormatInt(subKey.ID, 10)+"?token="+token) //Subkey of 38EA3BCED732982C
 		resp = session.MakeRequest(t, req, http.StatusOK)
 		DecodeJSON(t, resp, &key)
 		assert.EqualValues(t, "70D7C694D17D03AD", key.KeyID)
-		assert.Empty(t, key.Emails)
+		assert.EqualValues(t, 0, len(key.Emails))
+
+		req = NewRequest(t, "GET", "/api/v1/user/gpg_keys/"+strconv.FormatInt(primaryKey2.ID, 10)+"?token="+token) //Primary key 2
+		resp = session.MakeRequest(t, req, http.StatusOK)
+		DecodeJSON(t, resp, &key)
+		assert.EqualValues(t, "FABF39739FE1E927", key.KeyID)
+		assert.EqualValues(t, 1, len(key.Emails))
+		assert.EqualValues(t, "user21@example.com", key.Emails[0].Email)
+		assert.EqualValues(t, false, key.Emails[0].Verified)
+
 	})

 	//Check state after basic add
@@ -109,7 +124,7 @@ func TestGPGKeys(t *testing.T) {
 			req := NewRequest(t, "GET", "/api/v1/repos/user2/repo16/branches/not-signed?token="+token)
 			resp := session.MakeRequest(t, req, http.StatusOK)
 			DecodeJSON(t, resp, &branch)
-			assert.False(t, branch.Commit.Verification.Verified)
+			assert.EqualValues(t, false, branch.Commit.Verification.Verified)
 		})

 		t.Run("SignedWithNotValidatedEmail", func(t *testing.T) {
@@ -117,7 +132,7 @@ func TestGPGKeys(t *testing.T) {
 			req := NewRequest(t, "GET", "/api/v1/repos/user2/repo16/branches/good-sign-not-yet-validated?token="+token)
 			resp := session.MakeRequest(t, req, http.StatusOK)
 			DecodeJSON(t, resp, &branch)
-			assert.False(t, branch.Commit.Verification.Verified)
+			assert.EqualValues(t, false, branch.Commit.Verification.Verified)
 		})

 		t.Run("SignedWithValidEmail", func(t *testing.T) {
@@ -125,7 +140,7 @@ func TestGPGKeys(t *testing.T) {
 			req := NewRequest(t, "GET", "/api/v1/repos/user2/repo16/branches/good-sign?token="+token)
 			resp := session.MakeRequest(t, req, http.StatusOK)
 			DecodeJSON(t, resp, &branch)
-			assert.True(t, branch.Commit.Verification.Verified)
+			assert.EqualValues(t, true, branch.Commit.Verification.Verified)
 		})
 	})
 }
@@ -216,46 +231,35 @@ uy6MA3VSB99SK9ducGmE1Jv8mcziREroz2TEGr0zPs6h
 }

 func testCreateValidSecondaryEmailGPGKey(t *testing.T, makeRequest makeRequestFunc, token string, expected int) {
-	//User2 <user2-2@example.com> //secondary and not activated
+	//User2 <user21@example.com> //secondary and not activated
 	testCreateGPGKey(t, makeRequest, token, expected, `-----BEGIN PGP PUBLIC KEY BLOCK-----

-mQGNBGC2K2cBDAC1+Xgk+8UfhASVgRngQi4rnQ8k0t+bWsBz4Czd26+cxVDRwlTT
-8PALdrbrY/e9iXjcVcZ8Npo4UYe7/LfnL57dc7tgbenRGYYrWyVoNNv58BVw4xCY
-RmgvdHWIIPGuz3aME0smHxbJ2KewYTqjTPuVKF/wrHTwCpVWdjYKC5KDo3yx0mro
-xf9vOJOnkWNMiEw7TiZfkrbUqxyA53BVsSNKRX5C3b4FJcVT7eiAq7sDAaFxjEHy
-ahZslmvg7XZxWzSVzxDNesR7f4xuop8HBjzaluJoVuwiyWculTvz1b6hyHVQr+ad
-h8JGjj1tySI65OTFsTuptsfHXjtjl/NR4P6BXkf+FVwweaTQaEzpHkv0m9b9pY43
-CY/8XtS4uNPermiLG/Z0BB1eOCdoOQVHpjOa55IXQWhxXB6NZVyowiUbrR7jLDQy
-5JP7D1HmErTR8JRm3VDqGbSaCgugRgFX+lb/fpgFp9k02OeK+JQudolZOt1mVk+T
-C4xmEWxfiH15/JMAEQEAAbQbdXNlcjIgPHVzZXIyLTJAZXhhbXBsZS5jb20+iQHU
-BBMBCAA+FiEEB/Y4DM3Ba2H9iXmlPO9G70C+/D4FAmC2K2cCGwMFCQPCZwAFCwkI
-BwIGFQoJCAsCBBYCAwECHgECF4AACgkQPO9G70C+/D59/Av/XZIhCH4X2FpxCO3d
-oCa+sbYkBL5xeUoPfAx5ThXzqL/tllO88TKTMEGZF3k5pocXWH0xmhqlvDTcdb0i
-W3O0CN8FLmuotU51c0JC1mt9zwJP9PeJNyqxrMm01Yzj55z/Dz3QHSTlDjrWTWjn
-YBqDf2HfdM177oydfSYmevZni1aDmBalWpFPRvqISCO7uFnvg1hJQ5mD/0qie663
-QJ8LAAANg32H9DyPnYi9wU62WX0DMUVTjKctT3cnYCbirjjJ7ZlCCm+cf61CRX1B
-E1Ng/Ef3ZcUfXWitZSjfET/pKEMSNjsQawFpZ/LPCBl+UPHzaTPAASeGJvcbZ3py
-wZQLQc1MCu2hmMBQ8zHQTdS2Pp0RISxCQLYvVQL6DrcJDNiSqn9p9RQt5c5r5Pjx
-80BIPcjj3glOVP7PYE2azQAkt6reEjhimwCfjeDpiPnkBTY7Av2jCcUFhhemDY/j
-TRXK1paLphhJ36zC22SeHGxNNakjjuUakqB85DEUeoWuVm6ouQGNBGC2K2cBDADx
-G2rIAgMjdPtofhkEZXwv6zdNwmYOlIIM+59bam9Ep/vFq8F5f+xldevm5dvM8SeR
-pNwDGSOUf5OKBWBdsJFhlYBl7+EcKd/Tent/XS6JoA9ffF33b+r04L543+ykiKON
-WYeYi0F4WwYTIQgqZHJze1sPVkYGR5F0bL8PAcLuwd5dzZVi/q2HakrGdg29N8oY
-b/XnoR7FflPrNYdzO6hawi5Inx7KS7aWa0ZkARb0F4HSct+/m6nAZVsoJINLudyQ
-ut2NWeU8rWIm1hqyIxQFvuQJy46umq++10J/sWA98bkg41Rx+72+eP7DM5v8IgUp
-clJsfljRXIBWbmRAVZvtNI7PX9fwMMhf4M7wHO7G2WV39o1exKps5xFFcn8PUQiX
-jCSR81M145CgCdmLUR1y0pdkN/WIqjXBhkPIvO2dxEcodMNHb1aUUuUOnww6+xIP
-8rGVw+a2DUiALc8Qr5RP21AYKRctfiwhSQh2KODveMtyLI3U9C/eLRPp+QM3XB8A
-EQEAAYkBvAQYAQgAJhYhBAf2OAzNwWth/Yl5pTzvRu9Avvw+BQJgtitnAhsMBQkD
-wmcAAAoJEDzvRu9Avvw+3FcMAJBwupyJ4zwQFxTJ5BkDlusG3U2FXEf3bDrXhvNd
-qi8eS8Vo/vRiH/w/my5JFpz1o2tJToryF71D+uF5DTItalKquhsQ9reAEmXggqOh
-9Jd9mWJIEEWcRORiLNDKENKvE8bouw4U4hRaSF0IaGzAe5mO+oOvwal8L97wFxrZ
-4leM1GzkopiuNfbkkBBw2KJcMjYBHzzXSCALnVwhjbgkBEWPIg38APT3cr9KfnMM
-q8+tvsGLj4piAl3Lww7+GhSsDOUXH8btR41BSAQDrbO5q6oi/h4nuxoNmQIDW/Ug
-s+dd5hnY2FtHRjb4FCR9kAjdTE6stc8wzohWfbg1N+12TTA2ylByAumICVXixavH
-RJ7l0OiWJk388qw9mqh3k8HcBxL7OfDlFC9oPmCS0iYiIwW/Yc80kBhoxcvl/Xa7
-mIMMn8taHIaQO7v9ln2EVQYTzbNCmwTw9ovTM0j/Pbkg2EftfP1TCoxQHvBnsCED
-6qgtsUdi5eviONRkBgeZtN3oxA==
-=MgDv
+mQENBFmGWN4BCAC18V4tVGO65VLCV7p14FuXJlUtZ5CuYMvgEkcOqrvRaBSW9ao4
+PGESOhJpfWpnW3QgJniYndLzPpsmdHEclEER6aZjiNgReWPOjHD5tykWocZAJqXD
+eY1ym59gvVMLcfbV2yQsyR2hbJlc+dJsl16tigSEe3nwxZSw2IsW92pgEzT9JNUr
+Q+mC8dw4dqY0tYmFazYUGNxufUc/twgQT/Or1aNs0az5Q6Jft4rrTRsh/S7We0VB
+COKGkdcQyYgAls7HJBuPjQRi6DM9VhgBSHLAgSLyaUcZvhZBJr8Qe/q4PP3/kYDJ
+wm4RMnjOLz2pFZPgtRqgcAwpmFtLrACbEB3JABEBAAG0GlVzZXIyIDx1c2VyMjFA
+ZXhhbXBsZS5jb20+iQFUBBMBCAA+FiEEPOLHOjPSO42DWM57+r85c5/h6ScFAlmG
+WN4CGwMFCQPCZwAFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQ+r85c5/h6Sfx
+Lgf/dq64NBV8+X9an3seaLxePRviva48e4K67/wV/JxtXNO5Z/DhMGz5kHXCsG9D
+CXuWYO8ehlTjEnMZ6qqdDnY+H6bQsb2OS5oPn4RwpPXslAjEKtojPAr0dDsMS2DB
+dUuIm1AoOnewOVO0OFRf1EqX1bivxnN0FVMcO0m8AczfnKDaGb0y/qg/Y9JAsKqp
+j5pZNMWUkntRtGySeJ4CVJMmkVKJAHsa1Qj6MKdFeid4h4y94cBJ4ZdyBxNdpQOx
+ydf0doicovfeqGNO4oWzsGP4RBK2CqGPCUT+EFl20jPvMkKwOjxgqc8p0z3b2UT9
+9bnmCGHgF/fW1HJ3iKmfFPqnLkBDQRZhljeAQgA5AirU/NJGgm19ZJYFOiHftjS
+azbrPxGeD3cSqmvDPIMc1DNZGfQV5D4EVumnVbQBtL6xHFoGKz9KisUMbe4a/X2J
+S8JmIphQWG0vMJX1DaZIzr2gT71MnPD7JMGsSUCh5dIKpTNTZX4w+oGPGOu0/UlL
+x0448AryKwp30J2p6D4GeI0nb03n35S2lTOpnHDn1wj7Jl/8LS2fdFOdNaNHXSZe
+twdSwJKhyBEiScgeHBDyKqo8zWkYoSb9eA2HiYlbVaiNtp24KP1mIEpiUdrRjWno
+zauYSZGHZlOFMgF4dKWuetPiuH9m7UYZGKyMLfQ9vYFb+xcPh2bLCQHJ1OEmMQAR
+AQABiQE8BBgBCAAmFiEEPOLHOjPSO42DWM57+r85c5/h6ScFAlmGWN4CGwwFCQPC
+ZwAACgkQ+r85c5/h6Sfjfwf+O4WEjRdvPJLxNy7mfAGoAqDMHIwyH/tVzYgyVhnG
+h/+cfRxJbGc3rpjYdr8dmvghzjEAout8uibPWaIqs63RCAPGPqgWLfxNO5c8+y8V
+LZMVOTV26l2olkkdBWAuhLqKTNh6TiQva03yhOgHWj4XDvFfxICWPFXVd6t5ELpD
+iApGu1OAj8JfhmzbG03Yzx+Ku7bWDxMonx3V/IDEu5LS5zrboHYDKCA53bXXghoi
+Aceqql+PKrDwEjoY4bptwMHLmcjGjdCQ//Qx1neho7nZcS7xjTucY8gQuulwCyXF
+y6wM+wMz8dunIG9gw4+Re6c4Rz9tX1kzxLrU7Pl21tMqfg==
+=0N/9
 -----END PGP PUBLIC KEY BLOCK-----`)
 }
--- a/integrations/api_helper_for_declarative_test.go
+++ b/integrations/api_helper_for_declarative_test.go
@@ -14,9 +14,9 @@ import (
 	"time"

 	"code.gitea.io/gitea/models"
+	auth "code.gitea.io/gitea/modules/forms"
 	"code.gitea.io/gitea/modules/queue"
 	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/services/forms"

 	jsoniter "github.com/json-iterator/go"
 	"github.com/stretchr/testify/assert"
@@ -263,7 +263,7 @@ func doAPIMergePullRequest(ctx APITestContext, owner, repo string, index int64)
 	return func(t *testing.T) {
 		urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge?token=%s",
 			owner, repo, index, ctx.Token)
-		req := NewRequestWithJSON(t, http.MethodPost, urlStr, &forms.MergePullRequestForm{
+		req := NewRequestWithJSON(t, http.MethodPost, urlStr, &auth.MergePullRequestForm{
 			MergeMessageField: "doAPIMergePullRequest Merge",
 			Do:                string(models.MergeStyleMerge),
 		})
@@ -275,7 +275,7 @@ func doAPIMergePullRequest(ctx APITestContext, owner, repo string, index int64)
 			DecodeJSON(t, resp, &err)
 			assert.EqualValues(t, "Please try again later", err.Message)
 			queue.GetManager().FlushAll(context.Background(), 5*time.Second)
-			req = NewRequestWithJSON(t, http.MethodPost, urlStr, &forms.MergePullRequestForm{
+			req = NewRequestWithJSON(t, http.MethodPost, urlStr, &auth.MergePullRequestForm{
 				MergeMessageField: "doAPIMergePullRequest Merge",
 				Do:                string(models.MergeStyleMerge),
 			})
@@ -298,7 +298,7 @@ func doAPIManuallyMergePullRequest(ctx APITestContext, owner, repo, commitID str
 	return func(t *testing.T) {
 		urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge?token=%s",
 			owner, repo, index, ctx.Token)
-		req := NewRequestWithJSON(t, http.MethodPost, urlStr, &forms.MergePullRequestForm{
+		req := NewRequestWithJSON(t, http.MethodPost, urlStr, &auth.MergePullRequestForm{
 			Do:            string(models.MergeStyleManuallyMerged),
 			MergeCommitID: commitID,
 		})
--- a/integrations/api_issue_reaction_test.go
+++ b/integrations/api_issue_reaction_test.go
@@ -61,7 +61,7 @@ func TestAPIIssuesReactions(t *testing.T) {
 	DecodeJSON(t, resp, &apiReactions)
 	expectResponse := make(map[int]api.Reaction)
 	expectResponse[0] = api.Reaction{
-		User:     convert.ToUser(user2, user2),
+		User:     convert.ToUser(user2, true, true),
 		Reaction: "eyes",
 		Created:  time.Unix(1573248003, 0),
 	}
@@ -121,12 +121,12 @@ func TestAPICommentReactions(t *testing.T) {
 	DecodeJSON(t, resp, &apiReactions)
 	expectResponse := make(map[int]api.Reaction)
 	expectResponse[0] = api.Reaction{
-		User:     convert.ToUser(user2, user2),
+		User:     convert.ToUser(user2, true, true),
 		Reaction: "laugh",
 		Created:  time.Unix(1573248004, 0),
 	}
 	expectResponse[1] = api.Reaction{
-		User:     convert.ToUser(user1, user1),
+		User:     convert.ToUser(user1, true, true),
 		Reaction: "laugh",
 		Created:  time.Unix(1573248005, 0),
 	}
--- a/integrations/api_issue_test.go
+++ b/integrations/api_issue_test.go
@@ -25,10 +25,9 @@ func TestAPIListIssues(t *testing.T) {

 	session := loginUser(t, owner.Name)
 	token := getTokenForLoggedInUser(t, session)
-	link, _ := url.Parse(fmt.Sprintf("/api/v1/repos/%s/%s/issues", owner.Name, repo.Name))
-
-	link.RawQuery = url.Values{"token": {token}, "state": {"all"}}.Encode()
-	resp := session.MakeRequest(t, NewRequest(t, "GET", link.String()), http.StatusOK)
+	req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/issues?state=all&token=%s",
+		owner.Name, repo.Name, token)
+	resp := session.MakeRequest(t, req, http.StatusOK)
 	var apiIssues []*api.Issue
 	DecodeJSON(t, resp, &apiIssues)
 	assert.Len(t, apiIssues, models.GetCount(t, &models.Issue{RepoID: repo.ID}))
@@ -37,34 +36,15 @@ func TestAPIListIssues(t *testing.T) {
 	}

 	// test milestone filter
-	link.RawQuery = url.Values{"token": {token}, "state": {"all"}, "type": {"all"}, "milestones": {"ignore,milestone1,3,4"}}.Encode()
-	resp = session.MakeRequest(t, NewRequest(t, "GET", link.String()), http.StatusOK)
+	req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/issues?state=all&type=all&milestones=ignore,milestone1,3,4&token=%s",
+		owner.Name, repo.Name, token)
+	resp = session.MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &apiIssues)
 	if assert.Len(t, apiIssues, 2) {
 		assert.EqualValues(t, 3, apiIssues[0].Milestone.ID)
 		assert.EqualValues(t, 1, apiIssues[1].Milestone.ID)
 	}

-	link.RawQuery = url.Values{"token": {token}, "state": {"all"}, "created_by": {"user2"}}.Encode()
-	resp = session.MakeRequest(t, NewRequest(t, "GET", link.String()), http.StatusOK)
-	DecodeJSON(t, resp, &apiIssues)
-	if assert.Len(t, apiIssues, 1) {
-		assert.EqualValues(t, 5, apiIssues[0].ID)
-	}
-
-	link.RawQuery = url.Values{"token": {token}, "state": {"all"}, "assigned_by": {"user1"}}.Encode()
-	resp = session.MakeRequest(t, NewRequest(t, "GET", link.String()), http.StatusOK)
-	DecodeJSON(t, resp, &apiIssues)
-	if assert.Len(t, apiIssues, 1) {
-		assert.EqualValues(t, 1, apiIssues[0].ID)
-	}
-
-	link.RawQuery = url.Values{"token": {token}, "state": {"all"}, "mentioned_by": {"user4"}}.Encode()
-	resp = session.MakeRequest(t, NewRequest(t, "GET", link.String()), http.StatusOK)
-	DecodeJSON(t, resp, &apiIssues)
-	if assert.Len(t, apiIssues, 1) {
-		assert.EqualValues(t, 1, apiIssues[0].ID)
-	}
 }

 func TestAPICreateIssue(t *testing.T) {
@@ -85,8 +65,8 @@ func TestAPICreateIssue(t *testing.T) {
 	resp := session.MakeRequest(t, req, http.StatusCreated)
 	var apiIssue api.Issue
 	DecodeJSON(t, resp, &apiIssue)
-	assert.Equal(t, body, apiIssue.Body)
-	assert.Equal(t, title, apiIssue.Title)
+	assert.Equal(t, apiIssue.Body, body)
+	assert.Equal(t, apiIssue.Title, title)

 	models.AssertExistsAndLoadBean(t, &models.Issue{
 		RepoID:     repoBefore.ID,
@@ -222,20 +202,6 @@ func TestAPISearchIssues(t *testing.T) {
 	resp = session.MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &apiIssues)
 	assert.Len(t, apiIssues, 1)
-
-	query = url.Values{"milestones": {"milestone1"}, "state": {"all"}}
-	link.RawQuery = query.Encode()
-	req = NewRequest(t, "GET", link.String())
-	resp = session.MakeRequest(t, req, http.StatusOK)
-	DecodeJSON(t, resp, &apiIssues)
-	assert.Len(t, apiIssues, 1)
-
-	query = url.Values{"milestones": {"milestone1,milestone3"}, "state": {"all"}}
-	link.RawQuery = query.Encode()
-	req = NewRequest(t, "GET", link.String())
-	resp = session.MakeRequest(t, req, http.StatusOK)
-	DecodeJSON(t, resp, &apiIssues)
-	assert.Len(t, apiIssues, 2)
 }

 func TestAPISearchIssuesWithLabels(t *testing.T) {
--- a/integrations/api_notification_test.go
+++ b/integrations/api_notification_test.go
@@ -45,14 +45,14 @@ func TestAPINotification(t *testing.T) {

 	assert.Len(t, apiNL, 3)
 	assert.EqualValues(t, 4, apiNL[0].ID)
-	assert.True(t, apiNL[0].Unread)
-	assert.False(t, apiNL[0].Pinned)
+	assert.EqualValues(t, true, apiNL[0].Unread)
+	assert.EqualValues(t, false, apiNL[0].Pinned)
 	assert.EqualValues(t, 3, apiNL[1].ID)
-	assert.False(t, apiNL[1].Unread)
-	assert.True(t, apiNL[1].Pinned)
+	assert.EqualValues(t, false, apiNL[1].Unread)
+	assert.EqualValues(t, true, apiNL[1].Pinned)
 	assert.EqualValues(t, 2, apiNL[2].ID)
-	assert.False(t, apiNL[2].Unread)
-	assert.False(t, apiNL[2].Pinned)
+	assert.EqualValues(t, false, apiNL[2].Unread)
+	assert.EqualValues(t, false, apiNL[2].Pinned)

 	// -- GET /repos/{owner}/{repo}/notifications --
 	req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/notifications?status-types=unread&token=%s", user2.Name, repo1.Name, token))
@@ -74,8 +74,8 @@ func TestAPINotification(t *testing.T) {
 	DecodeJSON(t, resp, &apiN)

 	assert.EqualValues(t, 5, apiN.ID)
-	assert.False(t, apiN.Pinned)
-	assert.True(t, apiN.Unread)
+	assert.EqualValues(t, false, apiN.Pinned)
+	assert.EqualValues(t, true, apiN.Unread)
 	assert.EqualValues(t, "issue4", apiN.Subject.Title)
 	assert.EqualValues(t, "Issue", apiN.Subject.Type)
 	assert.EqualValues(t, thread5.Issue.APIURL(), apiN.Subject.URL)
--- a/integrations/api_oauth2_apps_test.go
+++ b/integrations/api_oauth2_apps_test.go
@@ -123,7 +123,7 @@ func testAPIGetOAuth2Application(t *testing.T) {
 	assert.EqualValues(t, existApp.ClientID, expectedApp.ClientID)
 	assert.Len(t, expectedApp.ClientID, 36)
 	assert.Empty(t, expectedApp.ClientSecret)
-	assert.Len(t, expectedApp.RedirectURIs, 1)
+	assert.EqualValues(t, len(expectedApp.RedirectURIs), 1)
 	assert.EqualValues(t, existApp.RedirectURIs[0], expectedApp.RedirectURIs[0])
 	models.AssertExistsAndLoadBean(t, &models.OAuth2Application{ID: expectedApp.ID, Name: expectedApp.Name})
 }
@@ -156,7 +156,7 @@ func testAPIUpdateOAuth2Application(t *testing.T) {
 	DecodeJSON(t, resp, &app)
 	expectedApp := app

-	assert.Len(t, expectedApp.RedirectURIs, 2)
+	assert.EqualValues(t, len(expectedApp.RedirectURIs), 2)
 	assert.EqualValues(t, expectedApp.RedirectURIs[0], appBody.RedirectURIs[0])
 	assert.EqualValues(t, expectedApp.RedirectURIs[1], appBody.RedirectURIs[1])
 	models.AssertExistsAndLoadBean(t, &models.OAuth2Application{ID: expectedApp.ID, Name: expectedApp.Name})
--- a/integrations/api_org_test.go
+++ b/integrations/api_org_test.go
@@ -69,7 +69,7 @@ func TestAPIOrgCreate(t *testing.T) {
 		// user1 on this org is public
 		var users []*api.User
 		DecodeJSON(t, resp, &users)
-		assert.Len(t, users, 1)
+		assert.EqualValues(t, 1, len(users))
 		assert.EqualValues(t, "user1", users[0].UserName)
 	})
 }
--- a/integrations/api_pull_commits_test.go
+++ b/integrations/api_pull_commits_test.go
@@ -1,37 +0,0 @@
-// Copyright 2021 The Gitea Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package integrations
-
-import (
-	"net/http"
-	"testing"
-
-	"code.gitea.io/gitea/models"
-	api "code.gitea.io/gitea/modules/structs"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestAPIPullCommits(t *testing.T) {
-	defer prepareTestEnv(t)()
-	pullIssue := models.AssertExistsAndLoadBean(t, &models.PullRequest{ID: 2}).(*models.PullRequest)
-	assert.NoError(t, pullIssue.LoadIssue())
-	repo := models.AssertExistsAndLoadBean(t, &models.Repository{ID: pullIssue.HeadRepoID}).(*models.Repository)
-
-	session := loginUser(t, "user2")
-	req := NewRequestf(t, http.MethodGet, "/api/v1/repos/%s/%s/pulls/%d/commits", repo.OwnerName, repo.Name, pullIssue.Index)
-	resp := session.MakeRequest(t, req, http.StatusOK)
-
-	var commits []*api.Commit
-	DecodeJSON(t, resp, &commits)
-
-	if !assert.Len(t, commits, 2) {
-		return
-	}
-
-	assert.Equal(t, "5f22f7d0d95d614d25a5b68592adb345a4b5c7fd", commits[0].SHA)
-	assert.Equal(t, "4a357436d925b5c974181ff12a994538ddc5a269", commits[1].SHA)
-}
-
-// TODO add tests for already merged PR and closed PR
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
6543	55e159ca5f	Changelog v1.14.0 (#15360 ) * clean & merge & update v1.14.0 changelog * backport v1.13.x changelogs	2021-04-11 06:07:02 +02:00
Lunny Xiao	87074ec860	Fix delete nonexist oauth application 500 and prevent deadlock (#15384 ) (#15396 ) * Fix delete nonexist oauth application 500 * Fix test * Close the session * Fix more missed sess.Close * Remove unnecessary blank line Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Andrew Thornton <art27@cantab.net> Co-authored-by: 6543 <6543@obermui.de>	2021-04-11 04:57:44 +02:00
zeripath	1fe5fe419e	Always set the merge base used to merge the commit (#15352 ) (#15385 ) Backport #15352 The issue is that the TestPatch will reset the PR MergeBase - and it is possible for TestPatch to update the MergeBase whilst a merge is ongoing. The ensuing merge will then complete but it doesn't re-set the MergeBase it used to merge the PR. Fixes the intermittent error in git test. Signed-off-by: Andrew Thornton art27@cantab.net	2021-04-10 14:08:30 +02:00
zeripath	67a12b8fac	Turn RepoRef and RepoAssignment back into func(*Context) (#15372 ) (#15377 ) Backport #15372 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>	2021-04-09 22:24:40 -04:00
silverwind	e861dcbbaf	Dropzone styling improvements (#15291 ) (#15374 ) * Dropzone styling improvements - Move all dropzone styles to separate file - Fix white background in arc-green - Fix rendering of non-square images and previews * increase thumbnail quality, set contain in js, replace blur effect with opacity Co-authored-by: techknowlogick <techknowlogick@gitea.io>	2021-04-09 19:43:36 -04:00
zeripath	53c2136a9a	Upgrade to bluemonday 1.0.7 (#15379 ) (#15380 ) * Upgrade to bluemonday 1.0.7 (#15379) Backport #15379 Fix #15349 Signed-off-by: Andrew Thornton <art27@cantab.net> * resolve CI Co-authored-by: techknowlogick <techknowlogick@gitea.io>	2021-04-09 19:41:30 -04:00
zeripath	24ebc7e517	Move FCGI req.URL.Path fix-up to the FCGI listener (#15292 ) (#15361 ) Backport #15292 Simplify the web.go FCGI path by moving the req.URL.Path fix-up to listener Signed-off-by: Andrew Thornton <art27@cantab.net>	2021-04-09 17:45:02 +01:00
6543	b072907987	Fix `admin user list` (#15358 ) (#15359 ) * Fix `admin user list` (#15358) * fix routers/api/v1/repo/issue.go	2021-04-09 12:39:40 +02:00
silverwind	942b0360ad	Fix button border issue (#15351 )	2021-04-09 05:38:06 +02:00
silverwind	1ec4913add	Disable cssnano's colormin plugin (#15348 ) It produces odd rgba values which also seem to cause issues in monaco's color parser where the scoll shadow went red for some reason. Regression by: https://github.com/go-gitea/gitea/pull/15333	2021-04-09 03:54:24 +02:00
zeripath	16e34025b4	Show diff on rename with diff changes (#15338 ) (#15339 ) Backport #15338 More recent versions of git have increased support for detection of renames meaning that a rename with diff changes is now supported. Although ParsePatch supports this - our templates do not and the simplest solution is simply to show the diff. Fix #15335 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: 6543 <6543@obermui.de>	2021-04-08 15:36:17 -04:00
zeripath	456d63b6cf	Prepend AppSubUrl to links for default avatar (#15341 ) (#15342 ) Backport #15341 Fix #15334 Signed-off-by: Andrew Thornton <art27@cantab.net>	2021-04-08 17:51:10 +01:00
zeripath	798ac3f85a	Fix handling of logout event (#15323 ) (#15337 ) Backport #15323 It appears that there is a slight bug in the handling of the data of logout event - the javascript should be testing the data field of the data field for the logout instruction. Signed-off-by: Andrew Thornton <art27@cantab.net>	2021-04-08 17:28:30 +02:00
silverwind	460093b952	Monaco improvements (#15333 ) (#15345 ) - Create theme at runtime which follows the CSS variables of the site - Disable a few opinionated Monaco defaults like minimap and word highlights - Move styles to separate file	2021-04-08 13:24:23 +02:00
6543	38d184d518	Fix CanCreateRepo check (#15311 ) (#15321 ) Signed-off-by: jolheiser <john.olheiser@gmail.com> Co-authored-by: John Olheiser <john.olheiser@gmail.com>	2021-04-07 22:14:11 +02:00
6543	80b55263d8	Fix xorm log stack level (#15285 ) (#15316 ) Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>	2021-04-07 08:36:15 +01:00
6543	32232db55f	Reduce memory usage in testgit (#15306 ) (#15310 ) * reduce memory use in rawtest * just use hashsum for diffs Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io>	2021-04-07 11:07:39 +08:00
KN4CK3R	cf9b6c281f	Close file on invalid range (Addition to #15166 ) (#15268 ) (#15308 ) * Close file on invalid range. * Close on seek error Signed-off-by: Andrew Thornton <art27@cantab.net> * Moved 'Seek' into server. * io.ReadSeekCloser is only available in Go 1.16 Co-authored-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lauris BH <lauris@nix.lv> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lauris BH <lauris@nix.lv> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: techknowlogick <techknowlogick@gitea.io>	2021-04-06 15:25:31 -04:00
6543	a8c6a4a70e	Fix bug in Wrap (#15302 ) (#15309 ) Whilst doing other work I have noticed that there is an issue with Wrap when passing an http.Handler - the next should be the next handler in line not empty. Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: zeripath <art27@cantab.net>	2021-04-06 18:44:24 +02:00
6543	e6050e80f7	Update to bluemonday-1.0.6 (#15294 ) (#15297 ) Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: zeripath <art27@cantab.net>	2021-04-06 01:36:58 +01:00
zeripath	3803b15d76	Drop the event source if we are unauthorized (#15275 ) (#15280 ) Backport #15275 A previous commit that sent unauthorized if the user is unauthorized simply leads to the repeated reopening of the eventsource. # This PR changes the event returned to tell the client to close the eventsource and thus prevents the repeated reopening. Signed-off-by: Andrew Thornton <art27@cantab.net>	2021-04-04 20:39:22 -04:00
zeripath	af73e1ee35	Add size to Save function (#15264 ) (#15270 ) This PR proposes an alternative solution to #15255 - just add the size to the save function. Yes it is less apparently clean but it may be more correct. Close #15255 Fix #15253 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>	2021-04-04 12:04:55 -04:00
silverwind	4bc8dfc6a3	Branch page and misc css improvements (#15208 ) (#15274 ) - Improve branches page, increase icon size, use octicons, use css vars - Style placeholder color via css var - Slightly increase contrast of input fields and active/hover states - Add styling for select boxes in arc-green	2021-04-04 16:31:54 +03:00
techknowlogick	33c4e246fe	update golang libraries (#15258 ) (#15259 )	2021-04-03 10:42:18 +02:00
KN4CK3R	8ec7beb9f4	Fix graph pagination (#15225 ) (#15249 ) * Fixed invalid HTML tag. * Fixed pagination. * Update templates/repo/graph/commits.tmpl Co-authored-by: zeripath <art27@cantab.net>	2021-04-02 04:29:14 +01:00
a1012112796	c6eb9b30ae	response 404 for diff/patch of a commit that not exist (#15221 ) (#15237 ) * response 404 for diff/patch of a commit that not exist fix #15217 Signed-off-by: a1012112796 <1012112796@qq.com> * Update routers/repo/commit.go Co-authored-by: silverwind <me@silverwind.io> * use ctx.NotFound() Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: 6543 <6543@obermui.de>	2021-04-01 19:57:05 -04:00
zeripath	f75a9b27b0	Speed up `enry.IsVendor` (#15213 ) (#15245 ) Backport #15213 `enry.IsVendor` is kinda slow as it simply iterates across all regexps. This PR ajdusts the regexps to combine them to make this process a little quicker. Related #15143 Signed-off-by: Andrew Thornton <art27@cantab.net>	2021-04-02 01:16:00 +02:00
zeripath	2705696d4d	Prevent NPE in CommentMustAsDiff if no hunk header (#15199 ) (#15200 ) Backport #15199 I do not understand how this can happen or why. There is an apparent possibility for a comment.Patch to be missing a hunk header - this should not happen and do not understand how. But it appears to happen on 1.13 at least in some case. This PR will simply add a new section if the cursection is empty thus preventing the NPE. Fix #15198 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: 6543 <6543@obermui.de>	2021-04-01 15:14:56 -04:00
mayswind	2b68f66e0e	Fix timezone bug when clicking heatmap (#15141 ) (#15231 )	2021-04-01 18:22:54 +08:00
silverwind	5c7d30cf52	Diff box fixes (#15214 ) (#15227 ) - Fix misaligned "Show Outdated" buttons via flexbox - Add hover effect to "Show Outdated" buttons - Remove overreaching margin from selector .diff-file-box and handle cases individually. Fixes: https://github.com/go-gitea/gitea/issues/15097 Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io>	2021-04-01 08:04:47 +03:00
zeripath	e520dff4da	Improve /api/v1/repos/issues/search by just getting repo ids (#15179 ) (#15192 ) Backport #15179 /api/v1/repos/issues/search is a highly inefficient search which is unfortunately the basis for our dependency searching algorithm. In particular it currently loads all of the repositories and their owners and their primary coding language all of which is immediately thrown away. This PR makes one simple change - just get the IDs. Related #14560 Related #12827 Signed-off-by: Andrew Thornton <art27@cantab.net>	2021-04-01 01:15:08 +02:00
zeripath	2bc759518e	Fix regression from #14623 - use debug SVC handler only on interactive sessions (#15210 ) (#15211 ) Backport #15210 Unfortunately #14623 changed from the deprecated IsInteractiveSession to IsWindowsService without recognising that they are the complement of each other. This means that Windows SVC control is not working correctly. This PR adds some Tracing statements but also fixes the bug. Fix #15159 Signed-off-by: Andrew Thornton <art27@cantab.net>	2021-03-31 20:49:46 +01:00
a1012112796	92b2883058	add 'fonts' into 'KnownPublicEntries' (#15188 ) (#15218 ) fix #15184 Signed-off-by: a1012112796 <1012112796@qq.com> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>	2021-03-31 04:56:19 +02:00
silverwind	0ebfc1405c	Fix webhook delivery and issue checklist for arc-green (#15195 ) (#15204 ) Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>	2021-03-30 19:15:12 +08:00
silverwind	fd5c67226e	Fix margin between avatars on org pages (#15194 ) (#15197 ) Fixes: https://github.com/go-gitea/gitea/issues/15191	2021-03-29 23:36:00 +02:00
a1012112796	61308825a6	should run RetrieveRepoMetas() for empty pr (#15187 ) (#15190 ) Signed-off-by: a1012112796 <1012112796@qq.com>	2021-03-29 17:02:01 +01:00
Norwin	0cccad04f0	fix org navbar (#15174 ) Co-authored-by: Jimmy Praet <jimmy.praet@telenet.be>	2021-03-27 15:57:02 +01:00
zeripath	a0e5c49ac3	Clusterfuzz found another way (#15160 ) (#15168 ) Backport #15160 Clusterfuzz found another way so I found another way to stop it Signed-off-by: Andrew Thornton <art27@cantab.net>	2021-03-26 22:48:38 -04:00
sotho	3558310c1f	Fix wrong user returned in API (#15139 ) (#15151 ) The API call: GET /repos/{owner}/{repo}/pulls/{index}/reviews/{id}/comments returns always the reviewer, but should return the poster. Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: zeripath <art27@cantab.net>	2021-03-26 04:20:52 +01:00
zeripath	e99534cfd2	Fix Migration 176 yet again (#15132 ) Backport #15131 Whilst creating a test for v176 in the migrations_test PR it has become clear that this was still wrong. This is now fixed. Genuinely. Also fix repo transfer Signed-off-by: Andrew Thornton <art27@cantab.net>	2021-03-23 23:18:05 +00:00
6543	27acf6165e	update changelog for rc2 release (#15130 )	2021-03-23 15:52:43 -04:00
zeripath	f286a28568	Fix consistency check (#15120 ) (#15128 ) In my last fix I missed adding the label_ prefix to the consistency check count. Signed-off-by: Andrew Thornton <art27@cantab.net>	2021-03-23 20:20:34 +01:00
6543	b5c4cb1bde	Fix bug on avatar middleware (#15124 ) (#15126 ) Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>	2021-03-23 18:44:37 +00:00
6543	26b98417ad	[Vendor] update gitea-sdk v0.14.0 (#15103 ) (#15107 ) * upgraded code.gitea.io/sdk/gitea v0.13.2 => v0.14.0 * rm workaround	2021-03-23 10:10:32 +00:00
zeripath	8b0cf88c0c	Changelog for v1.14-rc2 (#15115 ) Signed-off-by: Andrew Thornton <art27@cantab.net>	2021-03-22 22:00:51 +01:00
zeripath	23db3375df	Fix another clusterfuzz identified issue (#15096 ) (#15113 ) Backport #15096 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: 6543 <6543@obermui.de>	2021-03-22 15:16:08 -04:00
zeripath	14011d77c9	Fix the v176 migration (#15110 ) (#15111 ) Backport #15110 There is a serious issue with the v176 migration where there is a mistaken missing label_id selection. Signed-off-by: Andrew Thornton <art27@cantab.net>	2021-03-22 14:47:58 -04:00
silverwind	5519e26c2f	Fix lock modal content rendering outside modal (#15095 ) (#15100 ) * Fix lock modal content rendering outside modal The .content was not a child to .modal so was rendering outside. This is a recent regression but I'm not certain when it was introduced. * remove extraneous closing div Co-authored-by: zeripath <art27@cantab.net>	2021-03-22 02:00:42 +01:00
zeripath	6feb435867	Place wrapper around comment as diff to catch panics (#15085 ) (#15094 ) Backport #15085 There are a few recurrent issues with comment as diff reporting panics that are resistant to fixing due to the fact that the panic occurs in the template render and is swallowed by the template renderer. This PR just adds some logging to force the panic to properly logged and re-propagates back up to the template renderer so we can actually detect what the issue is. Signed-off-by: Andrew Thornton art27@cantab.net	2021-03-21 23:41:40 +01:00
silverwind	61444ed8ca	Fix markdown rendering in milestone content (#15056 ) (#15091 ) - Add missing markdown class for rendered markdown. - Increase font size of milestone name in list. Fixes: https://github.com/go-gitea/gitea/issues/15046	2021-03-21 18:57:06 +01:00
6543	d770cc9886	Remove possible resource leak (#15067 ) (#15082 ) * move "copy uploaded lfs files 2 repo" to own function for "defer file.Close()" * rm type overload Co-authored-by: zeripath <art27@cantab.net>	2021-03-21 17:07:37 +01:00
a1012112796	fbaa01998a	fix double 'push tag' action feed (#15078 ) (#15083 ) Signed-off-by: a1012112796 <1012112796@qq.com>	2021-03-21 14:51:31 +00:00
Lauris BH	ac2ae66ae7	Handle unauthorized user events gracefully (#15071 ) (#15074 )	2021-03-21 10:21:28 +00:00
Lauris BH	ed60fe0986	Update release date (#15065 ) * Update release date * Remove unneeded entry	2021-03-20 21:29:01 +08:00
zeripath	29e0d62790	Update to goldmark 1.3.3 (#15059 ) (#15060 ) Backport #15059 Signed-off-by: Andrew Thornton <art27@cantab.net>	2021-03-20 12:24:09 +01:00
6543	7b464fa67b	Fix bug when upload on web (#15042 ) (#15054 ) * Fix bug when upload on web * move into own function Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: zeripath <art27@cantab.net>	2021-03-20 09:37:57 +08:00