Merge lp:~cjwatson/launchpad/git-personmerge-whitelist into lp:launchpad

Proposed by Colin Watson on 2015-02-06
Status: Merged
Approved by: Colin Watson on 2015-02-10
Approved revision: no longer in the source branch.
Merged at revision: 17336
Proposed branch: lp:~cjwatson/launchpad/git-personmerge-whitelist
Merge into: lp:launchpad
Diff against target: 13 lines (+3/-0)
1 file modified
lib/lp/registry/ (+3/-0)
To merge this branch: bzr merge lp:~cjwatson/launchpad/git-personmerge-whitelist
Reviewer Review Type Date Requested Status
William Grant code 2015-02-06 Approve on 2015-02-10
Review via email:

Commit message

Temporarily whitelist gitrepository.owner from personmerge.

Description of the change

Temporarily whitelist gitrepository.owner from personmerge.

This needs to be rolled out to production before is rolled out, although the exact set of columns to whitelist depends on review of that branch.

To post a comment you must log in.
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/registry/'
2--- lib/lp/registry/ 2014-06-18 18:29:13 +0000
3+++ lib/lp/registry/ 2015-02-10 00:48:10 +0000
4@@ -691,6 +691,9 @@
5 ('bugsummaryjournal', 'viewed_by'),
6 ('latestpersonsourcepackagereleasecache', 'creator'),
7 ('latestpersonsourcepackagereleasecache', 'maintainer'),
8+ # This needs handling before we deploy the git code, but can be
9+ # ignored for the purpose of deploying the database tables.
10+ ('gitrepository', 'owner'),
11 ]
13 references = list(postgresql.listReferences(cur, 'person', 'id'))