Merge tag 'release-5.0.6' into bugstest

Merge upstream 5.0.6 release, now without conflicts after the
problematic code reformatting change.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

5 files changed, 7 insertions, 8 deletions

diff --git a/extensions/BmpConvert/Extension.pm b/extensions/BmpConvert/Extension.pm
index d9e3d0ef4..84a2c81dc 100644
--- a/extensions/BmpConvert/Extension.pm
+++ b/extensions/BmpConvert/Extension.pm
@@ -22,7 +22,7 @@ sub attachment_process_data {
   return unless $args->{attributes}->{mimetype} eq 'image/bmp';
 
   my $data = ${$args->{data}};
-  my $img = Image::Magick->new(magick => 'bmp');
+  my $img  = Image::Magick->new(magick => 'bmp');
 
   # $data is a filehandle.
   if (ref $data) {
diff --git a/extensions/Example/Extension.pm b/extensions/Example/Extension.pm
index d76c71c06..1ecb3e692 100644
--- a/extensions/Example/Extension.pm
+++ b/extensions/Example/Extension.pm
@@ -481,7 +481,7 @@ sub error_catch {
   return unless $args->{error} eq 'bad_page_cgi_id';
 
   my $page_id = $args->{vars}->{page_id};
-  my $login = Bugzilla->user->identity || "Someone";
+  my $login   = Bugzilla->user->identity || "Someone";
   warn "$login attempted to access page.cgi with id = $page_id";
 
   my $page          = $args->{message};
diff --git a/extensions/MoreBugUrl/Extension.pm b/extensions/MoreBugUrl/Extension.pm
index 0fc29b2aa..3158de294 100644
--- a/extensions/MoreBugUrl/Extension.pm
+++ b/extensions/MoreBugUrl/Extension.pm
@@ -30,8 +30,7 @@ use constant MORE_SUB_CLASSES => qw(
 sub install_update_db {
   my $dbh = Bugzilla->dbh;
 
-  my $should_rename = $dbh->selectrow_array(
-    q{SELECT 1 FROM bug_see_also
+  my $should_rename = $dbh->selectrow_array(q{SELECT 1 FROM bug_see_also
           WHERE class IN ('Bugzilla::BugUrl::Rietveld', 
                           'Bugzilla::BugUrl::ReviewBoard')}
   );
diff --git a/extensions/OldBugMove/Extension.pm b/extensions/OldBugMove/Extension.pm
index 53c26fc8d..70dc5ad30 100644
--- a/extensions/OldBugMove/Extension.pm
+++ b/extensions/OldBugMove/Extension.pm
@@ -29,7 +29,7 @@ use constant VERSION => BUGZILLA_VERSION;
 use constant CMT_MOVED_TO => 4;
 
 sub install_update_db {
-  my $reso_type = Bugzilla::Field::Choice->type('resolution');
+  my $reso_type  = Bugzilla::Field::Choice->type('resolution');
   my $moved_reso = $reso_type->new({name => 'MOVED'});
 
   # We make the MOVED resolution inactive, so that it doesn't show up
diff --git a/extensions/Voting/Extension.pm b/extensions/Voting/Extension.pm
index 2fd7d2e22..a46162ed2 100644
--- a/extensions/Voting/Extension.pm
+++ b/extensions/Voting/Extension.pm
@@ -276,7 +276,7 @@ sub sanitycheck_check {
   my $needs_rebuild;
   foreach my $id (keys %cached_counts) {
     my $cached_count = $cached_counts{$id};
-    my $real_count = $real_counts{$id} || 0;
+    my $real_count   = $real_counts{$id} || 0;
     if ($cached_count < 0) {
       $status->('voting_count_alert', {id => $id}, 'alert');
     }
@@ -447,7 +447,7 @@ sub _page_user {
       ($who->id, $product->id)
     );
 
-    my %votes = map { $_->[0] => $_->[1] } @$vote_list;
+    my %votes   = map { $_->[0] => $_->[1] } @$vote_list;
     my @bug_ids = sort keys %votes;
 
     # Exclude bugs that the user can no longer see.
@@ -878,7 +878,7 @@ sub _remove_votes {
 # If a user votes for a bug, or the number of votes required to
 # confirm a bug has been reduced, check if the bug is now confirmed.
 sub _confirm_if_vote_confirmed {
-  my $id = shift;
+  my $id  = shift;
   my $bug = ref $id ? $id : new Bugzilla::Bug({id => $id, cache => 1});
 
   my $ret = 0;