diff --git a/.hgignore b/.hgignore
index 19916357f47..619012cedad 100644
--- a/.hgignore
+++ b/.hgignore
@@ -81,3 +81,15 @@ GPATH
# Git clone directory for updating web-platform-tests
^testing/web-platform/sync/
+
+# Loop web client build/deploy dependencies
+^browser/components/loop/standalone/bower_components
+
+# Loop legal content build/deploy artifacts
+
+# XXX Once a grunt contrib-clean command has been added (bug 1066491), or
+# once legal has centralized their ToS and PP hosting infrastructure,
+# (expected Q4 2014) the legal doc build stuff for Loop can be removed,
+# including the following three lines
+^browser/components/loop/standalone/content/legal/styles/.*\.css$
+^browser/components/loop/standalone/content/legal/terms/en_US\.html$
diff --git a/addon-sdk/source/test/addons/page-mod-debugger-post/main.js b/addon-sdk/source/test/addons/page-mod-debugger-post/main.js
index d250697bae8..fc276fc09da 100644
--- a/addon-sdk/source/test/addons/page-mod-debugger-post/main.js
+++ b/addon-sdk/source/test/addons/page-mod-debugger-post/main.js
@@ -132,7 +132,4 @@ function closeConnection() {
return deferred.promise;
}
-// bug 1042976 - temporary test disable
-module.exports = {};
-
require('sdk/test/runner').runTestsFromModule(module);
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index d4802edda4a..fe61d8e2688 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -292,7 +292,7 @@ pref("browser.slowStartup.maxSamples", 5);
// This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
// this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream
// repackager of this code using an alternate snippet url, please keep your users safe
-pref("browser.aboutHomeSnippets.updateUrl", "https://snippets.mozilla.com/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/");
+pref("browser.aboutHomeSnippets.updateUrl", "https://snippets.cdn.mozilla.net/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/");
pref("browser.enable_automatic_image_resizing", true);
pref("browser.chrome.site_icons", true);
@@ -1598,7 +1598,7 @@ pref("loop.throttled", false);
pref("loop.enabled", true);
pref("loop.throttled", true);
pref("loop.soft_start_ticket_number", -1);
-pref("loop.soft_start_hostname", "soft-start.loop-dev.stage.mozaws.net");
+pref("loop.soft_start_hostname", "soft-start.loop.services.mozilla.com");
#endif
pref("loop.server", "https://loop.services.mozilla.com");
diff --git a/browser/base/content/browser-gestureSupport.js b/browser/base/content/browser-gestureSupport.js
index 2b700dfd4c4..780bb69e4e2 100644
--- a/browser/base/content/browser-gestureSupport.js
+++ b/browser/base/content/browser-gestureSupport.js
@@ -189,12 +189,12 @@ let gGestureSupport = {
let isVerticalSwipe = false;
if (aEvent.direction == aEvent.DIRECTION_UP) {
- if (content.pageYOffset > 0) {
+ if (gMultiProcessBrowser || content.pageYOffset > 0) {
return false;
}
isVerticalSwipe = true;
} else if (aEvent.direction == aEvent.DIRECTION_DOWN) {
- if (content.pageYOffset < content.scrollMaxY) {
+ if (gMultiProcessBrowser || content.pageYOffset < content.scrollMaxY) {
return false;
}
isVerticalSwipe = true;
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index ffe38a0798d..540b0cbe8d8 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -393,7 +393,8 @@ panel[noactions] > richlistbox > richlistitem[type~="action"] > .ac-url-box > .a
visibility: visible;
}
-#urlbar:not([actiontype]) > #urlbar-display-box {
+#urlbar:not([actiontype]) > #urlbar-display-box,
+#urlbar:not([actiontype="switchtab"]) > #urlbar-display-box > .urlbar-display-switchtab {
display: none;
}
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 7498528cb06..fc884adce6d 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -756,7 +756,7 @@
-
+