Merge remote-tracking branch 'origin/master' into production

* origin/master: Revert "Bug 1313766 - Bugzilla::Bug->send_changes() should not output HTML directly" pin slightly newer version Bug 1316129 - changes to legal form Bug 1316106 - Pin CGI.pm and JSON::RPC in Makefile.PL to prevent upgrades Bug 1314168 - Update to form for Recruiting Product Bug 1313766 - Bugzilla::Bug->send_changes() should not output HTML directly Bug 1315701 - Re-purpose nightly cleaner to be eject-user-from-groups script Bug 1314335 - Need to fix Project Initiation Bug Bug 1314984 - Font size too large in everything except gmail
mozilla-bteam · Nov 10, 2016 · 6766e44 · 6766e44
2 parents 53a9e43 + 04e3d20
commit 6766e44
Show file tree

Hide file tree

Showing 10 changed files with 211 additions and 209 deletions.
diff --git a/META.json b/META.json
@@ -4,7 +4,7 @@
       "Bugzilla Developers <developers@bugzilla.org>"
    ],
    "dynamic_config" : 1,
-   "generated_by" : "ExtUtils::MakeMaker version 7.04, CPAN::Meta::Converter version 2.150005",
+   "generated_by" : "ExtUtils::MakeMaker version 7.22, CPAN::Meta::Converter version 2.150005",
    "license" : [
       "unknown"
    ],
@@ -74,7 +74,7 @@
                   "HTML::Parser" : "3.67",
                   "HTML::Scrubber" : "0",
                   "IO::Scalar" : "0",
-                  "JSON::RPC" : "0",
+                  "JSON::RPC" : "== 1.01",
                   "LWP::UserAgent" : "0",
                   "MIME::Parser" : "5.406",
                   "MooX::StrictConstructor" : "0.008",
@@ -196,7 +196,7 @@
          "prereqs" : {
             "runtime" : {
                "requires" : {
-                  "JSON::RPC" : "0",
+                  "JSON::RPC" : "== 1.01",
                   "Test::Taint" : "1.06"
                }
             }
@@ -322,7 +322,7 @@
          "prereqs" : {
             "runtime" : {
                "requires" : {
-                  "JSON::RPC" : "0",
+                  "JSON::RPC" : "== 1.01",
                   "Test::Taint" : "1.06"
                }
             }
@@ -399,7 +399,7 @@
             "Safe" : "2.30"
          },
          "requires" : {
-            "CGI" : "3.51",
+            "CGI" : "<= 3.63",
             "CPAN::Meta::Prereqs" : "2.132830",
             "CPAN::Meta::Requirements" : "2.121",
             "Crypt::CBC" : "0",
@@ -451,5 +451,5 @@
    },
    "release_status" : "stable",
    "version" : "42",
-   "x_serialization_backend" : "JSON::PP version 2.27203"
+   "x_serialization_backend" : "JSON::PP version 2.27300"
 }
diff --git a/META.yml b/META.yml
@@ -10,7 +10,7 @@ build_requires:
 configure_requires:
   ExtUtils::MakeMaker: 6.57_07
 dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 7.04, CPAN::Meta::Converter version 2.150005'
+generated_by: 'ExtUtils::MakeMaker version 7.22, CPAN::Meta::Converter version 2.150005'
 license: unknown
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -55,7 +55,7 @@ optional_features:
       HTML::Parser: '3.67'
       HTML::Scrubber: '0'
       IO::Scalar: '0'
-      JSON::RPC: '0'
+      JSON::RPC: '== 1.01'
       LWP::UserAgent: '0'
       MIME::Parser: '5.406'
       MooX::StrictConstructor: '0.008'
@@ -117,7 +117,7 @@ optional_features:
   jsonrpc:
     description: 'JSON-RPC Interface'
     requires:
-      JSON::RPC: '0'
+      JSON::RPC: '== 1.01'
       Test::Taint: '1.06'
   linux_pid:
     description: 'Linux::PID for MozReview'
@@ -171,7 +171,7 @@ optional_features:
   rest:
     description: 'REST Interface'
     requires:
-      JSON::RPC: '0'
+      JSON::RPC: '== 1.01'
       Test::Taint: '1.06'
   smtp_auth:
     description: 'SMTP Authentication'
@@ -200,7 +200,7 @@ optional_features:
 recommends:
   Safe: '2.30'
 requires:
-  CGI: '3.51'
+  CGI: '<= 3.63'
   CPAN::Meta::Prereqs: '2.132830'
   CPAN::Meta::Requirements: '2.121'
   Crypt::CBC: '0'
@@ -241,4 +241,4 @@ requires:
   perl: '5.010001'
   version: '0.87'
 version: '42'
-x_serialization_backend: 'CPAN::Meta::YAML version 0.016'
+x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
diff --git a/Makefile.PL b/Makefile.PL
@@ -53,7 +53,7 @@ END {
 
 # PREREQ_PM
 my %requires = (
-    'CGI'                      => '3.51',
+    'CGI'                      => '<= 3.63',
     'CPAN::Meta::Prereqs'      => '2.132830',
     'CPAN::Meta::Requirements' => '2.121',
     'DBI'                      => '1.614',
@@ -210,7 +210,7 @@ my %optional_features = (
         description => 'JSON-RPC Interface',
         prereqs     => {
             runtime =>
-                { requires => { 'JSON::RPC' => 0, 'Test::Taint' => '1.06' } }
+                { requires => { 'JSON::RPC' => '== 1.01', 'Test::Taint' => '1.06' } }
         }
     },
     graphical_reports => {
@@ -269,7 +269,7 @@ my %optional_features = (
             runtime => {
                 requires => {
                     'Test::Taint' => '1.06',
-                    'JSON::RPC' => 0,
+                    'JSON::RPC' => '==1.01',
                 }
             }
         }

diff --git a/extensions/BMO/template/en/default/bug/create/comment-recruiting.txt.tmpl b/extensions/BMO/template/en/default/bug/create/comment-recruiting.txt.tmpl
@@ -17,30 +17,45 @@
 [% USE Bugzilla %]
 [% cgi = Bugzilla.cgi %]
 
+Position Job Family Title:
+[%+ cgi.param('position_job_family_title') %]
+
 Cost Center:
 [%+ cgi.param('cost_center') %]
 
 Hiring Manager:
 [%+ cgi.param('hiring_manager_name') %]
 
+Hiring Manager Workday Title:
+[%+ cgi.param('hiring_manager_workday_title') %]
+
+Director Authority:
+[%+ cgi.param('director_authority') %]
+
 VP Authority:
 [%+ cgi.param('vp_authority') %]
 
 HRBP:
 [%+ cgi.param('hrbp_name') %]
 
-Regular or Seasonal?
-[%+ cgi.param('reg_or_seasonal') %]
+Employment Type:
+[%+ cgi.param('employment_type') %]
 
-Desired Location:
-[%+ cgi.param("desired_location") %]
+Desired Locations:
+[%+ cgi.param("desired_location").join(', ') %]
+
+Job Level:
+[%+ cgi.param('job_level') %]
 
 Comp Grade:
 [%+ cgi.param("comp_grade") %]
 
 Is this new headcount or backfill?
 [%+ cgi.param("new_or_backfill") %]
 
+Name of Backfill:
+[%+ cgi.param('backfill_name') %]
+
 Are you hiring multiple of this position this year?
 [%+ cgi.param("multiple") %]
 

diff --git a/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl
@@ -116,14 +116,17 @@ label.required:before {
     <td>
       <select id="business_unit" name="business_unit" required="required">
         <option value="">Select One</option>
+        <option value="BD/Legal/Policy">BD/Legal/Policy</option>
         <option value="Connected Devices">Connected Devices</option>
+        <option value="Emerging Technologies">Emerging Technologies</option>
+        <option value="Finance &amp; Accounting">Finance &amp; Accounting</option>
         <option value="Firefox">Firefox</option>
         <option value="Foundation">Foundation</option>
         <option value="Innovation">Innovation</option>
         <option value="Marketing">Marketing</option>
-        <option value="Operations">Operations</option>
         <option value="Participation">Participation</option>
-        <option value="Platform">Platform</option>
+        <option value="Strategic Operations">Strategic Operations</option>
+        <option value="Other">Other</option>
       </select>
     </td>
   </tr>