Merge branch 'master' into remote-internal-token

Author: techknowlogick

.drone.yml

@@ -56,15 +56,15 @@ pipeline:
       event: [ push, tag, pull_request ]
 
   build-without-gcc:
-    image: golang:1.9
+    image: golang:1.10 # this step is kept as the lowest version of golang that we support
     pull: true
     commands:
       - go build -o gitea_no_gcc # test if build succeeds without the sqlite tag
     when:
       event: [ push, tag, pull_request ]
 
   build:
-    image: golang:1.11
+    image: golang:1.12
     pull: true
     environment:
       TAGS: bindata sqlite sqlite_unlock_notify
@@ -82,8 +82,8 @@ pipeline:
     when:
       event: [ push, tag, pull_request ]
 
-  test:
-    image: golang:1.11
+  unit-test:
+    image: golang:1.12
     pull: true
     group: test
     environment:
@@ -94,8 +94,8 @@ pipeline:
       event: [ push, pull_request ]
       branch: [ master ]
 
-  test:
-    image: golang:1.11
+  release-test:
+    image: golang:1.12
     pull: true
     group: test
     environment:
@@ -106,8 +106,8 @@ pipeline:
       event: [ push, pull_request ]
       branch: [ release/* ]
 
-  test:
-    image: golang:1.11
+  tag-test:
+    image: golang:1.12
     pull: true
     group: test
     environment:
@@ -118,7 +118,7 @@ pipeline:
       event: [ tag ]
 
   test-sqlite:
-    image: golang:1.11
+    image: golang:1.12
     pull: true
     group: test
     environment:
@@ -133,7 +133,7 @@ pipeline:
       event: [ push, tag, pull_request ]
 
   test-mysql:
-    image: golang:1.11
+    image: golang:1.12
     pull: true
     group: test
     environment:
@@ -148,8 +148,8 @@ pipeline:
       event: [ push, pull_request ]
       branch: [ master ]
 
-  test-mysql:
-    image: golang:1.11
+  tag-test-mysql:
+    image: golang:1.12
     pull: true
     group: test
     environment:
@@ -165,7 +165,7 @@ pipeline:
       event: [ tag ]
 
   test-pgsql:
-    image: golang:1.11
+    image: golang:1.12
     pull: true
     group: test
     environment:
@@ -181,7 +181,7 @@ pipeline:
       event: [ push, tag, pull_request ]
 
   test-mssql:
-    image: golang:1.11
+    image: golang:1.12
     pull: true
     group: test
     environment:
@@ -196,7 +196,7 @@ pipeline:
       event: [ push, tag, pull_request ]
 
   bench-sqlite:
-    image: golang:1.11
+    image: golang:1.12
     pull: true
     group: bench
     commands:
@@ -205,7 +205,7 @@ pipeline:
       event: [ tag ]
 
   bench-mysql:
-    image: golang:1.11
+    image: golang:1.12
     pull: true
     group: bench
     commands:
@@ -214,7 +214,7 @@ pipeline:
       event: [ tag ]
 
   bench-mssql:
-    image: golang:1.11
+    image: golang:1.12
     pull: true
     group: bench
     commands:
@@ -223,7 +223,7 @@ pipeline:
       event: [ tag ]
 
   bench-pgsql:
-    image: golang:1.11
+    image: golang:1.12
     pull: true
     group: bench
     commands:
@@ -232,7 +232,7 @@ pipeline:
       event: [ tag ]
 
   generate-coverage:
-    image: golang:1.11
+    image: golang:1.12
     pull: true
     environment:
       TAGS: bindata
@@ -281,12 +281,22 @@ pipeline:
       event: [ push ]
       branch: [ master ]
 
-  docker:
+  docker-dryrun:
+    image: plugins/docker:17.12
+    pull: true
+    repo: gitea/gitea
+    cache_from: gitea/gitea
+    dry_run: true
+    when:
+      event: [ pull_request ]
+
+  release-docker:
     image: plugins/docker:17.12
     pull: true
     secrets: [ docker_username, docker_password ]
     repo: gitea/gitea
     tags: [ '${DRONE_BRANCH##release/v}' ]
+    cache_from: gitea/gitea
     when:
       event: [ push ]
       branch: [ release/* ]
@@ -296,6 +306,7 @@ pipeline:
     secrets: [ docker_username, docker_password ]
     pull: true
     repo: gitea/gitea
+    cache_from: gitea/gitea
     default_tags: true
     when:
       event: [ push, tag ]
@@ -312,7 +323,7 @@ pipeline:
     when:
       event: [ push, tag ]
 
-  release:
+  tag-release:
     image: plugins/s3:1
     pull: true
     secrets: [ aws_access_key_id, aws_secret_access_key ]
@@ -326,7 +337,7 @@ pipeline:
     when:
       event: [ tag ]
 
-  release:
+  release-branch-release:
     image: plugins/s3:1
     pull: true
     secrets: [ aws_access_key_id, aws_secret_access_key ]

.gitignore

@@ -62,6 +62,7 @@ coverage.all
 /integrations/pgsql.ini
 /integrations/mssql.ini
 /node_modules
+/modules/indexer/issues/indexers
 
 
 # Snapcraft

CHANGELOG.md

@@ -4,11 +4,25 @@ 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.7.3](https://github.com/go-gitea/gitea/releases/tag/v1.7.3) - 2019-02-27
+* BUGFIXES
+  * Fix server 500 when trying to migrate to an already existing repository (#6188) (#6197)
+  * Load Issue attributes for API /repos/{owner}/{repo}/issues/{index} (#6122) (#6185)
+  * Fix bug whereby user could change private repository to public when force private enabled. (#6156) (#6165)
+  * Fix bug when update owner team then visit team's repo return 404 (#6119) (#6166)
+  * Fix heatmap and repository menu display in Internet Explorer 9+ (#6117) (#6137)
+  * Fix prohibit login check on authorization (#6106) (#6115)
+  * Fix LDAP protocol error regression by moving to ldap.v3 (#6105) (#6107)
+  * Fix deadlock in webhook PullRequest (#6102) (#6104)
+  * Fix redirect loop when password change is required and Gitea is installed as a suburl (#5965) (#6101)
+  * Fix compare button regression (#5929) (#6098)
+  * Recover panic in orgmode.Render if bad orgfile (#4982) (#5903) (#6097)
+
 ## [1.7.2](https://github.com/go-gitea/gitea/releases/tag/v1.7.2) - 2019-02-14
 * BUGFIXES
   * Remove all CommitStatus when a repo is deleted (#5940) (#5941)
   * Fix notifications on pushing with deploy keys by setting hook environment variables (#5935) (#5944)
-  * Silence console logger in gitea serv (#5887) (#5943) 
+  * Silence console logger in gitea serv (#5887) (#5943)
   * Handle milestone webhook events for issues and PR (#5947) (#5955)
   * Show user who created the repository instead of the organization in action feed (#5948) (#5956)
   * Fix ssh deploy and user key constraints (#1357) (#5939) (#5966)
@@ -64,7 +78,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Give user a link to create PR after push (#4716)
   * Add rebase with merge commit merge style (#3844) (#4052)
 * BUGFIXES
-  * Disallow empty titles (#5785) (#5794) 
+  * Disallow empty titles (#5785) (#5794)
   * Fix sqlite deadlock when assigning to a PR (#5640) (#5642)
   * Don't close issues via commits on non-default branch. (#5622) (#5643)
   * Fix commit page showing status for current default branch (#5650) (#5653)

CONTRIBUTING.md

@@ -102,7 +102,7 @@ included in the next released version.
 Generally, the go build tools are installed as-needed in the `Makefile`.
 An exception are the tools to build the CSS and images.
 
-- To build CSS: Install [Node.js](https://nodejs.org/en/download/package-manager)
+- To build CSS: Install [Node.js](https://nodejs.org/en/download/package-manager) at version 8.0 or above
   with `npm` and then run `npm install` and `make generate-stylesheets`.
 - To build Images: ImageMagick, inkscape and zopflipng binaries must be
   available in your `PATH` to run `make generate-images`.

Gopkg.lock

@@ -26,3 +26,4 @@ Lanre Adelowo <[email protected]> (@adelowo)
 Konrad Langenberg <[email protected]> (@kolaente)
 He-Long Zhang <[email protected]> (@BetaCat0)
 Andrew Thornton <[email protected]> (@zeripath)
+John Olheiser <[email protected]> (@jolheiser)

MAINTAINERS

@@ -4,6 +4,8 @@ IMPORT := code.gitea.io/gitea
 GO ?= go
 SED_INPLACE := sed -i
 
+export PATH := $($(GO) env GOPATH)/bin:$(PATH)
+
 ifeq ($(OS), Windows_NT)
 	EXECUTABLE := gitea.exe
 else
@@ -174,7 +176,7 @@ coverage:
 
 .PHONY: unit-test-coverage
 unit-test-coverage:
-	for PKG in $(PACKAGES); do $(GO) test -tags='sqlite sqlite_unlock_notify' -cover -coverprofile $$GOPATH/src/$$PKG/coverage.out $$PKG || exit 1; done;
+	$(GO) test -tags='sqlite sqlite_unlock_notify' -cover -coverprofile coverage.out $(PACKAGES) && echo "\n==>\033[32m Ok\033[m\n" || exit 1
 
 .PHONY: vendor
 vendor:
@@ -365,10 +367,14 @@ stylesheets-check: generate-stylesheets
 
 .PHONY: generate-stylesheets
 generate-stylesheets:
-	$(eval BROWSERS := "> 2%, last 2 firefox versions, last 2 safari versions")
-	node_modules/.bin/lessc --clean-css public/less/index.less public/css/index.css
-	$(foreach file, $(filter-out public/less/themes/_base.less, $(wildcard public/less/themes/*)),node_modules/.bin/lessc --clean-css public/less/themes/$(notdir $(file)) > public/css/theme-$(notdir $(call strip-suffix,$(file))).css;)
-	$(foreach file, $(wildcard public/css/*),node_modules/.bin/postcss --use autoprefixer --autoprefixer.browsers $(BROWSERS) -o $(file) $(file);)
+	@hash npx > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
+		echo "Please install npm version 5.2+"; \
+		exit 1; \
+	fi;
+	$(eval BROWSERS := "> 1%, last 2 firefox versions, last 2 safari versions, ie 11")
+	npx lessc --clean-css public/less/index.less public/css/index.css
+	$(foreach file, $(filter-out public/less/themes/_base.less, $(wildcard public/less/themes/*)),npx lessc --clean-css public/less/themes/$(notdir $(file)) > public/css/theme-$(notdir $(call strip-suffix,$(file))).css;)
+	$(foreach file, $(wildcard public/css/*),npx postcss --use autoprefixer --autoprefixer.browsers $(BROWSERS) -o $(file) $(file);)
 
 .PHONY: swagger-ui
 swagger-ui:

Makefile

@@ -253,9 +253,19 @@ DB_RETRIES = 10
 ; Backoff time per DB retry (time.Duration)
 DB_RETRY_BACKOFF = 3s
 
-
 [indexer]
+; Issue indexer type, currently support: bleve or db, default is bleve
+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_TYPE = levelqueue
+; When ISSUE_INDEXER_QUEUE_TYPE is levelqueue, this will be the queue will be saved path, 
+; default is indexers/issues.queue
+ISSUE_INDEXER_QUEUE_DIR = indexers/issues.queue
+; Batch queue number, default is 20
+ISSUE_INDEXER_QUEUE_BATCH_NUMBER = 20
+
 ; repo indexer by default disabled, since it uses a lot of disk space
 REPO_INDEXER_ENABLED = false
 REPO_INDEXER_PATH = indexers/repos.bleve

custom/conf/app.ini.sample

@@ -154,7 +154,12 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`.
 
 ## Indexer (`indexer`)
 
+- `ISSUE_INDEXER_TYPE`: **bleve**: Issue indexer type, currently support: bleve or db, if it's db, below issue indexer item will be invalid.
 - `ISSUE_INDEXER_PATH`: **indexers/issues.bleve**: Index file used for issue search.
+- `ISSUE_INDEXER_QUEUE_TYPE`: **levelqueue**: Issue indexer queue, currently support: channel or levelqueue
+- `ISSUE_INDEXER_QUEUE_DIR`: **indexers/issues.queue**: When ISSUE_INDEXER_QUEUE_TYPE is levelqueue, this will be the queue will be saved path
+- `ISSUE_INDEXER_QUEUE_BATCH_NUMBER`: **20**: Batch queue number
+
 - `REPO_INDEXER_ENABLED`: **false**: Enables code search (uses a lot of disk space).
 - `REPO_INDEXER_PATH`: **indexers/repos.bleve**: Index file used for code search.
 - `UPDATE_BUFFER_LEN`: **20**: Buffer length of index request.

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

@@ -82,6 +82,20 @@ menu:
 - `PATH`: Tidb 或者 SQLite3 数据文件存放路径。
 - `LOG_SQL`: **true**: 显示生成的SQL，默认为真。
 
+
+## Indexer (`indexer`)
+
+- `ISSUE_INDEXER_TYPE`: **bleve**: 工单索引类型，当前支持 `bleve` 或 `db`，当为 `db` 时其它工单索引项可不用设置。
+- `ISSUE_INDEXER_PATH`: **indexers/issues.bleve**: 工单索引文件存放路径，当索引类型为 `bleve` 时有效。
+- `ISSUE_INDEXER_QUEUE_TYPE`: **levelqueue**: 工单索引队列类型，当前支持 `channel` 或 `levelqueue`。
+- `ISSUE_INDEXER_QUEUE_DIR`: **indexers/issues.queue**: 当 `ISSUE_INDEXER_QUEUE_TYPE` 为 `levelqueue` 时，保存索引队列的磁盘路径。
+- `ISSUE_INDEXER_QUEUE_BATCH_NUMBER`: **20**: 队列处理中批量提交数量。
+
+- `REPO_INDEXER_ENABLED`: **false**: 是否启用代码搜索（启用后会占用比较大的磁盘空间）。
+- `REPO_INDEXER_PATH`: **indexers/repos.bleve**: 用于代码搜索的索引文件路径。
+- `UPDATE_BUFFER_LEN`: **20**: 代码索引请求的缓冲区长度。
+- `MAX_FILE_SIZE`: **1048576**: 进行解析的源代码文件的最大长度，小于该值时才会索引。
+
 ## Security (`security`)
 
 - `INSTALL_LOCK`: 是否允许运行安装向导，(跟管理员账号有关，十分重要)。