Skip to content

G
gitlab-ce
Commit 81092c01 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files
Options

Status codes for errors, New error pages

parent 7d279f93
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 41 deletions
app/controllers/application_controller.rb
View file @ 81092c01
...@@ -9,7 +9,7 @@ class ApplicationController < ActionController::Base ...@@ -9,7 +9,7 @@ class ApplicationController < ActionController::Base
end end
rescue_from ActiveRecord::RecordNotFound do |exception| rescue_from ActiveRecord::RecordNotFound do |exception|
render "errors/not_found", :layout => "error" render "errors/not_found", :layout => "error", :status => 404
end end
layout :layout_by_resource layout :layout_by_resource
...@@ -58,15 +58,15 @@ class ApplicationController < ActionController::Base ...@@ -58,15 +58,15 @@ class ApplicationController < ActionController::Base
end end
def access_denied! def access_denied!
render "errors/access_denied", :layout => "error" render "errors/access_denied", :layout => "error", :status => 404
end end
def not_found! def not_found!
render "errors/not_found", :layout => "error" render "errors/not_found", :layout => "error", :status => 404
end end
def git_not_found! def git_not_found!
render "errors/git_not_found", :layout => "error" render "errors/git_not_found", :layout => "error", :status => 404
end end
def method_missing(method_sym, *arguments, &block) def method_missing(method_sym, *arguments, &block)
......
app/controllers/projects_controller.rb
View file @ 81092c01
...@@ -114,6 +114,7 @@ class ProjectsController < ApplicationController ...@@ -114,6 +114,7 @@ class ProjectsController < ApplicationController
def project def project
@project ||= Project.find_by_code(params[:id]) @project ||= Project.find_by_code(params[:id])
@project || render_404
end end
def determine_layout def determine_layout
......
public/404.html
View file @ 81092c01
...@@ -2,22 +2,12 @@ ...@@ -2,22 +2,12 @@
<html> <html>
<head> <head>
<title>The page you were looking for doesn't exist (404)</title> <title>The page you were looking for doesn't exist (404)</title>
<style type="text/css"> <link href="static.css" media="screen" rel="stylesheet" type="text/css" />
body { background-color: #EAEAEA; color: #666; text-align: center; font-family: arial, sans-serif; }
div.dialog {
width: 600px;
padding: 0 4em;
margin: 4em auto 0 auto;
}
h1 { font-size: 48px; color: #444; line-height: 1.5em; }
h2 { font-size: 24px; color: #666; line-height: 1.5em; }
</style>
</head> </head>
<body> <body>
<!-- This file lives in public/404.html --> <h1>404</h1>
<div class="dialog"> <div class="alert-message block-message error">
<h1>404</h1>
<h2>The page you were looking for doesn't exist.</h2> <h2>The page you were looking for doesn't exist.</h2>
<p>You may have mistyped the address or the page may have moved.</p> <p>You may have mistyped the address or the page may have moved.</p>
</div> </div>
......
public/422.html
View file @ 81092c01
...@@ -2,22 +2,13 @@ ...@@ -2,22 +2,13 @@
<html> <html>
<head> <head>
<title>The change you wanted was rejected (422)</title> <title>The change you wanted was rejected (422)</title>
<style type="text/css"> <link href="static.css" media="screen" rel="stylesheet" type="text/css" />
body { background-color: #EAEAEA; color: #666; text-align: center; font-family: arial, sans-serif; }
div.dialog {
width: 600px;
padding: 0 4em;
margin: 4em auto 0 auto;
}
h1 { font-size: 48px; color: #444; line-height: 1.5em; }
h2 { font-size: 24px; color: #666; line-height: 1.5em; }
</style>
</head> </head>
<body> <body>
<!-- This file lives in public/422.html --> <!-- This file lives in public/422.html -->
<div class="dialog"> <h1>422</h1>
<h1>422</h1> <div class="alert-message block-message error">
<h2>The change you wanted was rejected.</h2> <h2>The change you wanted was rejected.</h2>
<p>Maybe you tried to change something you didn't have access to.</p> <p>Maybe you tried to change something you didn't have access to.</p>
</div> </div>
......
public/500.html
View file @ 81092c01
...@@ -2,22 +2,13 @@ ...@@ -2,22 +2,13 @@
<html> <html>
<head> <head>
<title>We're sorry, but something went wrong (500)</title> <title>We're sorry, but something went wrong (500)</title>
<style type="text/css"> <link href="static.css" media="screen" rel="stylesheet" type="text/css" />
body { background-color: #EAEAEA; color: #666; text-align: center; font-family: arial, sans-serif; }
div.dialog {
width: 600px;
padding: 0 4em;
margin: 4em auto 0 auto;
}
h1 { font-size: 48px; color: #444; line-height: 1.5em; }
h2 { font-size: 24px; color: #666; line-height: 1.5em; }
</style>
</head> </head>
<body> <body>
<!-- This file lives in public/500.html --> <!-- This file lives in public/500.html -->
<div class="dialog"> <h1>500</h1>
<h1>500</h1> <div class="alert-message block-message error">
<h2>We're sorry, but something went wrong.</h2> <h2>We're sorry, but something went wrong.</h2>
<p>We've been notified about this issue and we'll take a look at it shortly.</p> <p>We've been notified about this issue and we'll take a look at it shortly.</p>
</div> </div>
......
public/static.css 0 → 100644
View file @ 81092c01
body { color: #666; text-align: center; font-family: arial, sans-serif; margin:0; padding:0; }
h1 { font-size: 48px; color: #444; line-height: 1.5em; }
h2 { font-size: 24px; color: #666; line-height: 1.5em; }
.alert-message {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
color: #404040;
background-color: #eedc94;
background-repeat: repeat-x;
background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));
background-image: -moz-linear-gradient(top, #fceec1, #eedc94);
background-image: -ms-linear-gradient(top, #fceec1, #eedc94);
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));
background-image: -webkit-linear-gradient(top, #fceec1, #eedc94);
background-image: -o-linear-gradient(top, #fceec1, #eedc94);
background-image: linear-gradient(top, #fceec1, #eedc94);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFCEEC1', endColorstr='#FFEEDC94', GradientType=0);
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
border-color: #eedc94 #eedc94 #e4c652;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) fadein(rgba(0, 0, 0, 0.1), 15%);
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
border-width: 1px;
border-style: solid;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
}
.alert-message .close {
margin-top: 1px;
*margin-top: 0;
}
.alert-message a {
font-weight: bold;
color: #404040;
}
.alert-message.danger p a, .alert-message.error p a, .alert-message.success p a, .alert-message.info p a {
color: #404040;
}
.alert-message h5 {
line-height: 18px;
}
.alert-message p {
margin-bottom: 0;
}
.alert-message div {
margin-top: 5px;
margin-bottom: 2px;
line-height: 28px;
}
.alert-message.block-message.error {
background: #FDDFDE;
border-color: #FBC7C6;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7