[mb-commits] branch, test, updated. Merge branch 'mbs-5622-https-recaptcha' into test MBS-5622: pass $c->req-> sec...
MusicBrainz Git Server <[email protected]>
| Newsgroups | gmane.comp.audio.musicbrainz.cvs |
|---|---|
| Message-ID | <E1TeYVM-0006kR-UE@wiley> |
The branch, test has been updated
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=fdb465e31d31cf6b4470c43b062ac4386201451b (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=8cc2e760c627fe0393838cc3284ea35dd896eca6 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=952294a618a94320de6bc532430ee23f52801c03 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e2ff2237d0424a7edb6755bbe4ffd0dca9da61c9 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=b524e5378a1896e517017bf517eb175a7c36d82d (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=a2a2f115a57d711a2678af4d202b49ad525e5d0a (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e5cc1ba0571bbd19cd9be2dbf38f8ba09fc329cb (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=786cc4354a8269f987776dc51edcd5240f13451c (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=cd18b74cc198b002918548aa144a2c66cf09f32e (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=3b673e3232c5ac60031717495a01fb5f55e55539 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=d0760218100736a3259b083b55bee73daab35510 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=597dfbf058c1b6554ea685fb71ce5fbdf2ccf3d3 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=bb063f399f4ffc03c21c3d2874734ca6601aebc9 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=1d8bce086ae910a027ce8363efe59f9319efc53f (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=79d3d0f1eb3705eea7d0ce2ae9e92e09af9b4ee1 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=3139b9274ebd70622821dfc0bd6c6a4961ccc1af (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=aea7f79a12df01b5ca4d56bd52bbd43ea886b7c7 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=fd78521419d77655693a2a64fe1a4c8f48e52dbf (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=eed2499952cddd801062f27e83071d247e4c4645 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=f3ec53f76a666887da99daf6d2f25bbbef0ed75f (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=0980b5784b237dd3ef7dde7dd721f15a2a46170c (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=14610b4dbbd035ce96911a5515c75d7946bd9db5 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=bbac5ef52d678a14ceaad6c4a8da54ff796943f3 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=667064ed94d95f4a5cb04d28cadf59079440266f (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=996b98e04cea6273affa1b7f0cccb4a79a4807d7 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=0aba31b680eae3536cd26ddbbeb3ac3eed372b44 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=6dcdf502fba3ef243a36ad1173b4bd6fc4347124 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=d51cbf633f45ac520f3b4483c560018bf2cb97c6 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=b948fd9de002efda93cc3896d44d2119e8daf103 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=5a826ee98cd8b7594cd3010882efe8af287fef93 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ce8267f674b8d203d2f0e2cf1480257d798b6cea (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=d3bb04315f284bd3b9a02b10ab21ca97e186b6f2 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=b8bab5d13c6d6c29f291ae8cce45f7b61bdc4373 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ff8e4aa9c5a02f3ddc1b20ac9fb93a5f4f206635 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=a39ebc378013b927ce6dbc3c24760e2eca8c2488 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=7c0210be7d96d40d69c54bdd3d54f0b28253a155 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=b0491433b58ebc62363e6ef23744e811d6982aeb (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=1fef68d7706a50679fba548d83e27d17f3d30dcf (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=94a84cc18badbbf833bb31cb679bb6552e3d05db (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=3cd8cb99255cf40b8344585ff05767112e66294f (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ba9aef0abe1c4e886d131293340ae9cecd37b0c4 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=5c582219f6c1a6afd0fdd774deb9c32bd0a012d5 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=da574fd83ddeba7f7088f7bc506a14de1ec49eee (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=00ae5da085ab0b1f2037d4ac8639cca1c83ba05c (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ebf1b4c9f0f22ffe57dcc5d7ebea100a88c74727 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=cd037d00fe21e82c7d0487686bbe9a088ca94344 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=17690bcc4d06d0575337400997db498d506b3844 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=a1ef210204d514a6a5ed0b189a1f80b2dcf3017b (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=c65039dc3ad96e3198f2981b280130765b5b9502 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=396bd51c68ee773271b09e58eaea95995ac67d11 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=5dfaeba3b4550d3fb493c432ed64bb60936b145e (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=3c886524a56cd9bbed1966f16527b13617e899f2 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=6ac1e7a274b6f8aa7c787073152fb8f28b441fec (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=00dfb90267e7b7f37b097dab416c77ed922b17c6 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=edd89935c0773e3f3e8bc51180efa1725af25b9e (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=0a2110972a0ec9a0506332b4b6e51f1fe73abc0d (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=8d66f90396cc8de351fe9f41a58577ed29208dd1 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=c0590b92500c3a3fc3ba1b960a0793e167020f70 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=3972d4c3b7d2991cb5e97d48cab8ee1450cf3732 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=3e75177783025c8326a832e8b76cf81667491216 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=8949e6d6ffdbe7d98fcba52e7bea8ca52fb3135c (commit)
from http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=a1960b3da729267550c831825de440b6c666e891 (commit)
Summary of changes:
HACKING-CAA.md | 2 +-
admin/RunExport | 6 +
admin/replication/BundleReplicationPackets | 243 +++++++++++
admin/replication/LoadReplicationChanges | 90 +++-
lib/MusicBrainz/Server/Controller/Account.pm | 2 +-
lib/MusicBrainz/Server/Controller/Artist.pm | 1 +
lib/MusicBrainz/Server/Controller/JS.pm | 24 +-
lib/MusicBrainz/Server/Controller/Label.pm | 1 +
lib/MusicBrainz/Server/Controller/ReleaseGroup.pm | 1 +
.../Server/Controller/Role/WikipediaExtract.pm | 69 +++
lib/MusicBrainz/Server/Controller/WS/2/CDStub.pm | 2 +-
.../Server/Controller/WS/2/Collection.pm | 2 +-
lib/MusicBrainz/Server/Controller/WS/2/DiscID.pm | 3 +-
lib/MusicBrainz/Server/Controller/WS/2/FreeDB.pm | 2 +-
lib/MusicBrainz/Server/Controller/WS/2/ISRC.pm | 3 +-
lib/MusicBrainz/Server/Controller/WS/2/PUID.pm | 3 +-
lib/MusicBrainz/Server/Controller/WS/2/Tag.pm | 2 +-
lib/MusicBrainz/Server/Controller/Work.pm | 1 +
lib/MusicBrainz/Server/Data/FileCache.pm | 42 ++
lib/MusicBrainz/Server/Data/ReleaseGroup.pm | 10 +
lib/MusicBrainz/Server/Data/WebService.pm | 6 +-
lib/MusicBrainz/Server/Data/WikipediaExtract.pm | 172 ++++++++
.../Server/Edit/ReleaseGroup/SetCoverArt.pm | 5 +-
lib/MusicBrainz/Server/Entity/URL/Wikipedia.pm | 32 ++-
.../Entity/{WikiDocPage.pm => WikipediaExtract.pm} | 26 +-
.../WebService/Serializer/JSON/2/Recording.pm | 2 +-
.../WebService/Serializer/JSON/2/Role/LifeSpan.pm | 10 +-
.../Server/WebService/Serializer/JSON/2/Work.pm | 4 +
po/attributes.it.po | 2 +-
po/countries.de.po | 261 +++++++++++-
po/countries.el.po | 2 +-
po/countries.es.po | 261 +++++++++++-
po/countries.et.po | 261 +++++++++++-
po/countries.fi.po | 261 +++++++++++-
po/countries.fr_FR.po | 261 +++++++++++-
po/countries.it.po | 263 ++++++++++++-
po/countries.nl.po | 261 +++++++++++-
po/fixup/20121127-html5.sh | 5 +
po/instrument_descriptions.de.po | 2 +-
po/instrument_descriptions.el.po | 2 +-
po/instrument_descriptions.es.po | 4 +-
po/instrument_descriptions.et.po | 2 +-
po/instrument_descriptions.fi.po | 2 +-
po/instrument_descriptions.fr_FR.po | 2 +-
po/instrument_descriptions.it.po | 2 +-
po/instrument_descriptions.nl.po | 2 +-
po/instruments.de.po | 2 +-
po/instruments.el.po | 2 +-
po/instruments.es.po | 2 +-
po/instruments.et.po | 2 +-
po/instruments.fi.po | 2 +-
po/instruments.fr_FR.po | 2 +-
po/instruments.it.po | 2 +-
po/instruments.nl.po | 2 +-
po/languages.it.po | 2 +-
po/mb_server.de.po | 367 +++++++++-------
po/mb_server.el.po | 297 ++++++++------
po/mb_server.es.po | 294 ++++++++------
po/mb_server.et.po | 424 ++++++++++---------
po/mb_server.fi.po | 447 +++++++++++---------
po/mb_server.fr_FR.po | 288 ++++++++------
po/mb_server.it.po | 302 ++++++++------
po/mb_server.nl.po | 297 ++++++++------
po/mb_server.pot | 308 +++++++++-----
po/relationships.de.po | 8 +-
po/relationships.el.po | 8 +-
po/relationships.es.po | 8 +-
po/relationships.it.po | 8 +-
po/scripts.de.po | 2 +-
po/scripts.es.po | 328 +++++++-------
po/scripts.fi.po | 324 +++++++-------
po/scripts.fr_FR.po | 322 +++++++-------
po/scripts.it.po | 324 +++++++-------
po/scripts.nl.po | 322 +++++++-------
po/statistics.de.po | 319 ++++++++-------
po/statistics.el.po | 317 ++++++++-------
po/statistics.es.po | 317 ++++++++-------
po/statistics.et.po | 335 ++++++++-------
po/statistics.fi.po | 317 ++++++++-------
po/statistics.fr_FR.po | 317 ++++++++-------
po/statistics.it.po | 317 ++++++++-------
po/statistics.nl.po | 319 ++++++++-------
po/statistics.pot | 105 +++--
root/artist/index.tt | 2 +
root/components/common-macros.tt | 43 ++-
root/components/wikipedia_extract.tt | 5 +
root/label/index.tt | 2 +
root/layout.tt | 9 +-
root/release_group/index.tt | 3 +
root/search/lib/inline-results-artist.tt | 2 +-
root/statistics/timeline.tt | 9 +-
root/work/index.tt | 3 +
.../Server/Controller/WS/2/JSON/BrowseArtists.pm | 38 ++-
.../Server/Controller/WS/2/JSON/BrowseLabels.pm | 5 +
.../Server/Controller/WS/2/JSON/BrowseWorks.pm | 10 +
.../Server/Controller/WS/2/JSON/LookupArtist.pm | 97 ++++-
.../Server/Controller/WS/2/JSON/LookupLabel.pm | 20 +-
.../Server/Controller/WS/2/JSON/LookupWork.pm | 4 +
.../t/MusicBrainz/Server/Controller/Work/Create.pm | 4 +-
.../t/MusicBrainz/Server/Data/WikipediaExtract.pm | 75 ++++
.../Server/Edit/ReleaseGroup/SetCoverArt.pm | 1 +
t/lwp-sessions/data_wikipedia.en-en.lwp-mock | Bin 0 -> 1617 bytes
t/lwp-sessions/data_wikipedia.ja-en.lwp-mock | Bin 0 -> 3358 bytes
.../data_wikipedia.nl-en-fallback.lwp-mock | Bin 0 -> 3527 bytes
t/sql/caa.sql | 2 +-
105 files changed, 6791 insertions(+), 3524 deletions(-)
create mode 100755 admin/replication/BundleReplicationPackets
create mode 100644 lib/MusicBrainz/Server/Controller/Role/WikipediaExtract.pm
create mode 100644 lib/MusicBrainz/Server/Data/WikipediaExtract.pm
copy lib/MusicBrainz/Server/Entity/{WikiDocPage.pm => WikipediaExtract.pm} (77%)
create mode 100644 po/fixup/20121127-html5.sh
create mode 100644 root/components/wikipedia_extract.tt
create mode 100644 t/lib/t/MusicBrainz/Server/Data/WikipediaExtract.pm
create mode 100644 t/lwp-sessions/data_wikipedia.en-en.lwp-mock
create mode 100644 t/lwp-sessions/data_wikipedia.ja-en.lwp-mock
create mode 100644 t/lwp-sessions/data_wikipedia.nl-en-fallback.lwp-mock
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 fdb465e31d31cf6b4470c43b062ac4386201451b
Merge: a1960b3 8cc2e76
Author: Ian McEwen <[email protected]>
Date: Fri Nov 30 14:51:38 2012 -0700
Merge branch 'mbs-5622-https-recaptcha' into test
commit 8cc2e760c627fe0393838cc3284ea35dd896eca6
Author: Ian McEwen <[email protected]>
Date: Thu Nov 29 01:39:33 2012 -0700
MBS-5622: pass $c->req->secure to Captcha::reCAPTCHA->get_html to ensure correct API endpoint is used
diff --git a/lib/MusicBrainz/Server/Controller/Account.pm b/lib/MusicBrainz/Server/Controller/Account.pm
index 4f0e5f6..7add27d 100644
--- a/lib/MusicBrainz/Server/Controller/Account.pm
+++ b/lib/MusicBrainz/Server/Controller/Account.pm
@@ -454,7 +454,7 @@ sub register : Path('/register') ForbiddenOnSlaves
my $captcha_html = "";
$captcha_html = $captcha->get_html (
- DBDefs->RECAPTCHA_PUBLIC_KEY, $captcha_result) if $use_captcha;
+ DBDefs->RECAPTCHA_PUBLIC_KEY, $captcha_result, $c->req->secure) if $use_captcha;
$c->stash(
use_captcha => $use_captcha,
-----------------------------------------------------------------------
hooks/post-receive
--
mb_server