[mb-commits] branch, beta, updated. Fake-merge the broken 'origin/beta' to preserve history Merge remote-tracking...

MusicBrainz Git Server <[email protected]>
Newsgroups gmane.comp.audio.musicbrainz.cvs
Message-ID <E1Tfdaq-0007Nk-KI@wiley> 
The branch, beta has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=7b42a0221bf4065d42def9a50d5212b6933335de (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=564ce4eb390d65a7619e6aedc0c8117059ec1ced (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=4240bbd879c62dd2439d6926cc55d564e0743052 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=110d1c7efc19c4f0a529b778a9d8f5d064032f2d (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=97666a3f4a374e4e75f2075ee269cb5e83455d75 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=9c84c6a2934c918188ff12a9d9bd711df6c8260b (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=3399a7f66c912144e06803843f881efba6ebeb33 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=614bd98187b984631ef7f2f8a605f2eed3dae020 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e47d5d0c461e717b334a5eb6f92668e7975175e0 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=8aa530fcb7f49da3074b0ec877ac1eca4a67d937 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=5e7ed2cdf36e4a03459bb35534aac50b7cc470b6 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=d816f942c0e6431c7d00df3244a3781bcc4ebe37 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=57fc67be2656da1e7363f1bd752c7199c8f3eedb (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=cb03b1687bf5d43fc91c5a7bdfd0796c738a9189 (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=d67e1a09c0c4f1a52fe488a22b37946dc36970d2 (commit)

Summary of changes:
 lib/MusicBrainz/Server/Data/CoverArtArchive.pm |    8 +-------
 lib/MusicBrainz/Server/Test/HTML5.pm           |    2 +-
 2 files changed, 2 insertions(+), 8 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 7b42a0221bf4065d42def9a50d5212b6933335de
Merge: 564ce4e d67e1a0
Author: Ian McEwen <[email protected]>
Date:   Mon Dec 3 14:29:20 2012 -0700

    Fake-merge the broken 'origin/beta' to preserve history


commit 564ce4eb390d65a7619e6aedc0c8117059ec1ced
Merge: 4240bbd eef0a2e
Author: Ian McEwen <[email protected]>
Date:   Mon Dec 3 14:28:56 2012 -0700

    Merge remote-tracking branch 'freso/MBS-5620' into beta
    
    * freso/MBS-5620:
      MBS-5620: Use 54px image on profile pages.
      MBS-5620: Fix ampersand encoding in gravatar URLs.
      MBS-5620: Made it actually work.
      MBS-5620: Implementing size option for Gravatar macro.
      MBS-5620: Add "&s=12" to Gravatar URLs.
    
    Conflicts:
    	root/components/common-macros.tt

diff --cc root/components/common-macros.tt
index 0385e11,5634aad..7bb1c98
--- a/root/components/common-macros.tt
+++ b/root/components/common-macros.tt
@@@ -402,13 -402,15 +402,15 @@@ END -%
      action = action || 'profile';
      link = c.uri_for_action("/user/$action", [ editor.name ]);
      text = text == '' ? html_escape(editor.name) : text;
+     size = size.defined ? size : 12;
      '<a href="' _ link _ '">';
      IF editor.preferences.show_gravatar;
-       '<img src="' _ gravatar(editor.email) _ '" class="gravatar" />';
+       image_url = gravatar(editor.email) _ '&amp;s=' _ size;
      ELSE;
-       '<img src="//gravatar.com/avatar/placeholder?d=mm" class="gravatar" />';
+       image_url = '//gravatar.com/avatar/placeholder?d=mm&amp;s=' _ size;
      END;
+     '<img src="' _ image_url _ '" class="gravatar" />' ;
 -    text;
 +    '<bdi>' _ text _ '</bdi>';
      '</a>';
  END -%]
  

commit 4240bbd879c62dd2439d6926cc55d564e0743052
Merge: 110d1c7e 62d5846
Author: Ian McEwen <[email protected]>
Date:   Mon Dec 3 14:27:07 2012 -0700

    Merge remote-tracking branch 'origin/mbs-5612' into beta
    
    * origin/mbs-5612:
      MBS-5612, revert the changes to load_for_release_groups in the previous commit, the previous sort behaviour was correct.
      MBS-5612, Sort releases correctly when picking release group cover art.


commit 110d1c7efc19c4f0a529b778a9d8f5d064032f2d
Merge: 97666a3 e1f732d
Author: Ian McEwen <[email protected]>
Date:   Mon Dec 3 14:26:59 2012 -0700

    Merge remote-tracking branch 'origin/mbs-5610' into beta
    
    * origin/mbs-5610:
      MBS-5610, always display "Set cover art" link, remove "Remove release group" link.
      MBS-5610, Move "Set cover art" link to the correct section.


commit 97666a3f4a374e4e75f2075ee269cb5e83455d75
Merge: 9c84c6a dce7b60
Author: Ian McEwen <[email protected]>
Date:   Mon Dec 3 14:26:47 2012 -0700

    Merge remote-tracking branch 'origin/mbs-5616' into beta
    
    * origin/mbs-5616:
      MBS-5616, move "set cover art" from label to h1.


commit 9c84c6a2934c918188ff12a9d9bd711df6c8260b
Merge: 3399a7f 6027b15
Author: Ian McEwen <[email protected]>
Date:   Mon Dec 3 14:26:39 2012 -0700

    Merge remote-tracking branch 'origin/mbs-3308' into beta
    
    * origin/mbs-3308:
      MBS-3308, always display "Open edits" link.


commit 3399a7f66c912144e06803843f881efba6ebeb33
Merge: 614bd98 4aa6715
Author: Ian McEwen <[email protected]>
Date:   Mon Dec 3 14:26:31 2012 -0700

    Merge remote-tracking branch 'origin/mbs-5607' into beta
    
    * origin/mbs-5607:
      MBS-5607, don't crash when serializing a release group without a primary type for json /ws/2.


commit 614bd98187b984631ef7f2f8a605f2eed3dae020
Merge: e47d5d0 86cb4ad
Author: Ian McEwen <[email protected]>
Date:   Mon Dec 3 14:26:21 2012 -0700

    Merge remote-tracking branch 'origin/mbs-3840' into beta
    
    * origin/mbs-3840:
      MBS-3840, Add glue to make /ws/2/annotation searches available.


commit e47d5d0c461e717b334a5eb6f92668e7975175e0
Merge: 8aa530f 8edb24d
Author: Ian McEwen <[email protected]>
Date:   Mon Dec 3 14:25:51 2012 -0700

    Merge remote-tracking branch 'navap/mbs-4228-alias-description' into beta
    
    * navap/mbs-4228-alias-description:
      Remove middle-man add and edit templates
      Use same description when adding and editing aliases
      MBS-4228: Update alias description (again)
      Refactor alias templates
      MBS-4228: Add description of what an alias is


commit 8aa530fcb7f49da3074b0ec877ac1eca4a67d937
Merge: 5e7ed2c e11a6d3
Author: Ian McEwen <[email protected]>
Date:   Mon Dec 3 14:25:16 2012 -0700

    Merge remote-tracking branch 'navap/mbs-5548-escape-git-commit' into beta
    
    * navap/mbs-5548-escape-git-commit:
      MBS-5548: Escape git last commit msg


commit 5e7ed2cdf36e4a03459bb35534aac50b7cc470b6
Merge: d816f94 826276b
Author: Ian McEwen <[email protected]>
Date:   Mon Dec 3 14:24:57 2012 -0700

    Merge remote-tracking branch 'navap/mbs-5576' into beta
    
    * navap/mbs-5576:
      Remove unneeded column
      MBS-5576: Fix colspan


commit d816f942c0e6431c7d00df3244a3781bcc4ebe37
Author: Ian McEwen <[email protected]>
Date:   Sun Dec 2 14:11:21 2012 -0700

    MBS-5432 temporary fix: revert cover art types i18n where it was causing breakage

diff --git a/lib/MusicBrainz/Server/Data/CoverArtArchive.pm b/lib/MusicBrainz/Server/Data/CoverArtArchive.pm
index 96b9bc0..01c0d30 100644
--- a/lib/MusicBrainz/Server/Data/CoverArtArchive.pm
+++ b/lib/MusicBrainz/Server/Data/CoverArtArchive.pm
@@ -15,8 +15,6 @@ sub find_available_artwork {
 
     my $prefix = DBDefs->COVER_ART_ARCHIVE_DOWNLOAD_PREFIX."/release/$mbid";
 
-    my $types = { map { $_->name => $_ } $self->c->model('CoverArtType')->get_all() };
-
     return [
         map {
             Net::CoverArtArchive::CoverArt->new(
@@ -25,11 +23,7 @@ sub find_available_artwork {
                 large_thumbnail => sprintf('%s/%s-500.jpg', $prefix, $_->{id}),
                 small_thumbnail => sprintf('%s/%s-250.jpg', $prefix, $_->{id}),
             );
-        } map {
-            $_->{types} = [ map { $types->{$_}->l_name } @{ $_->{types} } ];
-            $_;
-        }
-        @{ $self->sql->select_list_of_hashes(
+        } @{ $self->sql->select_list_of_hashes(
             'SELECT index_listing.*, release.gid
              FROM cover_art_archive.index_listing
              JOIN musicbrainz.release ON index_listing.release = release.id

commit 57fc67be2656da1e7363f1bd752c7199c8f3eedb
Author: Ian McEwen <[email protected]>
Date:   Sat Dec 1 22:09:49 2012 -0700

    HTML5 Test still had a lurking DBDefs::, changed to ->

diff --git a/lib/MusicBrainz/Server/Test/HTML5.pm b/lib/MusicBrainz/Server/Test/HTML5.pm
index 1ebd080..4c997c9 100644
--- a/lib/MusicBrainz/Server/Test/HTML5.pm
+++ b/lib/MusicBrainz/Server/Test/HTML5.pm
@@ -182,7 +182,7 @@ sub html5_ok
         return;
     }
 
-    my $url = DBDefs::HTML_VALIDATOR;
+    my $url = DBDefs->HTML_VALIDATOR;
 
     unless ($url) {
         $Test->skip("No HTML_VALIDATOR configured, skip html validation");

commit cb03b1687bf5d43fc91c5a7bdfd0796c738a9189
Merge: 952294a 8cc2e76
Author: Ian McEwen <[email protected]>
Date:   Sat Dec 1 18:41:12 2012 -0700

    Merge branch 'mbs-5622-https-recaptcha' into beta


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


hooks/post-receive
-- 
mb_server
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.