Merge branch 'release/2015-07-15'

apps/bugsy/templates/bugsy/new-fx-locales.json

@@ -60,17 +60,6 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
     "op_sys": "All", 
     "blocked": "fx-l10n-{{ loc }}"
   }, 
-  {
-    "comment": "We need to add '{{ loc }}' to the Firefox Aurora l10n builds.\n\nPS: to be clear to the localization team, this bug is handled by Mozilla staff.", 
-    "product": "Release Engineering", 
-    "title": "releng", 
-    "cc": "l10n@mozilla.com", 
-    "rep_platform": "All", 
-    "short_desc": "Add '{{ loc }}' to the Firefox build", 
-    "component": "General Automation", 
-    "op_sys": "All", 
-    "blocked": "fx-l10n-{{ loc }}"
-  }, 
   {
     "comment": "We need to add '{{ loc }}' to the Firefox Aurora l10n builds on our website. Please check the dependent bugs of bug fx-l10n-{{ loc }} on the native name of the language, and when we're having the actual builds on ftp.\n\nPS: to be clear to the localization team, this bug is handled by Mozilla staff.", 
     "product": "www.mozilla.org", 

apps/shipping/templates/shipping/milestones.html

@@ -43,12 +43,12 @@ <h1>Milestones</h1>
         data-ex-href-subcontent="{% url 'shipping.views.milestone.about'  "{&#123;.code}}" %}"></a>
       </td>
       <td>
-        <span data-ex-if=".status = {{ Milestone.SHIPPED }}">
+        <span data-ex-if=".status = '{{ Milestone.SHIPPED }}'">
           <input type="button" {% if not perms.shipping.can_ship %}
           disabled="disabled"{% endif %}
           value="tweak" />
           <span>
-            <span data-ex-if=".status = {{ Milestone.UPCOMING }}">
+            <span data-ex-if=".status = '{{ Milestone.UPCOMING }}'">
               <input type="button" {% if not perms.shipping.can_open %}
               disabled="disabled"{% endif %}
               data-ex-onclick-subcontent="doForm('open','{&#123;.code}}')"

elmo/static/css/style.css

@@ -100,6 +100,7 @@ table.standard tr {
 }
 table.exhibit-tabularView-body tr {
     background-color: #eee; /* fallback color if gradients are not supported */
+    background-image: linear-gradient(to bottom, white, #eee);
     background-image: -webkit-gradient(linear, left top, left bottom, from(white), to(#eee));
     background-image: -webkit-linear-gradient(top, white, #eee);
     background-image: -moz-linear-gradient(top, white, #eee);

requirements/prod.txt

@@ -6,8 +6,8 @@
 # sha256: p7AqX3bYmnn4YZJvs04CnMQ0PBOAJSXIGFQqOf54jM4
 commonware==0.4.3
 
-# sha256: 111gXldDBeHChkw5LhRUlj6tRVJHfOFOZ-ZLnvn6oaY
-Django==1.4.19
+# sha256: k08ZdSGGgNUcTanWOjm8X7HdqsSEdv00uat5A_2YvPQ
+Django==1.4.21
 
 # six is required by django-appconf
 # py2.py3-none-any.whl: