From b8785a3bf82610b3b095562261209f034479db5e Mon Sep 17 00:00:00 2001
From: John Ma <jiama843@gmail.com>
Date: Tue, 23 Oct 2018 13:10:54 -0400
Subject: [PATCH] Fixed loading of error pages (#310)

* <Fixed loading of error pages>

* <Remove not_found from application folder>
---
 .rake_tasks~                             | 42 ++++++++++++++++++++++++
 app/controllers/errors_controller.rb     |  6 ++--
 app/views/application/not_found.html.erb | 23 -------------
 3 files changed, 45 insertions(+), 26 deletions(-)
 create mode 100644 .rake_tasks~
 delete mode 100644 app/views/application/not_found.html.erb

diff --git a/.rake_tasks~ b/.rake_tasks~
new file mode 100644
index 00000000..c55c6c91
--- /dev/null
+++ b/.rake_tasks~
@@ -0,0 +1,42 @@
+about
+app:template
+app:update
+assets:clean[keep]
+assets:clobber
+assets:environment
+assets:precompile
+autoprefixer:info
+cache_digests:dependencies
+cache_digests:nested_dependencies
+conf:check
+db:create
+db:drop
+db:environment:set
+db:fixtures:load
+db:migrate
+db:migrate:status
+db:rollback
+db:schema:cache:clear
+db:schema:cache:dump
+db:schema:dump
+db:schema:load
+db:seed
+db:setup
+db:structure:dump
+db:structure:load
+db:version
+dev:cache
+initializers
+log:clear
+middleware
+notes
+notes:custom
+restart
+routes
+secret
+stats
+test
+test:db
+time:zones[country_or_offset]
+tmp:clear
+tmp:create
diff --git a/app/controllers/errors_controller.rb b/app/controllers/errors_controller.rb
index 3a88eb10..4b0b4b25 100644
--- a/app/controllers/errors_controller.rb
+++ b/app/controllers/errors_controller.rb
@@ -18,14 +18,14 @@
 
 class ErrorsController < ApplicationController
   def not_found
-    render status: 404
+    render status: 404, formats: :html
   end
 
   def unprocessable
-    render status: 422
+    render status: 422, formats: :html
   end
 
   def internal_error
-    render status: 500
+    render status: 500, formats: :html
   end
 end
diff --git a/app/views/application/not_found.html.erb b/app/views/application/not_found.html.erb
deleted file mode 100644
index 647e34c8..00000000
--- a/app/views/application/not_found.html.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<%
-# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
-# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
-# This program is free software; you can redistribute it and/or modify it under the
-# terms of the GNU Lesser General Public License as published by the Free Software
-# Foundation; either version 3.0 of the License, or (at your option) any later
-# version.
-#
-# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-# You should have received a copy of the GNU Lesser General Public License along
-# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-%>
-
-<div class="container text-center pt-9">
-  <div class="display-1 text-muted mb-5">404</div>
-  <h1 class="h2 mb-3"><%= t("errors.not_found.message") %></h1>
-  <p class="h4 text-muted font-weight-normal mb-7"><%= t("errors.not_found.help") %></p>
-  <a class="btn btn-primary" href="javascript:history.back()">
-    <i class="fas fa-arrow-left mr-2"></i><%= t("go_back") %>
-  </a>
-</div>