Merge branch 'master' into enh/noid/commit-message-link-check-commit-hashes

Author: lunny

.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

@@ -3,6 +3,9 @@
 #Build stage
 FROM golang:1.12-alpine3.10 AS build-env
 
+ARG GOPROXY
+ENV GOPROXY ${GOPROXY:-direct}
+
 ARG GITEA_VERSION
 ARG TAGS="sqlite sqlite_unlock_notify"
 ENV TAGS "bindata $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=

models/fixtures/org_user.yml

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

models/fixtures/team.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_user.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/two_factor.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

models/fixtures/user.yml

@@ -365,4 +365,39 @@
   is_active: true
   num_members: 0
   num_teams: 0
-  visibility: 2
+  visibility: 2
+
+-
+  id: 24
+  lower_name: user24
+  name: user24
+  full_name: "user24"
+  email: [email protected]
+  keep_email_private: true
+  passwd: 7d93daa0d1e6f2305cc8fa496847d61dc7320bb16262f9c55dd753480207234cdd96a93194e408341971742f4701772a025a # password
+  type: 0 # individual
+  salt: ZogKvWdyEx
+  is_admin: false
+  avatar: avatar24
+  avatar_email: [email protected]
+  num_repos: 0
+  num_stars: 0
+  num_followers: 0
+  num_following: 0
+  is_active: true
+
+-
+  id: 25
+  lower_name: org25
+  name: org25
+  full_name: "org25"
+  email: [email protected]
+  passwd: 7d93daa0d1e6f2305cc8fa496847d61dc7320bb16262f9c55dd753480207234cdd96a93194e408341971742f4701772a025a # password
+  type: 1 # organization
+  salt: ZogKvWdyEx
+  is_admin: false
+  avatar: avatar25
+  avatar_email: [email protected]
+  num_repos: 0
+  num_members: 1
+  num_teams: 1

models/migrate.go

@@ -62,38 +62,50 @@ func insertIssue(sess *xorm.Session, issue *Issue) error {
 	if _, err := sess.Insert(issueLabels); err != nil {
 		return err
 	}
+
+	cols := make([]string, 0)
 	if !issue.IsPull {
 		sess.ID(issue.RepoID).Incr("num_issues")
+		cols = append(cols, "num_issues")
 		if issue.IsClosed {
 			sess.Incr("num_closed_issues")
+			cols = append(cols, "num_closed_issues")
 		}
 	} else {
 		sess.ID(issue.RepoID).Incr("num_pulls")
+		cols = append(cols, "num_pulls")
 		if issue.IsClosed {
 			sess.Incr("num_closed_pulls")
+			cols = append(cols, "num_closed_pulls")
 		}
 	}
-	if _, err := sess.NoAutoTime().Update(issue.Repo); err != nil {
+	if _, err := sess.NoAutoTime().Cols(cols...).Update(issue.Repo); err != nil {
 		return err
 	}
 
+	cols = []string{"num_issues"}
 	sess.Incr("num_issues")
 	if issue.IsClosed {
 		sess.Incr("num_closed_issues")
+		cols = append(cols, "num_closed_issues")
 	}
-	if _, err := sess.In("id", labelIDs).NoAutoTime().Update(new(Label)); err != nil {
+	if _, err := sess.In("id", labelIDs).NoAutoTime().Cols(cols...).Update(new(Label)); err != nil {
 		return err
 	}
 
 	if issue.MilestoneID > 0 {
+		cols = []string{"num_issues"}
 		sess.Incr("num_issues")
+		cl := "num_closed_issues"
 		if issue.IsClosed {
 			sess.Incr("num_closed_issues")
+			cols = append(cols, "num_closed_issues")
+			cl = "(num_closed_issues + 1)"
 		}
 
 		if _, err := sess.ID(issue.MilestoneID).
-			SetExpr("completeness", "num_closed_issues * 100 / num_issues").
-			NoAutoTime().
+			SetExpr("completeness", cl+" * 100 / (num_issues + 1)").
+			NoAutoTime().Cols(cols...).
 			Update(new(Milestone)); err != nil {
 			return err
 		}

models/org.go

@@ -72,9 +72,12 @@ func (org *User) GetMembers() error {
 	}
 
 	var ids = make([]int64, len(ous))
+	var idsIsPublic = make(map[int64]bool, len(ous))
 	for i, ou := range ous {
 		ids[i] = ou.UID
+		idsIsPublic[ou.UID] = ou.IsPublic
 	}
+	org.MembersIsPublic = idsIsPublic
 	org.Members, err = GetUsersByIDs(ids)
 	return err
 }
@@ -298,15 +301,13 @@ type OrgUser struct {
 }
 
 func isOrganizationOwner(e Engine, orgID, uid int64) (bool, error) {
-	ownerTeam := &Team{
-		OrgID: orgID,
-		Name:  ownerTeamName,
-	}
-	if has, err := e.Get(ownerTeam); err != nil {
+	ownerTeam, err := getOwnerTeam(e, orgID)
+	if err != nil {
+		if err == ErrTeamNotExist {
+			log.Error("Organization does not have owner team: %d", orgID)
+			return false, nil
+		}
 		return false, err
-	} else if !has {
-		log.Error("Organization does not have owner team: %d", orgID)
-		return false, nil
 	}
 	return isTeamMember(e, orgID, ownerTeam.ID, uid)
 }

models/org_team.go

@@ -362,6 +362,11 @@ func GetTeam(orgID int64, name string) (*Team, error) {
 	return getTeam(x, orgID, name)
 }
 
+// getOwnerTeam returns team by given team name and organization.
+func getOwnerTeam(e Engine, orgID int64) (*Team, error) {
+	return getTeam(e, orgID, ownerTeamName)
+}
+
 func getTeamByID(e Engine, teamID int64) (*Team, error) {
 	t := new(Team)
 	has, err := e.ID(teamID).Get(t)

models/repo.go

@@ -1801,6 +1801,7 @@ func DeleteRepository(doer *User, uid, repoID int64) error {
 		&HookTask{RepoID: repoID},
 		&Notification{RepoID: repoID},
 		&CommitStatus{RepoID: repoID},
+		&RepoIndexerStatus{RepoID: repoID},
 	); err != nil {
 		return fmt.Errorf("deleteBeans: %v", err)
 	}