Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
367e17cc
Commit
367e17cc
authored
Sep 07, 2012
by
randx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
5xx error status code for gitolite & encoding error
parent
e8f39a0a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
7 deletions
+5
-7
app/controllers/application_controller.rb
app/controllers/application_controller.rb
+2
-2
app/views/errors/encoding.html.haml
app/views/errors/encoding.html.haml
+3
-5
No files found.
app/controllers/application_controller.rb
View file @
367e17cc
...
@@ -11,11 +11,11 @@ class ApplicationController < ActionController::Base
...
@@ -11,11 +11,11 @@ class ApplicationController < ActionController::Base
helper_method
:abilities
,
:can?
helper_method
:abilities
,
:can?
rescue_from
Gitlab
::
Gitolite
::
AccessDenied
do
|
exception
|
rescue_from
Gitlab
::
Gitolite
::
AccessDenied
do
|
exception
|
render
"errors/gitolite"
,
layout:
"error"
render
"errors/gitolite"
,
layout:
"error"
,
status:
500
end
end
rescue_from
Encoding
::
CompatibilityError
do
|
exception
|
rescue_from
Encoding
::
CompatibilityError
do
|
exception
|
render
"errors/encoding"
,
layout:
"error"
,
status:
404
render
"errors/encoding"
,
layout:
"error"
,
status:
500
end
end
rescue_from
ActiveRecord
::
RecordNotFound
do
|
exception
|
rescue_from
ActiveRecord
::
RecordNotFound
do
|
exception
|
...
...
app/views/errors/encoding.html.haml
View file @
367e17cc
.alert-message.block-message.error
%h1
Encoding Error
%h3
Encoding Error
%hr
%hr
%p
Page can't be loaded because of an encoding error.
%p
Page can't be loaded because of an encoding error.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment