We want all the bugs blocking bug 1030832 except bug 1036288 which landed in 33 before merge. 22 bugs with patches in total. There are 3 bugs with patches that cannot be directly uplifted as-is from m-c as they involve string changes: bug 1037091, bug 1040369, bug 1053530. Each of those bugs have aurora delta patches that will be squashed into a single change to avoid locales changes. One bug 1056279 is landing directly on Firefox 33 to provide a way to turn off the feature for non-en-US users and potentially all users if we need to do so.

Requestin a? with patches all together as there's earlier bugs with later tweaks that don't make sense to test the intermediate states by landing them chunks at a time. Approval Request Comment [Feature/regressing bug #]: Enhanced Tiles bug 1030832 [User impact if declined]: Users will see the original directory tiles content and styling with improper sponsored indicator that we've replaced with the new enhanced tile styling. [Describe test coverage new/current, TBPL]: Most bugs had tests when initially landing except for the style tweaks. [Risks and why]: A third of the bugs landed 4 weeks ago, half as additional minor styling tweaks, and remaining few have new functionality that landed/are landing: data ping bug 1042214, sponsored indicator 1040369, intro panel bug 1053530. With bug 1056279 included, there's a simple switch to turn off all the functionality (instead of turning it off only for non en-US). [String/UUID change made/needed]: Explicitly no locales/ directory strings changed with these patches as the feature is en-US for Firefox 33, so there are new strings hardcoded in js files to support en-US.

Backed out for attempting to connect to the outside network. https://hg.mozilla.org/releases/mozilla-aurora/rev/5ff5ecda2dfb https://tbpl.mozilla.org/php/getParsedLog.php?id=46636574&tree=Mozilla-Aurora

Sorry about that RyanVM, I didn't realize someone was going to land this for us. I'll take care of it to preserve the changelog and fix up the network issue.

Ed, when are you planning to resubmit? I would like to see this change this week (before next week merge). Thanks

Sorry for the delay. I've been investigating if a beta bug 1046645 would affect this uplift. I should be able to land the changes later today with additional 33-specific tests that adw suggested in bug 1056279.

(In reply to Ed Lee :Mardak from comment #6) > I should be able to land the changes later today with additional 33-specific tests https://hg.mozilla.org/releases/mozilla-aurora/pushloghtml?changeset=d9a70b065d65 24 changesets landed with a few minutes to spare! ;)

Thanks and congrat!

Just to log this somewhere.. Generating the "pick" lines for "git rebase -i" when on the aurora branch to find newtab related changes to uplift: git log gecko/aurora..gecko/master --format='format:pick %h %s' --reverse browser/{base/content{,/test},themes/shared}/newtab browser/locales/en-US/chrome/browser/newTab.* toolkit/modules/{DirectoryLinksProvider,NewTabUtils}.jsm testing/talos/talos.json layout/tools/reftest/runreftest.py | grep -vE '(556b135|2d5b47f|b610bd4|eda17f7|0233743|cbcdd8a|5626bfe|4df3aea|b63e547|b46b4a5|cc1073a|7ea4dd5|7a148d6)' And to generate the hg changesets to then "hg import" into mozilla-aurora: git show --binary gecko/aurora..aurora --reverse --format='format:# HG changeset patch%n# User %an <%ae>%n# Date %ad%n%B'

Closing this bug since all of its dependencies were verified on Firefox 34 Nightly and on Firefox 33 Aurora.