From 9621c70a84aebaa6cb98e4c8594db440b0c6e119 Mon Sep 17 00:00:00 2001 From: Rail Aliiev Date: Fri, 8 Nov 2013 14:22:58 -0500 Subject: [PATCH 1/5] Bug 917642 - [Helix] Please update the helix blobs. r=nhirata --- b2g/config/helix/releng-helix.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/helix/releng-helix.tt b/b2g/config/helix/releng-helix.tt index f5e92ae73b59..ceb56142d779 100644 --- a/b2g/config/helix/releng-helix.tt +++ b/b2g/config/helix/releng-helix.tt @@ -1,7 +1,7 @@ [ { -"size": 86149048, -"digest": "4ff723d8a372e2af95e62efb8739517943f362b515b4cee78006137a8dbc97f3b42edbd2e17429eaa7fa16b7f24594ed058b7032bcb7aa2ecfe9788a212dda4d", +"size": 60589756, +"digest": "29f6a7f09edbcc777ab155de64b4c7ff8c79ea25021bacc95a44d2ee8b7b13caa72991294b05dac1d841128a90eced3f52bcc3399ead4452f6170742e0e52fc1", "algorithm": "sha512", "filename": "helix-ics.tar.xz" }, From 73f4b6d572bffcda5a60ba70c4f932861f97b7a2 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Fri, 8 Nov 2013 11:55:25 -0800 Subject: [PATCH 2/5] Bumping gaia.json for 5 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/73ad695024d1 Author: Kevin Grandon Desc: Merge pull request #13104 from KevinGrandon/bug_922658_settings_subpanel_hotspot Bug 930404 - [Settings] Split up hotspot panel ======== https://hg.mozilla.org/integration/gaia-central/rev/7adb2edab543 Author: Kevin Grandon Desc: Bug 930404 - [Settings] Split up hotspot.js ======== https://hg.mozilla.org/integration/gaia-central/rev/96876a22fe73 Author: Kevin Grandon Desc: Merge pull request #13524 from KevinGrandon/revert_pr_13368 Bug 920839 - Travis is red - Try reverting pull request 13368 r=kgrandon ======== https://hg.mozilla.org/integration/gaia-central/rev/8c900b57bdd2 Author: Kevin Grandon Desc: Revert "Bug 920839 - ARIA fixes to value selector." This reverts commit 2c585692098082a9bb38558c8739a8e91cda5591. ======== https://hg.mozilla.org/integration/gaia-central/rev/b27f450c1e17 Author: Kevin Grandon Desc: Revert "Bug 920839 - Added spinbutton ARIA markup to value picker." This reverts commit 0d5fd65dc4f43102c38fafb756f0b9c1968d74c3. --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 6ba05cbb7f6d..a9d71cff9181 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "979add320adbf777379cfd1044978392c576aaf8", + "revision": "73ad695024d19067b7f4cfeb7408dbad4db6efdb", "repo_path": "/integration/gaia-central" } From 0f56e91baf7fd98595f03b7a4e6e5fc74f218422 Mon Sep 17 00:00:00 2001 From: Karl Dubost Date: Fri, 8 Nov 2013 15:25:25 -0500 Subject: [PATCH 3/5] Bug 923442 - Remove UA override for domains starting 2013-10-03. r=lmandel --- b2g/app/ua-update.json.in | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/b2g/app/ua-update.json.in b/b2g/app/ua-update.json.in index 7f1d28cc61a6..e8b6ad6e7aaf 100644 --- a/b2g/app/ua-update.json.in +++ b/b2g/app/ua-update.json.in @@ -43,12 +43,8 @@ "ebay.com": "\\(Mobile#(Android; Mobile", // bug 827622, bing.com "bing.com": "\\(Mobile#(Android; Mobile", - // bug 827625, pagseguro.uol.com.br - "pagseguro.uol.com.br": "\\(Mobile#(Android; Mobile", // bug 827626, magazineluiza.com.br "magazineluiza.com.br": "\\(Mobile#(Android; Mobile", - // bug 827627, bol.uol.com.br - "bol.uol.com.br": "Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19", // bug 827628, groupon.com.br "groupon.com.br": "\\(Mobile#(Android; Mobile", // bug 827630, vagalume.com.br @@ -83,8 +79,6 @@ "sport.pl": "\\(Mobile#(Android; Mobile", // bug 828364, nk.pl "nk.pl": "\\(Mobile#(Android; Mobile", - // bug 828366, wyborcza.biz - "wyborcza.biz": "\\(Mobile#(Android; Mobile", // bug 828369, money.pl "money.pl": "\\(Mobile#(Android; Mobile", // bug 828371, ingbank.pl @@ -215,8 +209,6 @@ "download.com": "\\(Mobile#(Android; Mobile", // bug 878264, haber.ba "haber.ba": "\\(Mobile#(Android; Mobile", - // bug 878268, jutarnji.hr - "jutarnji.hr": "\\(Mobile#(Android; Mobile", // bug 878271, kurir-info.rs "kurir-info.rs": "\\(Mobile#(Android; Mobile", // bug 878273, livescore.com @@ -233,8 +225,6 @@ "ask.com": "\\(Mobile#(Android; Mobile", // bug 878632, banorte.com "banorte.com": "\\(Mobile#(Android; Mobile", - // bug 878634, buenastareas.com - "buenastareas.com": "\\(Mobile#(Android; Mobile", // bug 878637, eluniversal.com.mx "eluniversal.com.mx": "\\(Mobile#(Android; Mobile", // bug 878640, hootsuite.com From f796145242afceffd91bc2e82192445675a32414 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Fri, 8 Nov 2013 13:05:28 -0800 Subject: [PATCH 4/5] Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/58804c21cd21 Author: Gareth Aye Desc: Merge pull request #13532 from gaye/lightsofapollo-bug-832258-hide-sync-button Bug 832258 - Hide sync button r=gaye ======== https://hg.mozilla.org/integration/gaia-central/rev/5084eda4abd4 Author: Gareth Aye Desc: Merge branch 'bug-832258-hide-sync-button' of https://github.com/lightsofapollo/gaia into lightsofapollo-bug-832258-hide-sync-button Conflicts: apps/calendar/js/views/settings.js ======== https://hg.mozilla.org/integration/gaia-central/rev/540bc492232a Author: James Lal Desc: Show/hide sync button when account is added/removed ======== https://hg.mozilla.org/integration/gaia-central/rev/a51cd8a2c98f Author: James Lal Desc: Store.Account#syncableAccounts --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index a9d71cff9181..2e55abb3824a 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "73ad695024d19067b7f4cfeb7408dbad4db6efdb", + "revision": "58804c21cd21a37dc611078e8b8717ce0f85c6dd", "repo_path": "/integration/gaia-central" } From b89289f5bd53da14b8634817673a1cc53c454483 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Fri, 8 Nov 2013 13:30:25 -0800 Subject: [PATCH 5/5] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/cc492bd8ccdf Author: Etienne Segonzac Desc: Merge pull request #13525 from etiennesegonzac/bug-936095-stack-manager-stay-background-apps Bug 936095 - Adding "stayBackground" apps at the bottom of the stack. r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/9d125b80c4f4 Author: Etienne Segonzac Desc: Bug 936095 - Adding "stayBackground" apps at the bottom of the stack. r=alive --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 2e55abb3824a..5d19548f5b3c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "58804c21cd21a37dc611078e8b8717ce0f85c6dd", + "revision": "cc492bd8ccdfb6f02734b7e13d970c605c8a4f87", "repo_path": "/integration/gaia-central" }