Merge trunk at revision 8217

diff --cc Bugzilla/Bug.pm
Simple merge

diff --cc Bugzilla/DB/Schema.pm
Simple merge

diff --cc Bugzilla/Field.pm
index 17234e0f7eea771f3c5078454ab40a86b82b3a44,4ec592164aa7bb7c74002820c10d57247d06c3c3..f81e819c589b27ba3b362668b59e6df13e1323b4
--- 1/Bugzilla/Field.pm
--- 2/Bugzilla/Field.pm
+++ b/Bugzilla/Field.pm
@@@ -258,9 -248,7 +248,8 @@@ use constant DEFAULT_FIELDS => 
      {name => "owner_idle_time",       desc => "Time Since Assignee Touched"},
      {name => 'see_also',              desc => "See Also",
       type => FIELD_TYPE_BUG_URLS},
-     {name => 'tag',                   desc => 'Tags'},
+     {name => 'tag',                   desc => 'Tags', buglist => 1},
 +    {name => 'master_bug_id',         desc => 'Master Bug ID',
-      in_new_bugmail => 1, is_numeric => 1},
  );
  
  ################

diff --cc Bugzilla/Install/DB.pm
index 83e46d5518227127857913fbaad4e45b3e8239ac,59a2cdceb8b371b825aa3997d51f2aaa45d3d428..bc3bd9092857cba3419d182658d29d1dad0e3d97
--- 1/Bugzilla/Install/DB.pm
--- 2/Bugzilla/Install/DB.pm
+++ b/Bugzilla/Install/DB.pm
@@@ -656,12 -638,34 +638,37 @@@ sub update_table_definitions 
      # 2011-06-15 dkl@mozilla.com - Bug 658929
      _migrate_disabledtext_boolean();
  
+     # 2011-11-01 glob@mozilla.com - Bug 240437
+     $dbh->bz_add_column('profiles', 'last_seen_date', {TYPE => 'DATETIME'});
+ 
      # 2011-10-11 miketosh - Bug 690173
      _on_delete_set_null_for_audit_log_userid();
+     
+     # 2011-11-23 gerv@gerv.net - Bug 705058 - make filenames longer
+     $dbh->bz_alter_column('attachments', 'filename', 
+                                     { TYPE => 'varchar(255)', NOTNULL => 1 });
+ 
+     # 2011-11-28 dkl@mozilla.com - Bug 685611
+     _fix_notnull_defaults();
+ 
+     # 2012-02-15 LpSolit@gmail.com - Bug 722113
+     if ($dbh->bz_index_info('profile_search', 'profile_search_user_id')) {
+         $dbh->bz_drop_index('profile_search', 'profile_search_user_id');
+         $dbh->bz_add_index('profile_search', 'profile_search_user_id_idx', [qw(user_id)]);
+     }
+ 
+     # 2012-03-23 LpSolit@gmail.com - Bug 448551
+     $dbh->bz_alter_column('bugs', 'target_milestone',
+                           {TYPE => 'varchar(64)', NOTNULL => 1, DEFAULT => "'---'"});
+ 
+     $dbh->bz_alter_column('milestones', 'value', {TYPE => 'varchar(64)', NOTNULL => 1});
+ 
+     $dbh->bz_alter_column('products', 'defaultmilestone',
+                           {TYPE => 'varchar(64)', NOTNULL => 1, DEFAULT => "'---'"});
  
 +    # 2011-08-29 rowebb@gmail.com - Bug 679547
 +    $dbh->bz_add_column('bugs', 'master_bug_id', {TYPE => 'INT3'});
 +
      ################################################################
      # New --TABLE-- changes should go *** A B O V E *** this point #
      ################################################################

diff --cc Bugzilla/WebService/Bug.pm
index 73383d636f9989c1c972ce207ca52b8ee4967afc,9b6aeb3e563f746b9db58cd89b30f73ef2ab7fdd..e8de777dc16a2b175d36761fc04b26466e9dead6
--- 1/Bugzilla/WebService/Bug.pm
--- 2/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@@ -868,10 -906,9 +907,13 @@@ sub _bug_to_hash 
                         @{ $bug->see_also };
          $item{'see_also'} = \@see_also;
      }
+     if (filter_wants $params, 'flags') {
+         $item{'flags'} = [ map { $self->_flag_to_hash($_) } @{$bug->flags} ];
+     }
 +    if (filter_wants $params, 'sightings') {
 +        my @sightings = map { $self->type('int', $_->id) } @{ $bug->sightings };
 +        $item{'sightings'} = \@sightings;
 +    }
  
      # And now custom fields
      my @custom_fields = Bugzilla->active_custom_fields;
@@@ -1896,12 -2044,13 +2058,16 @@@ C<op_sys>, C<platform>, C<qa_contact>, 
  C<target_milestone>, C<update_token>, C<url>, C<version>, C<whiteboard>,
  and all custom fields.
  
+ =item The C<flags> array was added in Bugzilla B<4.4>.
+ 
+ =item The C<actual_time> item was added to the C<bugs> return value
+ in Bugzilla B<4.4>.
+ 
 +=item In Bugzilla B<5.0> C<sightings> and C<master_bug_id> were added to
 +the C<bugs> return value.
 +
  =back
  
- 
  =back
  
  =head2 history

diff --cc skins/standard/global.css
index b2c36e95999b30cad570fa310ba6c539c0fbff38,905a9715899d2101b31b926a1fc656ad21fa3ec5..9815bae51165fd54d92cb36810b48a3ca775a342
--- 1/skins/standard/global.css
--- 2/skins/standard/global.css
+++ b/skins/standard/global.css
@@@ -409,28 -392,25 +392,34 @@@ dl dl > dt 
      white-space: normal !important;
  }
  
 -/* Style of the attachment table and time tracking table */
 -#attachment_table {
+ /* Arrow buttons are buttons with only ↑, ↓, ← or → on
+  * them. We want these to look a little less spidery. */
+ .arrow_button {
+     font-size: 150%;
+ }
+ 
 +/* Style of the attachment table, sightings table and time tracking table */
 +#attachment_table, #sighting_table {
      border-collapse: collapse;
      border: 1px solid #333333;
 +    margin: 2ex 0;
  }
  
 -#attachment_table th, .bz_attach_footer, .bz_time_tracking_table th {
 +#attachment_table th, .bz_attach_footer, .bz_sighting_table th, 
 +.bz_sighting_footer, .bz_time_tracking_table th {
      background-color: #E0E0E0;
      color: black;
 +    padding: 0.5em;
  }
  
 -#attachment_table td, .bz_time_tracking_table th, .bz_time_tracking_table td {
 +#attachment_table td, .bz_sighting_table th, .bz_sighting_table td,
 +.bz_time_tracking_table th, .bz_time_tracking_table td {
      border: 1px solid #333333;
 +    padding: 0.5em;
 +}
 +
 +#sighting_table td {
 +    text-align: center;
  }
  
  .bz_attach_extra_info {

diff --cc template/en/default/attachment/list.html.tmpl
Simple merge

diff --cc template/en/default/bug/edit.html.tmpl
Simple merge

diff --cc template/en/default/global/field-descs.none.tmpl
Simple merge

diff --cc template/en/default/global/user-error.html.tmpl
Simple merge