From 3934d9cd2f46bb5240f3c5dd7e7e3423eaa5c339 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 19 Mar 2019 02:54:34 -0400 Subject: [PATCH 01/84] Disable benchmarking during tag events on DroneIO (#6365) (#6366) --- .drone.yml | 64 +++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/.drone.yml b/.drone.yml index 311d3fd611..b46033e49c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -211,41 +211,41 @@ pipeline: when: event: [ push, tag, pull_request ] - bench-sqlite: - image: golang:1.12 - pull: true - group: bench - commands: - - make bench-sqlite - when: - event: [ tag ] +# bench-sqlite: +# image: golang:1.12 +# pull: true +# group: bench +# commands: +# - make bench-sqlite +# when: +# event: [ tag ] - bench-mysql: - image: golang:1.12 - pull: true - group: bench - commands: - - make bench-mysql - when: - event: [ tag ] +# bench-mysql: +# image: golang:1.12 +# pull: true +# group: bench +# commands: +# - make bench-mysql +# when: +# event: [ tag ] - bench-mssql: - image: golang:1.12 - pull: true - group: bench - commands: - - make bench-mssql - when: - event: [ tag ] +# bench-mssql: +# image: golang:1.12 +# pull: true +# group: bench +# commands: +# - make bench-mssql +# when: +# event: [ tag ] - bench-pgsql: - image: golang:1.12 - pull: true - group: bench - commands: - - make bench-pgsql - when: - event: [ tag ] +# bench-pgsql: +# image: golang:1.12 +# pull: true +# group: bench +# commands: +# - make bench-pgsql +# when: +# event: [ tag ] generate-coverage: image: golang:1.12 From 16815306ad97488b35b7d6786fac24dea3907610 Mon Sep 17 00:00:00 2001 From: Lanre Adelowo Date: Tue, 19 Mar 2019 23:40:54 +0100 Subject: [PATCH 02/84] make sure units of a team are returned (#6379) (#6381) --- models/org_team.go | 5 +++++ routers/api/v1/org/team.go | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/models/org_team.go b/models/org_team.go index 22fb6eae24..40fdeaa75e 100644 --- a/models/org_team.go +++ b/models/org_team.go @@ -33,6 +33,11 @@ type Team struct { Units []*TeamUnit `xorm:"-"` } +// GetUnits return a list of available units for a team +func (t *Team) GetUnits() error { + return t.getUnits(x) +} + func (t *Team) getUnits(e Engine) (err error) { if t.Units != nil { return nil diff --git a/routers/api/v1/org/team.go b/routers/api/v1/org/team.go index a1916db00b..de5e9e7f1f 100644 --- a/routers/api/v1/org/team.go +++ b/routers/api/v1/org/team.go @@ -38,6 +38,11 @@ func ListTeams(ctx *context.APIContext) { apiTeams := make([]*api.Team, len(org.Teams)) for i := range org.Teams { + if err := org.Teams[i].GetUnits(); err != nil { + ctx.Error(500, "GetUnits", err) + return + } + apiTeams[i] = convert.ToTeam(org.Teams[i]) } ctx.JSON(200, apiTeams) From 00619a04f7aee8141484e6dea67ad2d8d06e5340 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 20 Mar 2019 10:19:16 +0800 Subject: [PATCH 03/84] fix bug manifest.json will not request with cookie so that session will created every request (#6372) (#6382) --- templates/base/head.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index 8c2b4c1357..8d40c26fdc 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -5,7 +5,7 @@ {{if .Title}}{{.Title}} - {{end}}{{AppName}} - +