[mb-commits] branch, beta, updated. Merge branch 'mbs-2411' into beta MBS-2411, changes based on feedback from co...

The branch, beta has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=51cf45f3ebbc5fe068aae858f8b2ce6174ade910 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=f1a6f59b9c6da110ccf5cc20d2b30d37a1ac23ef (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=d1a356b533d8b374533979af0873eb2043bbdab3 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=6eefff05324eeedd7cff69c36c1ae0fe43f375f4 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=5615dacbe20496b386270c27fde24fe928271845 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=1470dd64548969d9768f0483fa0042323f8fa2e8 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=1b50a296295ebe2a1e1b60a755b485ee5d3cf499 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=d9dedc5d90e2db56eba1102951861b6804f0e0cc (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=9c10ffc11a5f05ae40bc0b3bdeeb31df7aa3e4f3 (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=9f8b507ccde409c49de32d419a78a024fcc8252f (commit)

Summary of changes:
 lib/DBDefs/Default.pm                              |   11 +++-
 lib/MusicBrainz/Server/Controller/Account.pm       |    2 +-
 lib/MusicBrainz/Server/Controller/Root.pm          |   30 +++++++++
 lib/MusicBrainz/Server/Controller/User.pm          |    6 +-
 lib/MusicBrainz/Server/Wizard/ReleaseEditor.pm     |   17 +++++-
 root/release/edit/recordings.tt                    |    4 +
 .../t/MusicBrainz/Server/Controller/User/Login.pm  |   65 +++++++++++++++----
 7 files changed, 114 insertions(+), 21 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 51cf45f3ebbc5fe068aae858f8b2ce6174ade910
Merge: f1a6f59 d1a356b
Author: warp <[email protected]>
Date:   Tue Jan 15 16:22:59 2013 +0100

    Merge branch 'mbs-2411' into beta
    
    * mbs-2411:
      MBS-2411, changes based on feedback from code review.
      MBS-2411, remove unused $secure variable from Controller::User.
      MBS-2411, forgot to include a return after the redirect in the previous commit.
      MBS-2411, handle redirects to/from https in Controller::Root.  Redirect to SSL on /register.
      MBS-2411, use c->req->secure instead of "manually" looking at HTTP_X_FORWARDED_PROTO.
      MBS-2411, force https:// on the login screen.


commit f1a6f59b9c6da110ccf5cc20d2b30d37a1ac23ef
Merge: 9f8b507 6eefff0
Author: warp <[email protected]>
Date:   Tue Jan 15 16:22:27 2013 +0100

    Merge branch 'mbs-5687' into beta
    
    * mbs-5687:
      MBS-5687, Detect and notify the user when a race condition occurs with two editors editing the same tracklist.


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


hooks/post-receive
-- 
mb_server