[mb-commits] branch, test, updated. Merge branch 'mbs-5265' into test MBS-4627, use DBDefs-> instead of DBDefs: : ...

The branch, test has been updated
  discards  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e93e09d7ee1ccbef34efa3c37abb128df03e6755 (commit)
  discards  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=30a9289925abcd5a5537fd8835ebd0fb4d1e4026 (commit)
  discards  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=408a378d2778ea7a8c36eb3c5d672c35cd9b5afb (commit)
  discards  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=2e5ed194c63df68e9761b63f5ef64e63fe61a33b (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=b9a794e0e4716ba734511e1b1697db0eaa632526 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=c9eed123a014c8f1d1c89fb51e5869bd8e626be6 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=2725614e17c5a0568899de4a5a57522a603a3df6 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ef1078f69fa847a38aef4032b041816ab8db9f53 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=fdc3384b1a2f69e3316585b88700b4afa95c6294 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e7339ebc0e8aac82de637cd9bba8ebbd7568c00f (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=a0e130e56e5e13c38a808553f35e31e7ac4f6254 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=3a234138b1942d84186548413a799cf24ff98c5b (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=8e889a6bf96bbf63f512b207fcee1ec97e45cd89 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (e93e09d7ee1ccbef34efa3c37abb128df03e6755)
            \
             N -- N -- N (b9a794e0e4716ba734511e1b1697db0eaa632526)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

Summary of changes:
 lib/MusicBrainz/Server/Controller/Release.pm       |    2 +-
 lib/MusicBrainz/Server/Edit/Release/AddCoverArt.pm |    2 +-
 .../Server/Edit/Release/EditCoverArt.pm            |    2 +-
 .../Server/Edit/Release/RemoveCoverArt.pm          |    2 +-
 lib/MusicBrainz/Server/Entity/Artwork.pm           |    2 +-
 lib/MusicBrainz/Server/Test/HTML5.pm               |   10 +++++++++-
 6 files changed, 14 insertions(+), 6 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 b9a794e0e4716ba734511e1b1697db0eaa632526
Merge: c9eed12 2725614
Author: warp <[email protected]>
Date:   Fri Nov 16 11:54:31 2012 +0100

    Merge branch 'mbs-5265' into test
    
    * mbs-5265:
      MBS-4627, use DBDefs-> instead of DBDefs:: in Entity::Artwork.
      MBS-5265, unset cover art on release group when the associated release is deleted.
      MBS-5265, Update release group cover art when merging releases.
      MBS-5265, Don't show "Set Cover Art" form when no cover art can be set for a release group.
      MBS-5265, fix "Use of uninitialized value $offset" warning.
      MBS-5265, fix crash release group cover art related crash on release group page.
      MBS-5265, Call event.preventDefault () at the start of the function.  Do not display the "old cover art" section if there is no old cover art.
      MBS-5265, Use green instead of yellow to show which cover art is currently selected.
      MBS-5265, make Artwork->load_for_release_groups() load front cover art from the earliest associated release if no cover art is set.
      MBS-5265, Add dependancy checks + test in set release group cover art edit.
      MBS-5265, Set release group cover art edit tests.
      MBS-5265, Add "set release group cover art" edit.
      MBS-5265, Add release-group front cover art support table in cover_art_archive schema.


commit c9eed123a014c8f1d1c89fb51e5869bd8e626be6
Merge: 3a23413 ef1078f
Author: warp <[email protected]>
Date:   Fri Nov 16 11:54:28 2012 +0100

    Merge branch 'mbs-4627' into test
    
    * mbs-4627:
      MBS-4627, use DBDefs-> instead of DBDefs:: in Entity::Artwork.
      MBS-4627, small fixes based on code review feedback.
      Use cover_art_archive.index_listing when loading cover art data from the database.  Add edits_pending column to caa/CreateTables.sql.
      MBS-4627, fix date on caa-edits-pending database upgrade script, include said script in upgrade.sh.
      MBS-4627, set cover art edits_pending column in cover art edits.
      MBS-4627, add an Artwork entity, which displays artwork based on database data instead of a webservice call to coverartarchive.org.


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


hooks/post-receive
-- 
mb_server