Launchpad itself

Merge lp:~jtv/launchpad/bug-487445 into lp:launchpad/db-devel

  1. bug-487445
  2. Merge into db-devel
Proposed by Jeroen T. Vermeulen
Status: Merged
Approved by: Henning Eggers
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~jtv/launchpad/bug-487445
Merge into: lp:launchpad/db-devel
Diff against target: 15 lines (+5/-3)
1 file modified
lib/canonical/launchpad/javascript/translations/translations.js (+5/-3)
To merge this branch: bzr merge lp:~jtv/launchpad/bug-487445
Reviewer Review Type Date Requested Status
Henning Eggers (community) code Approve
Review via email: mp+15185@code.launchpad.net

Commit message

Fix merge conflict without breaking import queue UI.

To post a comment you must log in.
Revision history for this message
Jeroen T. Vermeulen (jtv) wrote :

= Bug 487447 =

This resolves a merge conflict between two projects from the lazr-js sprint:

 * Salgado made the "requires" sections JSON-compatible.

 * Henning ajacified the import queue UI, adding to the "requires" section in the process.

A fix for the conflict has already landed, but it simply chose Salgado's change over Henning's—meaning that it will break the new import queue UI.

This branch combines the two fixes. There's some lint outside the affected area, but given that this is emergency conflict resolution I'm not going to throw in any drive-bys.

Jeroen

Revision history for this message
Henning Eggers (henninge) wrote :

Thanks for the quick fix!

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/launchpad/javascript/translations/translations.js'
2--- lib/canonical/launchpad/javascript/translations/translations.js 2009-11-24 06:31:56 +0000
3+++ lib/canonical/launchpad/javascript/translations/translations.js 2009-11-24 09:35:27 +0000
4@@ -183,6 +183,8 @@
5 spinner_loader.set('innerHTML', '');
6 };
7
8-// "oop" and "event" are required to fix known bugs in YUI, which
9-// are apparently fixed in a later version.
10-}, "0.1", {"requires": ["oop", "event", "node"]});
11+}, "0.1", {
12+ // "oop" and "event" are required to fix known bugs in YUI, which
13+ // are apparently fixed in a later version.
14+ "requires": ["oop", "event", "node", "widget", "plugin", "overlay",
15+ "lazr.choiceedit", "lp.client.plugins", "lp.errors"]});

Subscribers

People subscribed via source and target branches

to status/vote changes: