Merge branch 'master' of git://github.com/go-gitea/gitea

Author: aswild

.drone.yml

@@ -455,7 +455,6 @@ trigger:
 
 depends_on:
   - testing
-  - translations
 
 steps:
   - name: fetch-tags
@@ -571,6 +570,15 @@ workspace:
   base: /go
   path: src/code.gitea.io/gitea
 
+depends_on:
+  - testing
+
+trigger:
+  ref:
+  - refs/heads/master
+  - "refs/tags/**"
+  - "refs/pull/**"
+
 steps:
   - name: fetch-tags
     pull: default
@@ -584,56 +592,28 @@ steps:
 
   - name: dryrun
     pull: always
-    image: plugins/docker:18.09
+    image: plugins/docker:linux-amd64
     settings:
-      cache_from: gitea/gitea
       dry_run: true
       repo: gitea/gitea
     when:
       event:
         - pull_request
 
-  - name: release
-    pull: always
-    image: plugins/docker:18.09
-    settings:
-      cache_from: gitea/gitea
-      repo: gitea/gitea
-      tags:
-        - "${DRONE_BRANCH##release/v}"
-    environment:
-      DOCKER_PASSWORD:
-        from_secret: docker_password
-      DOCKER_USERNAME:
-        from_secret: docker_username
-    depends_on:
-      - dryrun
-    when:
-      branch:
-        - "release/*"
-      event:
-        - push
-
-  - name: latest
+  - name: publish
     pull: always
-    image: plugins/docker:18.09
+    image: plugins/docker:linux-amd64
     settings:
-      cache_from: gitea/gitea
-      default_tags: true
+      auto_tag: true
       repo: gitea/gitea
-    environment:
-      DOCKER_PASSWORD:
+      password:
         from_secret: docker_password
-      DOCKER_USERNAME:
+      username:
         from_secret: docker_username
-    depends_on:
-      - dryrun
     when:
-      branch:
-        - master
       event:
-        - push
-        - tag
+        exclude:
+        - pull_request
 
 ---
 kind: pipeline

.eslintrc

@@ -23,3 +23,5 @@ globals:
 
 rules:
   no-unused-vars: [error, {args: all, argsIgnorePattern: ^_, varsIgnorePattern: ^_, ignoreRestSiblings: true}]
+  prefer-const: [2, {destructuring: all}]
+  no-var: [2]

CONTRIBUTING.md

@@ -11,7 +11,7 @@
   - [Translation](#translation)
   - [Code review](#code-review)
   - [Styleguide](#styleguide)
-  - [Sign-off your work](#sign-off-your-work)
+  - [Developer Certificate of Origin (DCO)](#developer-certificate-of-origin-dco)
   - [Release Cycle](#release-cycle)
   - [Maintainers](#maintainers)
   - [Owners](#owners)
@@ -77,7 +77,7 @@ Here's how to run the test suite:
   creates (a default AWS or GCE disk size won't work -- see
   [#6243](https://github.com/go-gitea/gitea/issues/6243)).
 - Change into the base directory of your copy of the gitea repository,
-  and run `drone exec --local --build-event pull_request`.
+  and run `drone exec --event pull_request`.
 
 The drone version, command line, and disk requirements do change over
 time (see [#4053](https://github.com/go-gitea/gitea/issues/4053) and
@@ -157,22 +157,21 @@ import (
 )
 ```
 
-## Sign-off your work
+## Developer Certificate of Origin (DCO)
 
-The sign-off is a simple line at the end of the explanation for the
-patch. Your signature certifies that you wrote the patch or otherwise
-have the right to pass it on as an open-source patch. The rules are
-pretty simple: If you can certify [DCO](DCO), then you just add a line
-to every git commit message:
+We consider the act of contributing to the code by submitting a Pull
+Request as the "Sign off" or agreement to the certifications and terms
+of the [DCO](DCO) and [MIT license](LICENSE). No further action is required.
+Additionally you could add a line at the end of your commit message.
 
 ```
 Signed-off-by: Joe Smith <[email protected]>
 ```
 
-Please use your real name; we really dislike pseudonyms or anonymous
-contributions. We are in the open-source world without secrets. If you
-set your `user.name` and `user.email` git configs, you can sign-off your
-commit automatically with `git commit -s`.
+If you set your `user.name` and `user.email` git configs, you can add the
+line to the end of your commit automatically with `git commit -s`.
+
+We assume in good faith that the information you provide is legally binding.
 
 ## Release Cycle
 

MAINTAINERS

@@ -30,3 +30,4 @@ John Olheiser <[email protected]> (@jolheiser)
 Richard Mahn <[email protected]> (@richmahn)
 Mrsdizzie <[email protected]> (@mrsdizzie)
 silverwind <[email protected]> (@silverwind)
+Gary Kim <[email protected]> (@gary-kim)

README.md

@@ -10,7 +10,7 @@
 [![GoDoc](https://godoc.org/code.gitea.io/gitea?status.svg)](https://godoc.org/code.gitea.io/gitea)
 [![GitHub release](https://img.shields.io/github/release/go-gitea/gitea.svg)](https://github.com/go-gitea/gitea/releases/latest)
 [![Help Contribute to Open Source](https://www.codetriage.com/go-gitea/gitea/badges/users.svg)](https://www.codetriage.com/go-gitea/gitea)
-[![Become a backer/sponsor of gitea](https://opencollective.com/gitea/tiers/backer/badge.svg?label=backer&color=brightgreen)](https://opencollective.com/gitea)
+[![Become a backer/sponsor of gitea](https://opencollective.com/gitea/tiers/backers/badge.svg?label=backer&color=brightgreen)](https://opencollective.com/gitea)
 
 ## Purpose
 

README_ZH.md

@@ -3,13 +3,13 @@
 # Gitea - Git with a cup of tea
 
 [![Build Status](https://drone.gitea.io/api/badges/go-gitea/gitea/status.svg)](https://drone.gitea.io/go-gitea/gitea)
-[![Join the chat at https://img.shields.io/discord/322538954119184384.svg](https://img.shields.io/discord/322538954119184384.svg)](https://discord.gg/NsatcWJ)
+[![Join the chat at https://img.shields.io/discord/322538954119184384.svg](https://img.shields.io/discord/322538954119184384.svg)](https://discord.gg/gitea)
 [![](https://images.microbadger.com/badges/image/gitea/gitea.svg)](https://microbadger.com/images/gitea/gitea "Get your own image badge on microbadger.com")
 [![codecov](https://codecov.io/gh/go-gitea/gitea/branch/master/graph/badge.svg)](https://codecov.io/gh/go-gitea/gitea)
 [![Go Report Card](https://goreportcard.com/badge/code.gitea.io/gitea)](https://goreportcard.com/report/code.gitea.io/gitea)
 [![GoDoc](https://godoc.org/code.gitea.io/gitea?status.svg)](https://godoc.org/code.gitea.io/gitea)
 [![GitHub release](https://img.shields.io/github/release/go-gitea/gitea.svg)](https://github.com/go-gitea/gitea/releases/latest)
-[![Become a backer/sponsor of gitea](https://opencollective.com/gitea/tiers/backer/badge.svg?label=backer&color=brightgreen)](https://opencollective.com/gitea)
+[![Become a backer/sponsor of gitea](https://opencollective.com/gitea/tiers/backers/badge.svg?label=backer&color=brightgreen)](https://opencollective.com/gitea)
 
 ## 目标
 
@@ -25,7 +25,7 @@ Gitea 的首要目标是创建一个极易安装，运行非常快速，安装
 
 ## 文档
 
-关于如何安装请访问我们的 [文档站](https://docs.gitea.io/zh-cn/)，如果没有找到对应的文档，你也可以通过 [Discord - 英文](https://discord.gg/NsatcWJ) 和 QQ群 328432459 来和我们交流。
+关于如何安装请访问我们的 [文档站](https://docs.gitea.io/zh-cn/)，如果没有找到对应的文档，你也可以通过 [Discord - 英文](https://discord.gg/gitea) 和 QQ群 328432459 来和我们交流。
 
 ## 贡献流程
 

custom/conf/app.ini.sample

@@ -281,7 +281,7 @@ DB_RETRY_BACKOFF = 3s
 ISSUE_INDEXER_TYPE = bleve
 ; Issue indexer storage path, available when ISSUE_INDEXER_TYPE is bleve
 ISSUE_INDEXER_PATH = indexers/issues.bleve
-; Issue indexer queue, currently support: channel or levelqueue, default is levelqueue
+; Issue indexer queue, currently support: channel, levelqueue or redis, default is levelqueue
 ISSUE_INDEXER_QUEUE_TYPE = levelqueue
 ; When ISSUE_INDEXER_QUEUE_TYPE is levelqueue, this will be the queue will be saved path,
 ; default is indexers/issues.queue

docs/content/doc/features/comparison.en-us.md

@@ -62,7 +62,7 @@ _Symbols used in table:_
 | Granular user roles (Code, Issues, Wiki etc) | ✓ | ✘ | ✘ | ✓ | ✓ | ✘ | ✘ |
 | Verified Committer | ✘ | ✘ | ? | ✓ | ✓ | ✓ | ✘ |
 | GPG Signed Commits | ✓ | ✘ | ✓ | ✓ | ✓ | ✓ | ✓ |
-| Reject unsigned commits | ✘ | ✘ | ✓ | ✓ | ✓ | ✘ | ✓ |
+| Reject unsigned commits | [✘](https://github.com/go-gitea/gitea/issues/2770) | ✘ | ✓ | ✓ | ✓ | ✘ | ✓ |
 | Repository Activity page | ✓ | ✘ | ✓ | ✓ | ✓ | ✓ | ✓ |
 | Branch manager | ✓ | ✘ | ✓ | ✓ | ✓ | ✓ | ✓ |
 | Create new branches | ✓ | ✘ | ✓ | ✓ | ✓ | ✘ | ✘ |

docs/content/doc/usage/reverse-proxies.en-us.md

@@ -53,7 +53,8 @@ If you want Apache HTTPD to serve your Gitea instance, you can add the following
     ...
     ProxyPreserveHost On
     ProxyRequests off
-    ProxyPass / http://localhost:3000/
+    AllowEncodedSlashes NoDecode
+    ProxyPass / http://localhost:3000/ nocanon
     ProxyPassReverse / http://localhost:3000/
 </VirtualHost>
 ```
@@ -70,9 +71,10 @@ In case you already have a site, and you want Gitea to share the domain name, yo
     <Proxy *>
          Order allow,deny
          Allow from all
+         AllowEncodedSlashes NoDecode
     </Proxy>
 
-    ProxyPass /git http://localhost:3000 # Note: no trailing slash after either /git or port
+    ProxyPass /git http://localhost:3000 nocanon # Note: no trailing slash after either /git or port
     ProxyPassReverse /git http://localhost:3000 # Note: no trailing slash after either /git or port
 </VirtualHost>
 ```

docs/content/doc/usage/reverse-proxies.zh-cn.md

@@ -54,7 +54,8 @@ server {
     ...
     ProxyPreserveHost On
     ProxyRequests off
-    ProxyPass / http://localhost:3000/
+    AllowEncodedSlashes NoDecode
+    ProxyPass / http://localhost:3000/ nocanon
     ProxyPassReverse / http://localhost:3000/
 </VirtualHost>
 ```
@@ -71,9 +72,10 @@ server {
     <Proxy *>
          Order allow,deny
          Allow from all
+         AllowEncodedSlashes NoDecode
     </Proxy>
 
-    ProxyPass /git http://localhost:3000 # Note: no trailing slash after either /git or port
+    ProxyPass /git http://localhost:3000 nocanon # Note: no trailing slash after either /git or port
     ProxyPassReverse /git http://localhost:3000 # Note: no trailing slash after either /git or port
 </VirtualHost>
 ```