Skip to content
This repository has been archived by the owner on Oct 11, 2020. It is now read-only.

Commit

Permalink
Merge tag '1.15.24'
Browse files Browse the repository at this point in the history
  • Loading branch information
nicole-ashley committed Apr 10, 2018
2 parents 2a30892 + 98df44c commit fc35567
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
6 changes: 3 additions & 3 deletions dist/firefox/updates.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"[email protected]": {
"updates": [
{
"version": "1.15.19rc6",
"version": "1.15.23b0",
"applications": { "gecko": { "strict_min_version": "52" } },
"update_info_url": "https://github.com/gorhill/uBlock/releases/tag/1.15.19rc6",
"update_link": "https://github.com/gorhill/uBlock/releases/download/1.15.19rc6/uBlock0.webext.signed.xpi"
"update_info_url": "https://github.com/gorhill/uBlock/releases/tag/1.15.23b0",
"update_link": "https://github.com/gorhill/uBlock/releases/download/1.15.23b0/uBlock0.webext.signed.xpi"
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion dist/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.15.22
1.15.24
10 changes: 10 additions & 0 deletions src/js/start.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,16 @@ var onPSLReady = function() {
var onVersionReady = function(lastVersion) {
if ( lastVersion === vAPI.app.version ) { return; }

// Since AMO does not allow updating resources.txt, force a reload when a
// new version is detected, as resources.txt may have changed since last
// release. This will be done only for release versions of Firefox.
if (
/^Mozilla-Firefox-/.test(vAPI.webextFlavor) &&
/(b|rc)\d+$/.test(vAPI.app.version) === false
) {
µb.redirectEngine.invalidateResourcesSelfie();
}

// From 1.15.19b9 and above, the `behind-the-scene` scope is no longer
// whitelisted by default, and network requests from that scope will be
// subject to filtering by default.
Expand Down

0 comments on commit fc35567

Please sign in to comment.