From 4328d8e8d72c49ee92566f1e6b17edf177004cc7 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 6 Aug 2019 14:32:11 +0800 Subject: [PATCH 1/3] fix rename failed when rewrite public keys (#7761) --- models/ssh_key.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/models/ssh_key.go b/models/ssh_key.go index b2a905305a..4f93b5c44f 100644 --- a/models/ssh_key.go +++ b/models/ssh_key.go @@ -685,12 +685,14 @@ func rewriteAllPublicKeys(e Engine) error { } _, err = t.WriteString(line + "\n") if err != nil { + f.Close() return err } } - defer f.Close() + f.Close() } + t.Close() return os.Rename(tmpPath, fPath) } From 0470b16e8a0afdf276f432f9bc462a9c8796d0c3 Mon Sep 17 00:00:00 2001 From: guillep2k Date: Tue, 6 Aug 2019 05:57:55 -0300 Subject: [PATCH 2/3] Add migration step to remove old repo_indexer_status orphaned records (#7746) * Add migration step to remove old repo_indexer_status orphaned records * Include RepoIndexerStatus struct definition in the migrate function * Change .Delete(o) into ID(o.ID).Delete(new(RepoIndexerStatus)) * Simplification of the delete procedure * Rename v91.go to v92.go --- models/migrations/migrations.go | 2 ++ models/migrations/v92.go | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 models/migrations/v92.go diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index bbd1bb734f..9ffcfb4df2 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -238,6 +238,8 @@ var migrations = []Migration{ NewMigration("change length of some repository columns", changeSomeColumnsLengthOfRepo), // v91 -> v92 NewMigration("add index on owner_id of repository and type, review_id of comment", addIndexOnRepositoryAndComment), + // v92 -> v93 + NewMigration("remove orphaned repository index statuses", removeLingeringIndexStatus), } // Migrate database to current version diff --git a/models/migrations/v92.go b/models/migrations/v92.go new file mode 100644 index 0000000000..090332f151 --- /dev/null +++ b/models/migrations/v92.go @@ -0,0 +1,16 @@ +// Copyright 2019 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package migrations + +import ( + "github.com/go-xorm/xorm" + "xorm.io/builder" +) + +func removeLingeringIndexStatus(x *xorm.Engine) error { + + _, err := x.Exec(builder.Delete(builder.NotIn("`repo_id`", builder.Select("`id`").From("`repository`"))).From("`repo_indexer_status`")) + return err +} From 28c5ae27d698732b2a42b9a25e9e3b99a28b2ce0 Mon Sep 17 00:00:00 2001 From: WGH Date: Wed, 7 Aug 2019 02:27:10 +0300 Subject: [PATCH 3/3] Fix Slack webhook fork message (#7774) The order of forkee and fork was mixed up. --- models/webhook_slack.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/webhook_slack.go b/models/webhook_slack.go index f422953e41..9c179bb24a 100644 --- a/models/webhook_slack.go +++ b/models/webhook_slack.go @@ -120,8 +120,8 @@ func getSlackDeletePayload(p *api.DeletePayload, slack *SlackMeta) (*SlackPayloa // getSlackForkPayload composes Slack payload for forked by a repository. func getSlackForkPayload(p *api.ForkPayload, slack *SlackMeta) (*SlackPayload, error) { - baseLink := SlackLinkFormatter(p.Repo.HTMLURL, p.Repo.Name) - forkLink := SlackLinkFormatter(p.Forkee.HTMLURL, p.Forkee.FullName) + baseLink := SlackLinkFormatter(p.Forkee.HTMLURL, p.Forkee.FullName) + forkLink := SlackLinkFormatter(p.Repo.HTMLURL, p.Repo.FullName) text := fmt.Sprintf("%s is forked to %s", baseLink, forkLink) return &SlackPayload{ Channel: slack.Channel,