[mb-commits] branch, beta, updated. Merge remote-tracking branch 'nikki/itunes2' into beta Update iTunes match/ cl...

The branch, beta has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=c3554d8832c07db13cf0dd5ca30b332a06393e35 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=babbd10a4327b76c0443d05e3d2615835cda9da1 (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=9f7cda3e6c2e4ff679540abffacfdfe5e7b17966 (commit)

Summary of changes:
 root/static/scripts/edit/MB/Control/URLCleanup.js |    2 +-
 root/static/scripts/tests/Control/URLCleanup.js   |   13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c3554d8832c07db13cf0dd5ca30b332a06393e35
Merge: 9f7cda3 babbd10
Author: warp <[email protected]>
Date:   Mon Nov 5 11:14:42 2012 +0100

    Merge remote-tracking branch 'nikki/itunes2' into beta
    
    * nikki/itunes2:
      Update iTunes match/cleanup to use https


commit babbd10a4327b76c0443d05e3d2615835cda9da1
Author: nikki <[email protected]>
Date:   Mon Nov 5 02:20:20 2012 +0000

    Update iTunes match/cleanup to use https

diff --git a/root/static/scripts/edit/MB/Control/URLCleanup.js b/root/static/scripts/edit/MB/Control/URLCleanup.js
index b8d7e2e..08fab69 100644
--- a/root/static/scripts/edit/MB/Control/URLCleanup.js
+++ b/root/static/scripts/edit/MB/Control/URLCleanup.js
@@ -232,7 +232,7 @@ MB.constants.CLEANUPS = {
         match: new RegExp("^https?://itunes.apple.com/", "i"),
         type: MB.constants.LINK_TYPES.downloadpurchase,
         clean: function(url) {
-            return url.replace(/^https?:\/\/itunes\.apple\.com\/([a-z]{2}\/)?(artist|album|music-video|preorder)\/([a-z0-9!.-]+\/)?(id[0-9]+)(\?.*)?$/, "http://itunes.apple.com/$1$2/$4");
+            return url.replace(/^https?:\/\/itunes\.apple\.com\/([a-z]{2}\/)?(artist|album|music-video|preorder)\/([a-z0-9!.-]+\/)?(id[0-9]+)(\?.*)?$/, "https://itunes.apple.com/$1$2/$4");
         }
     },
     jamendo: {
diff --git a/root/static/scripts/tests/Control/URLCleanup.js b/root/static/scripts/tests/Control/URLCleanup.js
index 33366f2..3836c9c 100644
--- a/root/static/scripts/tests/Control/URLCleanup.js
+++ b/root/static/scripts/tests/Control/URLCleanup.js
@@ -322,24 +322,29 @@ MB.tests.URLCleanup.GuessType = function() {
                 ],
                 [
                     'http://itunes.apple.com/artist/hangry-angry-f/id444923726',
-                    'http://itunes.apple.com/artist/id444923726',
+                    'https://itunes.apple.com/artist/id444923726',
                     'artist'
                 ],
                 [
                     'http://itunes.apple.com/gb/album/now-thats-what-i-call-music!-82/id543575947?v0=WWW-EUUK-STAPG-MUSIC-PROMO',
-                    'http://itunes.apple.com/gb/album/id543575947',
+                    'https://itunes.apple.com/gb/album/id543575947',
                     'release'
                 ],
                 [
                     'http://itunes.apple.com/au/preorder/the-last-of-the-tourists/id499465357',
-                    'http://itunes.apple.com/au/preorder/id499465357',
+                    'https://itunes.apple.com/au/preorder/id499465357',
                     'release'
                 ],
                 [
                     'http://itunes.apple.com/music-video/gangnam-style/id564322420?v0=WWW-NAUS-ITSTOP100-MUSICVIDEOS&ign-mpt=uo%3D2',
-                    'http://itunes.apple.com/music-video/id564322420',
+                    'https://itunes.apple.com/music-video/id564322420',
                     'recording'
                 ],
+                [
+                    'https://itunes.apple.com/us/album/skyfall-single/id566322358',
+                    'https://itunes.apple.com/us/album/id566322358',
+                    'release'
+                ],
 
                 // MBS-4810: exactly one terminating slash at the end
                 [

-----------------------------------------------------------------------


hooks/post-receive
-- 
mb_server