Merge branch 'master' into gitlab-migrate

Author: aqtrans

.drone.yml

@@ -11,41 +11,72 @@ workspace:
   path: src/code.gitea.io/gitea
 
 steps:
-  - name: pre-build
+  - name: deps-frontend
+    pull: always
+    image: node:12
+    commands:
+      - make node_modules
+
+  - name: lint-frontend
+    pull: always
+    image: node:12
+    commands:
+      - make lint-frontend
+    depends_on: [deps-frontend]
+
+  - name: lint-backend
+    pull: always
+    image: golang:1.14
+    commands:
+      - make lint-backend
+    environment:
+      GOPROXY: https://goproxy.cn # proxy.golang.org is blocked in China, this proxy is not
+      GOSUMDB: sum.golang.org
+      TAGS: bindata sqlite sqlite_unlock_notify
+
+  - name: build-frontend
     pull: always
     image: node:10 # this step is kept at the lowest version of node that we support
     commands:
-      - make webpack
+      - make frontend
+    depends_on: [lint-frontend]
 
-  - name: build-without-gcc
+  - name: build-backend-no-gcc
     pull: always
-    image: golang:1.11 # this step is kept as the lowest version of golang that we support
+    image: golang:1.12 # this step is kept as the lowest version of golang that we support
     environment:
       GO111MODULE: on
       GOPROXY: off
     commands:
       - go build -mod=vendor -o gitea_no_gcc # test if build succeeds without the sqlite tag
+    depends_on: [lint-backend]
 
-  - name: build-linux-386
+  - name: build-backend-arm64
     pull: always
-    image: golang:1.13
+    image: golang:1.14
     environment:
       GO111MODULE: on
       GOPROXY: off
       GOOS: linux
-      GOARCH: 386
+      GOARCH: arm64
+      TAGS: bindata
     commands:
-      - go build -mod=vendor -o gitea_linux_386 # test if compatible with 32 bit
+      - curl -sL https://deb.nodesource.com/setup_12.x | bash - && apt -y install nodejs
+      - make build # test cross compile
+      - rm ./gitea # clean
+    depends_on: [lint-backend]
 
-  - name: check
+  - name: build-backend-386
     pull: always
-    image: golang:1.13
-    commands:
-      - make clean golangci-lint revive swagger-check swagger-validate test-vendor
+    image: golang:1.14
     environment:
-      GOPROXY: https://goproxy.cn # proxy.golang.org is blocked in China, this proxy is not
-      GOSUMDB: sum.golang.org
-      TAGS: bindata sqlite sqlite_unlock_notify
+      GO111MODULE: on
+      GOPROXY: off
+      GOOS: linux
+      GOARCH: 386
+    commands:
+      - go build -mod=vendor -o gitea_linux_386 # test if compatible with 32 bit
+    depends_on: [lint-backend]
 
 ---
 kind: pipeline
@@ -55,6 +86,9 @@ platform:
   os: linux
   arch: amd64
 
+depends_on:
+  - compliance
+
 workspace:
   base: /go
   path: src/code.gitea.io/gitea
@@ -117,7 +151,7 @@ steps:
 
   - name: build
     pull: always
-    image: golang:1.13
+    image: golang:1.14
     commands:
       - curl -sL https://deb.nodesource.com/setup_12.x | bash - && apt -y install nodejs
       - make build
@@ -134,7 +168,7 @@ steps:
 
   - name: unit-test
     pull: always
-    image: golang:1.13
+    image: golang:1.14
     commands:
       - make unit-test-coverage test-check
     environment:
@@ -145,7 +179,7 @@ steps:
 
   - name: test-mysql
     pull: always
-    image: golang:1.13
+    image: golang:1.14
     commands:
       - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
       - apt-get install -y git-lfs
@@ -159,7 +193,7 @@ steps:
 
   - name: test-mysql8
     pull: always
-    image: golang:1.13
+    image: golang:1.14
     commands:
       - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
       - apt-get install -y git-lfs
@@ -173,7 +207,7 @@ steps:
 
   - name: test-mssql
     pull: always
-    image: golang:1.13
+    image: golang:1.14
     commands:
       - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
       - apt-get install -y git-lfs
@@ -187,7 +221,7 @@ steps:
 
   - name: generate-coverage
     pull: always
-    image: golang:1.13
+    image: golang:1.14
     commands:
       - make coverage
     environment:
@@ -221,8 +255,6 @@ steps:
         - push
         - pull_request
 
-
-
 ---
 kind: pipeline
 name: testing-arm64
@@ -231,6 +263,9 @@ platform:
   os: linux
   arch: arm64
 
+depends_on:
+  - compliance
+
 workspace:
   base: /go
   path: src/code.gitea.io/gitea
@@ -260,7 +295,7 @@ steps:
 
   - name: build
     pull: always
-    image: golang:1.13
+    image: golang:1.14
     commands:
       - curl -sL https://deb.nodesource.com/setup_12.x | bash - && apt -y install nodejs
       - make build
@@ -271,7 +306,7 @@ steps:
 
   - name: test-sqlite
     pull: always
-    image: golang:1.13
+    image: golang:1.14
     commands:
       - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
       - apt-get install -y git-lfs
@@ -284,7 +319,7 @@ steps:
 
   - name: test-pgsql
     pull: always
-    image: golang:1.13
+    image: golang:1.14
     commands:
       - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
       - apt-get install -y git-lfs
@@ -331,7 +366,7 @@ steps:
     pull: default
     image: alpine:3.11
     commands:
-      - ./scripts/update-locales.sh
+      - ./build/update-locales.sh
 
   - name: push
     pull: always
@@ -391,14 +426,14 @@ steps:
 
   - name: static
     pull: always
-    image: techknowlogick/xgo:go-1.13.x
+    image: techknowlogick/xgo:go-1.14.x
     commands:
       - apt update && apt -y install curl
       - curl -sL https://deb.nodesource.com/setup_12.x | bash - && apt -y install nodejs
       - export PATH=$PATH:$GOPATH/bin
       - make release
     environment:
-      GOPROXY: off
+      GOPROXY: https://goproxy.cn # proxy.golang.org is blocked in China, this proxy is not
       TAGS: bindata sqlite sqlite_unlock_notify
 
   - name: gpg-sign
@@ -489,14 +524,14 @@ steps:
 
   - name: static
     pull: always
-    image: techknowlogick/xgo:go-1.13.x
+    image: techknowlogick/xgo:go-1.14.x
     commands:
       - apt update && apt -y install curl
       - curl -sL https://deb.nodesource.com/setup_12.x | bash - && apt -y install nodejs
       - export PATH=$PATH:$GOPATH/bin
       - make release
     environment:
-      GOPROXY: off
+      GOPROXY: https://goproxy.cn # proxy.golang.org is blocked in China, this proxy is not
       TAGS: bindata sqlite sqlite_unlock_notify
 
   - name: gpg-sign
@@ -549,6 +584,9 @@ platform:
   os: linux
   arch: arm64
 
+depends_on:
+  - compliance
+
 steps:
   - name: build-docs
     pull: always

.gitattributes

@@ -1,7 +1,10 @@
 * text=auto eol=lf
+/vendor/** -text -eol
+/public/vendor/** -text -eol
+
 conf/* linguist-vendored
 docker/* linguist-vendored
 options/* linguist-vendored
 public/* linguist-vendored
-scripts/* linguist-vendored
+build/* linguist-vendored
 templates/* linguist-vendored

.gitignore

@@ -44,6 +44,7 @@ coverage.all
 *.log
 
 /gitea
+/gitea-vet
 /debug
 /integrations.test
 

CHANGELOG.md

@@ -4,6 +4,20 @@ 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.4](https://github.com/go-gitea/gitea/releases/tag/v1.11.4) - 2020-04-01
+
+* BUGFIXES
+  * Only update merge_base if not already merged (#10909)
+  * Fix milestones too many SQL variables bug (#10880) (#10904)
+  * Protect against NPEs in notifications list (#10879) (#10883)
+  * Convert plumbing.ErrObjectNotFound to git.ErrNotExist in getCommit (#10862) (#10868)
+  * Convert plumbing.ErrReferenceNotFound to git.ErrNotExist in GetRefCommitID (#10676) (#10797)
+  * Account for empty lines in receive-hook message (#10773) (#10784)
+  * Fix bug on branch API (#10767) (#10775)
+  * Migrate to go-git/go-git v5.0.0 (#10735) (#10753)
+  * Fix hiding of fields in authorization source page (#10734) (#10752)
+  * Prevent default for linkAction (#10742) (#10743)
+
 ## [1.11.3](https://github.com/go-gitea/gitea/releases/tag/v1.11.3) - 2020-03-10
 
 * BUGFIXES

Dockerfile

@@ -1,7 +1,7 @@
 
 ###################################
 #Build stage
-FROM golang:1.13-alpine3.11 AS build-env
+FROM golang:1.14-alpine3.11 AS build-env
 
 ARG GOPROXY
 ENV GOPROXY ${GOPROXY:-direct}