launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/git-permissions-personmerge-whitelist into lp:launchpad.

Commit message:
Temporarily whitelist GitRuleGrant.grantee from personmerge.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1517559 in Launchpad itself: "git fine-grained permissions"
  https://bugs.launchpad.net/launchpad/+bug/1517559

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/git-permissions-personmerge-whitelist/+merge/355983

Needed to land https://code.launchpad.net/~cjwatson/launchpad/db-git-permissions/+merge/354200.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/git-permissions-personmerge-whitelist into lp:launchpad.

=== modified file 'lib/lp/registry/personmerge.py'
--- lib/lp/registry/personmerge.py	2015-09-16 13:30:33 +0000
+++ lib/lp/registry/personmerge.py	2018-10-02 12:40:06 +0000
@@ -732,6 +732,10 @@
         ('latestpersonsourcepackagereleasecache', 'maintainer'),
         # Obsolete table.
         ('branchmergequeue', 'owner'),
+        # This needs handling before we deploy the Git permissions model
+        # code, but can be ignored for the purpose of deploying the database
+        # tables.
+        ('gitrulegrant', 'grantee'),
         ]
 
     references = list(postgresql.listReferences(cur, 'person', 'id'))