conflict resolution and asset recompilation

1 files changed, 8 insertions, 3 deletions

diff --git a/app/controllers/errors_controller.rb b/app/controllers/errors_controller.rb
index c68a60804..accf119a3 100644
--- a/app/controllers/errors_controller.rb
+++ b/app/controllers/errors_controller.rb
@@ -1,9 +1,14 @@
 class ErrorsController < ApplicationController
   def not_found
-    render :status => 404, :formats => [:html]
+    render template: 'errors/not_found', status: 404, formats: [:html]
   end
 
   def server_error
-    render :status => 500, :formats => [:html]
+    render template: 'errors/server_error', status: 500, formats: [:html]
   end
-end
\ No newline at end of file
+
+  def not_allowed
+    render template: 'errors/not_found', status: 403, formats: [:html]
+  end
+end
+