Launchpad itself

Merge lp:~abentley/launchpad/test into lp:launchpad

  1. test
  2. Merge into devel
Proposed by Aaron Bentley
Status: Merged
Approved by: Aaron Bentley
Approved revision: not available
Merged at revision: 13779
Proposed branch: lp:~abentley/launchpad/test
Merge into: lp:launchpad
Diff against target: 0 lines
To merge this branch: bzr merge lp:~abentley/launchpad/test
Reviewer Review Type Date Requested Status
Aaron Bentley (community) Approve
Review via email: mp+72746@code.launchpad.net

Commit message

Revert regression of Branch.landing_candidates.

Description of the change

= Summary =
Fix regression causing https://wiki.canonical.com/IncidentReports/2011-08-24-LP-merge-proposals-and-private-branches

== Proposed fix ==
Restore Branch.landing_candidates to its previous form.

== Pre-implementation notes ==
Discussed with deryck and rockstar

== Implementation details ==

== Tests ==
bin/test -t TestLandingCandidates

== Demo and Q/A ==
View the Branch Merges section of a private branch or exercise landing_candidates over the web service.

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/code/model/branch.py
  lib/lp/code/model/tests/test_branch.py

To post a comment you must log in.
Revision history for this message
Aaron Bentley (abentley) :
review: Approve

Preview Diff

Empty