[mb-commits] branch, beta, updated. Merge branch 'master' into beta MBS-4115, support .png in contrib/ssssss. psgi...

The branch, beta has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=f37301d1c13169375e2f3c7756c2abee9d0efb75 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=682abc694695c904604f37f0e73e2b49f76a97ad (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=d45b07d3f6b9a00b20d23e693b98ba28b8dc54dc (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=b19943e311da0f50aae70b2aafbfb61700db697c (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=893362c85ba293ae0f14179637f5d511ae4b26dd (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=f56e71cc8063c72779b0d82fdcbc6062d92a4258 (commit)

Summary of changes:
 contrib/ssssss.psgi                                |    5 +++--
 .../{ArtistCountry.pm => ReleaseCountry.pm}        |    4 ++--
 lib/MusicBrainz/Server/EditSearch/Query.pm         |    2 ++
 root/edit/search_macros.tt                         |    2 ++
 4 files changed, 9 insertions(+), 4 deletions(-)
 copy lib/MusicBrainz/Server/EditSearch/Predicate/{ArtistCountry.pm => ReleaseCountry.pm} (64%)

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 f37301d1c13169375e2f3c7756c2abee9d0efb75
Merge: 682abc6 d45b07d
Author: Ian McEwen <[email protected]>
Date:   Thu Jan 3 04:17:09 2013 -0700

    Merge branch 'master' into beta


commit 682abc694695c904604f37f0e73e2b49f76a97ad
Merge: f56e71c 893362c
Author: Ian McEwen <[email protected]>
Date:   Thu Jan 3 04:16:47 2013 -0700

    Merge branch 'release-country-edit-search' into beta
    
    * release-country-edit-search:
      Add release-country predicate to edit search


commit 893362c85ba293ae0f14179637f5d511ae4b26dd
Author: Ian McEwen <[email protected]>
Date:   Mon Dec 17 12:16:54 2012 -0700

    Add release-country predicate to edit search

diff --git a/lib/MusicBrainz/Server/EditSearch/Predicate/ReleaseCountry.pm b/lib/MusicBrainz/Server/EditSearch/Predicate/ReleaseCountry.pm
new file mode 100644
index 0000000..0aa9ca8
--- /dev/null
+++ b/lib/MusicBrainz/Server/EditSearch/Predicate/ReleaseCountry.pm
@@ -0,0 +1,8 @@
+package MusicBrainz::Server::EditSearch::Predicate::ReleaseCountry;
+use Moose;
+use namespace::autoclean;
+
+extends 'MusicBrainz::Server::EditSearch::Predicate::Set';
+with 'MusicBrainz::Server::EditSearch::Role::CountrySearch' => { type => 'release' };
+
+1;
diff --git a/lib/MusicBrainz/Server/EditSearch/Query.pm b/lib/MusicBrainz/Server/EditSearch/Query.pm
index de27a5a..cd664e2 100644
--- a/lib/MusicBrainz/Server/EditSearch/Query.pm
+++ b/lib/MusicBrainz/Server/EditSearch/Query.pm
@@ -15,6 +15,7 @@ use MusicBrainz::Server::EditSearch::Predicate::ReleaseLanguage;
 use MusicBrainz::Server::EditSearch::Predicate::ReleaseQuality;
 use MusicBrainz::Server::EditSearch::Predicate::ArtistCountry;
 use MusicBrainz::Server::EditSearch::Predicate::LabelCountry;
+use MusicBrainz::Server::EditSearch::Predicate::ReleaseCountry;
 use MusicBrainz::Server::EditSearch::Predicate::RelationshipType;
 use MusicBrainz::Server::Log 'log_warning';
 use String::CamelCase qw( camelize );
@@ -35,6 +36,7 @@ my %field_map = (
     release_quality => 'MusicBrainz::Server::EditSearch::Predicate::ReleaseQuality',
     artist_country => 'MusicBrainz::Server::EditSearch::Predicate::ArtistCountry',
     label_country => 'MusicBrainz::Server::EditSearch::Predicate::LabelCountry',
+    release_country => 'MusicBrainz::Server::EditSearch::Predicate::ReleaseCountry',
     link_type => 'MusicBrainz::Server::EditSearch::Predicate::RelationshipType',
 
     map {
diff --git a/root/edit/search_macros.tt b/root/edit/search_macros.tt
index 4bb63e8..29b5b8a 100644
--- a/root/edit/search_macros.tt
+++ b/root/edit/search_macros.tt
@@ -301,6 +301,7 @@
                    [ 'release_quality', l('Release Quality') ],
                    [ 'artist_country', l('Artist Country') ],
                    [ 'label_country', l('Label Country') ]
+                   [ 'release_country', l('Release Country') ]
                    [ 'link_type', l('Relationship Type') ],
                    ] %]
     <option
@@ -332,6 +333,7 @@
     [% predicate_release_language('release_language') %]
     [% predicate_country('artist_country') %]
     [% predicate_country('label_country') %]
+    [% predicate_country('release_country') %]
     [% predicate_link_type('link_type') %]
   </div>
 [% END %]

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


hooks/post-receive
-- 
mb_server