Merge pull request #1979 from mozilla/issue-1978-iframe-error-pages

fix(server): Allow the 500 and 503 pages to be iframed.

server/lib/routes.js

@@ -125,10 +125,12 @@ module.exports = function (config, templates, i18n) {
       });
 
       app.get('/500.html', function (req, res) {
+        res.removeHeader('x-frame-options');
         return res.render('500');
       });
 
       app.get('/503.html', function (req, res) {
+        res.removeHeader('x-frame-options');
         return res.render('503');
       });
     }

tests/server/routes.js

@@ -71,7 +71,9 @@ define([
     '/legal/terms',
     '/legal/privacy',
     '/oauth/signin',
-    '/oauth/signup'
+    '/oauth/signup',
+    '/500.html',
+    '/503.html'
   ];
 
   function routeTest(route, expectedStatusCode, requestOptions) {