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

Author: aswild

.drone.yml

@@ -72,7 +72,7 @@ steps:
 
   - name: build-linux-386
     pull: always
-    image: golang:1.12
+    image: golang:1.13
     environment:
       GO111MODULE: on
       GOPROXY: off
@@ -83,7 +83,7 @@ steps:
 
   - name: build
     pull: always
-    image: golang:1.12
+    image: golang:1.13
     commands:
       - make clean
       - make generate
@@ -100,7 +100,7 @@ steps:
 
   - name: unit-test
     pull: always
-    image: golang:1.12
+    image: golang:1.13
     commands:
       - make unit-test-coverage
     environment:
@@ -117,7 +117,7 @@ steps:
 
   - name: release-test
     pull: always
-    image: golang:1.12
+    image: golang:1.13
     commands:
       - make test
     environment:
@@ -145,7 +145,7 @@ steps:
 
   - name: tag-test
     pull: always
-    image: golang:1.12
+    image: golang:1.13
     commands:
       - make test
     environment:
@@ -159,7 +159,7 @@ steps:
 
   - name: test-sqlite
     pull: always
-    image: golang:1.12
+    image: golang:1.13
     commands:
       - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
       - apt-get install -y git-lfs
@@ -173,7 +173,7 @@ steps:
 
   - name: test-mysql
     pull: always
-    image: golang:1.12
+    image: golang:1.13
     commands:
       - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
       - apt-get install -y git-lfs
@@ -194,7 +194,7 @@ steps:
 
   - name: tag-test-mysql
     pull: always
-    image: golang:1.12
+    image: golang:1.13
     commands:
       - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
       - apt-get install -y git-lfs
@@ -212,7 +212,7 @@ steps:
 
   - name: test-mysql8
     pull: always
-    image: golang:1.12
+    image: golang:1.13
     commands:
       - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
       - apt-get install -y git-lfs
@@ -227,7 +227,7 @@ steps:
 
   - name: test-pgsql
     pull: always
-    image: golang:1.12
+    image: golang:1.13
     commands:
       - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
       - apt-get install -y git-lfs
@@ -242,7 +242,7 @@ steps:
 
   - name: test-mssql
     pull: always
-    image: golang:1.12
+    image: golang:1.13
     commands:
       - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
       - apt-get install -y git-lfs
@@ -257,7 +257,7 @@ steps:
 
   - name: generate-coverage
     pull: always
-    image: golang:1.12
+    image: golang:1.13
     commands:
       - make coverage
     environment:

Dockerfile

@@ -3,12 +3,12 @@
 #Build stage
 FROM golang:1.13-alpine3.10 AS build-env
 
-#Build deps
-RUN apk --no-cache add build-base git
-
 ARG GOPROXY
 ENV GOPROXY ${GOPROXY:-direct}
 
+#Build deps
+RUN apk --no-cache add build-base git
+
 ARG GITEA_VERSION
 #ARG TAGS="sqlite sqlite_unlock_notify"
 ARG TAGS

Makefile

@@ -472,6 +472,6 @@ pr:
 golangci-lint:
 	@hash golangci-lint > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
 		export BINARY="golangci-lint"; \
-		curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(GOPATH)/bin v1.17.1; \
+		curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(GOPATH)/bin v1.18.0; \
 	fi
 	golangci-lint run --deadline=3m

README.md

@@ -11,6 +11,7 @@
 [![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/backers/badge.svg?label=backer&color=brightgreen)](https://opencollective.com/gitea)
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 
 ## Purpose
 

README_ZH.md

@@ -10,6 +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)
 [![Become a backer/sponsor of gitea](https://opencollective.com/gitea/tiers/backers/badge.svg?label=backer&color=brightgreen)](https://opencollective.com/gitea)
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 
 ## 目标
 

custom/conf/app.ini.sample

@@ -302,6 +302,11 @@ REPO_INDEXER_ENABLED = false
 REPO_INDEXER_PATH = indexers/repos.bleve
 UPDATE_BUFFER_LEN = 20
 MAX_FILE_SIZE = 1048576
+; A comma separated list of glob patterns (see https://github.com/gobwas/glob) to include
+; in the index; default is empty
+REPO_INDEXER_INCLUDE =
+; A comma separated list of glob patterns to exclude from the index; ; default is empty
+REPO_INDEXER_EXCLUDE =
 
 [admin]
 ; Disallow regular (non-admin) users from creating organizations.

docs/config.yaml

@@ -18,7 +18,7 @@ params:
   description: Git with a cup of tea
   author: The Gitea Authors
   website: https://docs.gitea.io
-  version: 1.9.2
+  version: 1.9.3
 
 menu:
   page:

docs/content/doc/advanced/config-cheat-sheet.en-us.md

@@ -181,6 +181,8 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`.
 
 - `REPO_INDEXER_ENABLED`: **false**: Enables code search (uses a lot of disk space, about 6 times more than the repository size).
 - `REPO_INDEXER_PATH`: **indexers/repos.bleve**: Index file used for code search.
+- `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`.
 - `UPDATE_BUFFER_LEN`: **20**: Buffer length of index request.
 - `MAX_FILE_SIZE`: **1048576**: Maximum size in bytes of files to be indexed.
 
@@ -291,6 +293,7 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`.
 - `HOST`: **\<empty\>**: Connection string for `redis` and `memcache`.
    - Redis: `network=tcp,addr=127.0.0.1:6379,password=macaron,db=0,pool_size=100,idle_timeout=180`
    - Memache: `127.0.0.1:9090;127.0.0.1:9091`
+- `ITEM_TTL`: **16h**: Time to keep items in cache if not used, Setting it to 0 disables caching.
 
 ## Session (`session`)
 

docs/content/doc/advanced/config-cheat-sheet.zh-cn.md

@@ -144,11 +144,12 @@ menu:
 
 ## Cache (`cache`)
 
-- `ADAPTER`: 缓存引擎，可以为 `memory`, `redis` 或 `memcache`。
-- `INTERVAL`: 只对内存缓存有效，GC间隔，单位秒。
-- `HOST`: 针对redis和memcache有效，主机地址和端口。
+- `ADAPTER`: **memory**: 缓存引擎，可以为 `memory`, `redis` 或 `memcache`。
+- `INTERVAL`: **60**: 只对内存缓存有效，GC间隔，单位秒。
+- `HOST`: **\<empty\>**: 针对redis和memcache有效，主机地址和端口。
     - Redis: `network=tcp,addr=127.0.0.1:6379,password=macaron,db=0,pool_size=100,idle_timeout=180`
     - Memache: `127.0.0.1:9090;127.0.0.1:9091`
+- `ITEM_TTL`: **16h**: 缓存项目失效时间，设置为 0 则禁用缓存。
 
 ## Session (`session`)
 

docs/content/doc/advanced/customizing-gitea.en-us.md

@@ -60,7 +60,7 @@ the url `http://gitea.domain.tld/image.png`.
 
 ## Changing the default avatar
 
-Place the png image at the following path: `custom/public/img/avatar\_default.png`
+Place the png image at the following path: `custom/public/img/avatar_default.png`
 
 ## Customizing Gitea pages