Launchpad itself

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

  1. git-permissions-personmerge-whitelist
  2. Merge into devel
Proposed by Colin Watson
Status: Merged
Merged at revision: 18785
Proposed branch: lp:~cjwatson/launchpad/git-permissions-personmerge-whitelist
Merge into: lp:launchpad
Diff against target: 14 lines (+4/-0)
1 file modified
lib/lp/registry/personmerge.py (+4/-0)
To merge this branch: bzr merge lp:~cjwatson/launchpad/git-permissions-personmerge-whitelist
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+355983@code.launchpad.net

Commit message

Temporarily whitelist GitRuleGrant.grantee from personmerge.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

Self-approving per the LP meeting today.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/registry/personmerge.py'
2--- lib/lp/registry/personmerge.py 2015-09-16 13:30:33 +0000
3+++ lib/lp/registry/personmerge.py 2018-10-02 12:40:06 +0000
4@@ -732,6 +732,10 @@
5 ('latestpersonsourcepackagereleasecache', 'maintainer'),
6 # Obsolete table.
7 ('branchmergequeue', 'owner'),
8+ # This needs handling before we deploy the Git permissions model
9+ # code, but can be ignored for the purpose of deploying the database
10+ # tables.
11+ ('gitrulegrant', 'grantee'),
12 ]
13
14 references = list(postgresql.listReferences(cur, 'person', 'id'))