lp:~bac/launchpad/bug-652149

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:launchpad at revision 11789

Curtis Hovey (community): Approve (ui) on 2010-10-20

Henning Eggers (community): Approve (ui*) on 2010-10-20

Jeroen T. Vermeulen (community): Approve (code) on 2010-10-19

Diff: 485 lines (+192/-55)

8 files modified

lib/lp/code/browser/branchlisting.py (+3/-1)
lib/lp/code/browser/branchvisibilitypolicy.py (+21/-14)
lib/lp/code/browser/tests/test_branchlisting.py (+77/-13)
lib/lp/code/stories/branches/xx-branch-visibility-policy.txt (+51/-15)
lib/lp/code/templates/branch-visibility.pt (+2/-2)
lib/lp/code/templates/project-branches.pt (+37/-8)
lib/lp/registry/browser/project.py (+1/-1)
lib/lp/testing/sampledata.py (+0/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #652149: Branch visibility status and link missing on project group front page

High

Fix Released

Link a bug report

Related blueprints

11706. By Brad Crittenden on 2010-10-23

Merge from devel

11705. By Brad Crittenden on 2010-10-23

Merged new tests from devel

11704. By Brad Crittenden on 2010-10-22

Merge from devel. Encountered conflicts with branchlisting files.

11703. By Brad Crittenden on 2010-10-22

Fixed portlet spacing

11702. By Brad Crittenden on 2010-10-20

Changed display of inherited branch vis policy for projects. Reverted change to product-branches.pt.

11701. By Brad Crittenden on 2010-10-19

Do not use (expensive) browser in tests, refactor BranchVisiblityPolicyMixin, streamline expected output in tests.

11700. By Brad Crittenden on 2010-10-18

Fixed lint

11699. By Brad Crittenden on 2010-10-18

Fixed lint

11698. By Brad Crittenden on 2010-10-18

Added default branch visibility statement and give admins and commercial admins a 'define branch visibility' llink in an action portlet

11697. By Brad Crittenden on 2010-10-18

Simplified template by using enum value