~twom/launchpad:git-branch-picker-unpicked-with-merge-pickers

Branch merges

Propose for merging

Merged into launchpad:master

Colin Watson (community): Approve on 2020-11-24

Diff: 383 lines (+70/-99)

4 files modified

lib/lp/code/browser/gitref.py (+42/-63)
lib/lp/code/browser/tests/test_branchmergeproposal.py (+24/-24)
lib/lp/code/interfaces/branchmergeproposal.py (+2/-2)
lib/lp/code/templates/gitref-register-merge.pt (+2/-10)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

38f91a5... by Tom Wardill on 2020-11-25

Prerequisite should be at the bottom

3021f16... by Tom Wardill on 2020-11-25

Better code structure

ab7fd12... by Tom Wardill on 2020-11-25

Change titles to remove reference reference

8973d17... by Tom Wardill on 2020-11-25

Add description to prerequisite

9ea0d4b... by Tom Wardill on 2020-11-19

Enable auto complete on git branch merge proposal

3ac05ee... by Colin Watson on 2020-11-25

Fix join handling in QuestionSearch

Merged from https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/394462

11b9356... by Colin Watson on 2020-11-25

Fix text matching in TestSignatureVerification

Merged from https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/394463

341215d... by Colin Watson on 2020-11-25

Fix parse_diff for Python 3

Merged from https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/394408

122926d... by Colin Watson on 2020-11-25

Fix text matching in TestSignatureVerification

This was broken by correcting the spelling of \-escapes.

0391b14... by Colin Watson on 2020-11-25

Fix join handling in QuestionSearch

This was broken by converting nl_search to Storm.