Merge lp://qastaging/loggerhead/1.18 into lp://qastaging/loggerhead
Proposed by
Jelmer Vernooij
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | John A Meinel | ||||||||
| Approved revision: | 424 | ||||||||
| Merged at revision: | 457 | ||||||||
| Proposed branch: | lp://qastaging/loggerhead/1.18 | ||||||||
| Merge into: | lp://qastaging/loggerhead | ||||||||
| Diff against target: |
122 lines (+59/-1) (has conflicts) 4 files modified
NEWS (+14/-0) loggerhead/__init__.py (+1/-1) loggerhead/controllers/view_ui.py (+36/-0) loggerhead/templatefunctions.py (+8/-0) Text conflict in NEWS Text conflict in loggerhead/controllers/view_ui.py Text conflict in loggerhead/templatefunctions.py |
||||||||
| To merge this branch: | bzr merge lp://qastaging/loggerhead/1.18 | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| John A Meinel | Approve | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2011-09-08.
Description of the change
Merge in the 1.18 branch, for the right changelog entries.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 09/08/2011 01:37 AM, Jelmer Vernooij wrote:
> Jelmer Vernooij has proposed merging lp:loggerhead/1.18 into lp:loggerhead.
>
> Requested reviews:
> Loggerhead Reviewers (loggerhead-
> Related bugs:
> Bug #673999 in loggerhead: "missing import logging.handlers in start-loggerhead"
> https:/
> Bug #740142 in loggerhead: "persistent xss vector in (unescaped) filenames in revision views "
> https:/
>
> For more details, see:
> https:/
>
> Merge in the 1.18 branch, for the right changelog entries.
merge: approve
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://
iEYEARECAAYFAk5
tSsAnRNn8AJh/
=kZBo
-----END PGP SIGNATURE-----