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

Author: aswild

.drone.yml

@@ -66,6 +66,7 @@ steps:
     image: golang:1.11 # 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
 
@@ -74,6 +75,7 @@ steps:
     image: golang:1.12
     environment:
       GO111MODULE: on
+      GOPROXY: off
       GOOS: linux
       GOARCH: 386
     commands:
@@ -92,6 +94,7 @@ steps:
       - make test-vendor
       - make build
     environment:
+      GOPROXY: https://goproxy.cn # proxy.golang.org is blocked in China, this proxy is not
       TAGS: bindata sqlite sqlite_unlock_notify
 
   - name: unit-test
@@ -100,6 +103,7 @@ steps:
     commands:
       - make unit-test-coverage
     environment:
+      GOPROXY: off
       TAGS: bindata sqlite sqlite_unlock_notify
     depends_on:
       - build
@@ -116,6 +120,7 @@ steps:
     commands:
       - make test
     environment:
+      GOPROXY: off
       TAGS: bindata sqlite sqlite_unlock_notify
     depends_on:
       - build
@@ -143,6 +148,7 @@ steps:
     commands:
       - make test
     environment:
+      GOPROXY: off
       TAGS: bindata
     depends_on:
       - tag-pre-condition
@@ -159,6 +165,7 @@ steps:
       - timeout -s ABRT 20m make test-sqlite-migration
       - timeout -s ABRT 20m make test-sqlite
     environment:
+      GOPROXY: off
       TAGS: bindata
     depends_on:
       - build
@@ -172,6 +179,7 @@ steps:
       - make test-mysql-migration
       - make integration-test-coverage
     environment:
+      GOPROXY: off
       TAGS: bindata
       TEST_LDAP: 1
     depends_on:
@@ -192,6 +200,7 @@ steps:
       - timeout -s ABRT 20m make test-mysql-migration
       - timeout -s ABRT 20m make test-mysql
     environment:
+      GOPROXY: off
       TAGS: bindata
       TEST_LDAP: 1
     depends_on:
@@ -209,6 +218,7 @@ steps:
       - timeout -s ABRT 20m make test-mysql8-migration
       - timeout -s ABRT 20m make test-mysql8
     environment:
+      GOPROXY: off
       TAGS: bindata
       TEST_LDAP: 1
     depends_on:
@@ -223,6 +233,7 @@ steps:
       - timeout -s ABRT 20m make test-pgsql-migration
       - timeout -s ABRT 20m make test-pgsql
     environment:
+      GOPROXY: off
       TAGS: bindata
       TEST_LDAP: 1
     depends_on:
@@ -237,6 +248,7 @@ steps:
       - make test-mssql-migration
       - make test-mssql
     environment:
+      GOPROXY: off
       TAGS: bindata
       TEST_LDAP: 1
     depends_on:
@@ -248,6 +260,7 @@ steps:
     commands:
       - make coverage
     environment:
+      GOPROXY: off
       TAGS: bindata
     depends_on:
       - unit-test
@@ -380,6 +393,7 @@ steps:
       - make generate
       - make release
     environment:
+      GOPROXY: off
       TAGS: bindata sqlite sqlite_unlock_notify
 
   - name: gpg-sign
@@ -481,6 +495,7 @@ steps:
       - make generate
       - make release
     environment:
+      GOPROXY: off
       TAGS: bindata sqlite sqlite_unlock_notify
 
   - name: gpg-sign
@@ -607,6 +622,8 @@ steps:
       dry_run: true
       repo: gitea/gitea
       tags: linux-amd64
+      build_args:
+        - GOPROXY=off
     when:
       event:
         - pull_request
@@ -618,6 +635,8 @@ steps:
       auto_tag: true
       auto_tag_suffix: linux-amd64
       repo: gitea/gitea
+      build_args:
+        - GOPROXY=off
       password:
         from_secret: docker_password
       username:
@@ -668,6 +687,8 @@ steps:
       dry_run: true
       repo: gitea/gitea
       tags: linux-arm64
+      build_args:
+        - GOPROXY=off
     when:
       event:
         - pull_request
@@ -679,6 +700,8 @@ steps:
       auto_tag: true
       auto_tag_suffix: linux-arm64
       repo: gitea/gitea
+      build_args:
+        - GOPROXY=off
       password:
         from_secret: docker_password
       username:

Dockerfile

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

Makefile

@@ -24,7 +24,7 @@ BINDATA := modules/{options,public,templates}/bindata.go
 GOFILES := $(shell find . -name "*.go" -type f ! -path "./vendor/*" ! -path "*/bindata.go")
 GOFMT ?= gofmt -s
 
-GOFLAGS := -i -v
+GOFLAGS := -v
 EXTRA_GOFLAGS ?=
 
 TAGS ?=

go.mod

@@ -115,7 +115,7 @@ require (
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/asn1-ber.v1 v1.0.0-20150924051756-4e86f4367175 // indirect
 	gopkg.in/bufio.v1 v1.0.0-20140618132640-567b2bfa514e // indirect
-	gopkg.in/editorconfig/editorconfig-core-go.v1 v1.2.0
+	gopkg.in/editorconfig/editorconfig-core-go.v1 v1.3.0
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 	gopkg.in/ini.v1 v1.42.0
 	gopkg.in/ldap.v3 v3.0.2

go.sum

@@ -451,8 +451,8 @@ gopkg.in/bufio.v1 v1.0.0-20140618132640-567b2bfa514e/go.mod h1:xsQCaysVCudhrYTfz
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/editorconfig/editorconfig-core-go.v1 v1.2.0 h1:CO465/foR4+bY1xNYjZEl6l8By1g/iMsImoruxfEt84=
-gopkg.in/editorconfig/editorconfig-core-go.v1 v1.2.0/go.mod h1:s2mQFI9McjArkyCwyEwU//+luQENTnD/Lfb/7Sj3/kQ=
+gopkg.in/editorconfig/editorconfig-core-go.v1 v1.3.0 h1:oxOEwvhxLMpWpN+0pb2r9TWrM0DCFBHxbuIlS27tmFg=
+gopkg.in/editorconfig/editorconfig-core-go.v1 v1.3.0/go.mod h1:s2mQFI9McjArkyCwyEwU//+luQENTnD/Lfb/7Sj3/kQ=
 gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE=

integrations/migration-test/gitea-v1.3.3.sqlite3.sql.gz

@@ -39,3 +39,9 @@
   uid: 20
   org_id: 19
   is_public: true
+
+-
+  id: 8
+  uid: 24
+  org_id: 25
+  is_public: true

models/fixtures/org_user.yml

@@ -77,4 +77,13 @@
   name: review_team
   authorize: 1 # read
   num_repos: 1
-  num_members: 1
+  num_members: 1
+
+-
+  id: 10
+  org_id: 25
+  lower_name: notowners
+  name: NotOwners
+  authorize: 1 # owner
+  num_repos: 0
+  num_members: 1

models/fixtures/team.yml

@@ -62,4 +62,10 @@
   id: 11
   org_id: 17
   team_id: 9
-  uid: 20
+  uid: 20
+
+-
+  id: 12
+  org_id: 25
+  team_id: 10
+  uid: 24

models/fixtures/team_user.yml

@@ -0,0 +1,9 @@
+-
+  id: 1
+  uid: 24
+  secret: KlDporn6Ile4vFcKI8z7Z6sqK1Scj2Qp0ovtUzCZO6jVbRW2lAoT7UDxDPtrab8d2B9zKOocBRdBJnS8orsrUNrsyETY+jJHb79M82uZRioKbRUz15sfOpmJmEzkFeSg6S4LicUBQos=
+  scratch_salt: Qb5bq2DyR2
+  scratch_hash: 068eb9b8746e0bcfe332fac4457693df1bda55800eb0f6894d14ebb736ae6a24e0fc8fc5333c19f57f81599788f0b8e51ec1
+  last_used_passcode:
+  created_unix: 1564253724
+  updated_unix: 1564253724