5xx error status code for gitolite & encoding error

randx
1 parent e8f39a0a
Showing 2 changed files with 5 additions and 7 deletions Show diff stats
app/controllers/application_controller.rb
app/views/errors/encoding.html.haml
@@ -11,11 +11,11 @@ class ApplicationController &lt; ActionController::Base
   helper_method :abilities, :can?
  
   rescue_from Gitlab::Gitolite::AccessDenied do |exception|
-    render "errors/gitolite", layout: "error"
+    render "errors/gitolite", layout: "error", status: 500
   end
  
   rescue_from Encoding::CompatibilityError do |exception|
-    render "errors/encoding", layout: "error", status: 404
+    render "errors/encoding", layout: "error", status: 500
   end
  
   rescue_from ActiveRecord::RecordNotFound do |exception|
-.alert-message.block-message.error
-  %h3 Encoding Error
-  %hr
-  %p
-    Page can't be loaded because of an encoding error.
+%h1 Encoding Error
+%hr
+%p Page can't be loaded because of an encoding error.
...	...	@@ -11,11 +11,11 @@ class ApplicationController < ActionController::Base
11	11	helper_method :abilities, :can?
12	12
13	13	rescue_from Gitlab::Gitolite::AccessDenied do \|exception\|
14		- render "errors/gitolite", layout: "error"
	14	+ render "errors/gitolite", layout: "error", status: 500
15	15	end
16	16
17	17	rescue_from Encoding::CompatibilityError do \|exception\|
18		- render "errors/encoding", layout: "error", status: 404
	18	+ render "errors/encoding", layout: "error", status: 500
19	19	end
20	20
21	21	rescue_from ActiveRecord::RecordNotFound do \|exception\|
...	...
1		-.alert-message.block-message.error
2		- %h3 Encoding Error
3		- %hr
4		- %p
5		- Page can't be loaded because of an encoding error.
	1	+%h1 Encoding Error
	2	+%hr
	3	+%p Page can't be loaded because of an encoding error.
...	...