Merge branch 'master' into make-avatar-lookup-image

.eslintrc

@@ -36,6 +36,8 @@ rules:
  max-len: [0]
  newline-per-chained-call: [0]
  no-alert: [0]
+ no-cond-assign: [2, except-parens]
+ no-console: [1, {allow: [info, warn, error]}]
  no-continue: [0]
  no-mixed-operators: [0]
  no-multi-assign: [0]

CHANGELOG.md

@@ -4,6 +4,51 @@ 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.11.2](https://github.com/go-gitea/gitea/releases/tag/v1.11.2) - 2020-03-06
+
+* BREAKING
+ * Various fixes in login sources (#10428) (#10429)
+* SECURITY
+ * Ensure only own addresses are updated (#10397) (#10399)
+ * Logout POST action (#10582) (#10585)
+ * Org action fixes and form cleanup (#10512) (#10514)
+ * Change action GETs to POST (#10462) (#10464)
+ * Fix admin notices (#10480) (#10483)
+ * Change admin dashboard to POST (#10465) (#10466)
+ * Update markbates/goth (#10444) (#10445)
+ * Update crypto vendors (#10385) (#10398)
+* BUGFIXES
+ * Allow users with write permissions to modify issue descriptions and comments. (#10623) (#10626)
+ * Handle deleted base branch in PR (#10618) (#10619)
+ * Delete dependencies when deleting a repository (#10608) (#10616)
+ * Ensure executable bit is kept on the web editor (#10607) (#10614)
+ * Update mergebase in pr checker (#10586) (#10605)
+ * Fix release attachments being deleted while upgrading (#10572) (#10573)
+ * Fix redirection path if Slack webhook channel is invalid (#10566)
+ * Fix head.tmpl og:image picture location (#10531) (#10556)
+ * Fix 404 after activating secondary email (#10547) (#10553)
+ * Show Signer in commit lists and add basic trust (#10425 & #10511) (#10524)
+ * Fix potential bugs (#10513) (#10518)
+ * Use \[:space:\] instead of \\s (#10508) (#10509)
+ * Avoid mailing users that have explicitly unwatched an issue (#10475) (#10500)
+ * Handle push rejection message in Merge & Web Editor (#10373) (#10497)
+ * Fix SQLite concurrency problems by using BEGIN IMMEDIATE (#10368) (#10493)
+ * Fix double PR notification from API (#10482) (#10486)
+ * Show the username as a fallback on feeds if full name is blank (#10461)
+ * Trigger webhooks on issue label-change via API too (#10421) (#10439)
+ * Fix git reference type in webhooks (#10427) (#10432)
+ * Prevent panic on merge to PR (#10403) (#10408)
+ * Fix wrong num closed issues on repository when close issue via commit… (#10364) (#10380)
+ * Reading pull attachments should depend on read UnitTypePullRequests (#10346) (#10354)
+ * Set max-width on review-box comment box (#10348) (#10353)
+ * Prevent nil pointer in GetPullRequestCommitStatusState (#10342) (#10344)
+ * Fix protected branch status check settings (#10341) (#10343)
+ * Truncate long commit message header (#10301) (#10319)
+ * Set the initial commit status to Success otherwise it will always be Pending (#10317) (#10318)
+ * Don't manually replace whitespace during render (#10291) (#10315)
+* ENHANCEMENT
+ * Admin page for managing user e-mail activation (#10557) (#10579)
+
 ## [1.11.1](https://github.com/go-gitea/gitea/releases/tag/v1.11.1) - 2020-02-15
 
 * BUGFIXES
@@ -467,6 +512,11 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
  * Update CodeMirror to version 5.49.0 (#8381)
  * Wiki editor: enable side-by-side button (#7242)
 
+## [1.10.5](https://github.com/go-gitea/gitea/releases/tag/v1.10.5) - 2020-03-06
+
+* BUGFIXES
+ * Fix release attachments being deleted while upgrading (#10572) (#10574)
+
 ## [1.10.4](https://github.com/go-gitea/gitea/releases/tag/v1.10.4) - 2020-02-16
 
 * FEATURE

Makefile

@@ -7,6 +7,7 @@ GO ?= go
 SED_INPLACE := sed -i
 SHASUM ?= shasum -a 256
 HAS_GO = $(shell hash $(GO) > /dev/null 2>&1 && echo "GO" || echo "NOGO" )
+COMMA := ,
 
 ifeq ($(HAS_GO), GO)
  GOPATH ?= $(shell $(GO) env GOPATH)
@@ -16,22 +17,14 @@ endif
 
 ifeq ($(OS), Windows_NT)
  EXECUTABLE ?= gitea.exe
- FIND_PWD_REGEXP := find . -regextype posix-egrep
 else
  EXECUTABLE ?= gitea
  UNAME_S := $(shell uname -s)
- FIND_PWD_REGEXP := find . -regextype posix-egrep
- BUSYBOX := $(shell find --help 2>&1 | grep -o BusyBox)
  ifeq ($(UNAME_S),Darwin)
  SED_INPLACE := sed -i ''
- FIND_PWD_REGEXP := find -E .
  endif
  ifeq ($(UNAME_S),FreeBSD)
  SED_INPLACE := sed -i ''
- FIND_PWD_REGEXP := find -E .
- endif
- ifeq ($(BUSYBOX),BusyBox)
- FIND_PWD_REGEXP := find .
  endif
 endif
 
@@ -71,9 +64,6 @@ LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(G
 
 PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations/migration-test,$(filter-out code.gitea.io/gitea/integrations,$(shell GO111MODULE=on $(GO) list -mod=vendor ./... | grep -v /vendor/)))
 
-GO_SOURCES ?= $(shell $(FIND_PWD_REGEXP) -regex '\./(node_modules|docs|public|options|contrib|data)' -prune -o -name "*.go" -type f -print)
-GO_SOURCES_OWN := $(filter-out ./vendor/% %/bindata.go, $(GO_SOURCES))
-
 WEBPACK_SOURCES := $(shell find web_src/js web_src/less -type f)
 WEBPACK_CONFIGS := webpack.config.js .eslintrc .stylelintrc
 WEBPACK_DEST := public/js/index.js public/css/index.css
@@ -82,13 +72,24 @@ WEBPACK_DEST_DIRS := public/js public/css
 BINDATA_DEST := modules/public/bindata.go modules/options/bindata.go modules/templates/bindata.go
 BINDATA_HASH := $(addsuffix .hash,$(BINDATA_DEST))
 
+TAGS ?=
+TAGS_SPLIT := $(subst $(COMMA), ,$(TAGS))
+TAGS_EVIDENCE := $(MAKE_EVIDENCE_DIR)/tags
+
+GO_DIRS := cmd integrations models modules routers scripts services vendor
+GO_SOURCES := $(wildcard *.go)
+GO_SOURCES += $(shell find $(GO_DIRS) -type f -name "*.go" -not -path modules/options/bindata.go -not -path modules/public/bindata.go -not -path modules/templates/bindata.go)
+
+ifeq ($(filter $(TAGS_SPLIT),bindata),bindata)
+ GO_SOURCES += $(BINDATA_DEST)
+endif
+
+GO_SOURCES_OWN := $(filter-out vendor/% %/bindata.go, $(GO_SOURCES))
+
 FOMANTIC_CONFIGS := semantic.json web_src/fomantic/theme.config.less web_src/fomantic/_site/globals/site.variables
 FOMANTIC_DEST := public/fomantic/semantic.min.js public/fomantic/semantic.min.css
 FOMANTIC_DEST_DIR := public/fomantic
 
-TAGS ?=
-TAGS_EVIDENCE := $(MAKE_EVIDENCE_DIR)/tags
-
 #To update swagger use: GO111MODULE=on go get -u github.com/go-swagger/go-swagger/cmd/[email protected]
 SWAGGER := GO111MODULE=on $(GO) run -mod=vendor github.com/go-swagger/go-swagger/cmd/swagger
 SWAGGER_SPEC := templates/swagger/v1_json.tmpl
@@ -145,7 +146,7 @@ help:
 go-check:
  $(eval GO_VERSION := $(shell printf "%03d%03d%03d" $(shell go version | grep -Eo '[0-9]+\.?[0-9]+?\.?[0-9]?[[:space:]]' | tr '.' ' ');))
  @if [ "$(GO_VERSION)" -lt "001011000" ]; then \
- echo "Gitea requires Go 1.11.0 or greater to build. You can get it at https://golang.org/dl/"; \
+ echo "Gitea requires Go 1.11 or greater to build. You can get it at https://golang.org/dl/"; \
  exit 1; \
  fi
 
@@ -161,7 +162,7 @@ node-check:
  $(eval NODE_VERSION := $(shell printf "%03d%03d%03d" $(shell node -v | grep -Eo '[0-9]+\.?[0-9]+?\.?[0-9]?' | tr '.' ' ');))
  $(eval NPM_MISSING := $(shell hash npm > /dev/null 2>&1 || echo 1))
  @if [ "$(NODE_VERSION)" -lt "010000000" -o "$(NPM_MISSING)" = "1" ]; then \
- echo "Gitea requires Node.js 10.0.0 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
 
@@ -258,7 +259,7 @@ fmt-check:
 test:
  GO111MODULE=on $(GO) test $(GOTESTFLAGS) -mod=vendor -tags='sqlite sqlite_unlock_notify' $(PACKAGES)
 
-PHONY: test-check
+.PHONY: test-check
 test-check:
  @echo "Checking if tests have changed the source tree...";
  @diff=$$(git status -s); \

README.md

@@ -40,7 +40,7 @@ or if sqlite support is required:
 The `build` target is split into two sub-targets:
 
 - `make backend` which requires [Go 1.11](https://golang.org/dl/) or greater.
-- `make frontend` which requires [Node.js 10.0.0](https://nodejs.org/en/download/) or greater.
+- `make frontend` which requires [Node.js 10](https://nodejs.org/en/download/) or greater.
 
 If pre-built frontend files are present it is possible to only build the backend:
 

custom/conf/app.ini.sample

@@ -870,7 +870,9 @@ MAX_GIT_DIFF_FILES = 100
 ; see more on http:https://git-scm.com/docs/git-gc/
 GC_ARGS =
 ; If use git wire protocol version 2 when git version >= 2.18, default is true, set to false when you always want git wire protocol version 1
-EnableAutoGitWireProtocol = true
+ENABLE_AUTO_GIT_WIRE_PROTOCOL = true
+; Respond to pushes to a non-default branch with a URL for creating a Pull Request (if the repository has them enabled)
+PULL_REQUEST_PUSH_MESSAGE = true
 
 ; Operation timeout in seconds
 [git.timeout]