Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-11-28 21:40:54 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-11-28 21:40:54 +0400
commitc873cf81f61d644639b459b2fde1267a41050bc1 (patch)
tree6326a177a96b0cad56d3b22d3cf469f716723c74 /app/views/errors
parentd8f825ef009d10fe03674989239e3a26e21fff36 (diff)
Restyled error messages in common way. Added title to head partial
Diffstat (limited to 'app/views/errors')
-rw-r--r--app/views/errors/access_denied.html.haml5
-rw-r--r--app/views/errors/encoding.html.haml3
-rw-r--r--app/views/errors/git_not_found.html.haml4
-rw-r--r--app/views/errors/gitolite.html.haml4
-rw-r--r--app/views/errors/not_found.html.haml4
5 files changed, 11 insertions, 9 deletions
diff --git a/app/views/errors/access_denied.html.haml b/app/views/errors/access_denied.html.haml
index 3b60ed8b0ee..a6e4f0b9498 100644
--- a/app/views/errors/access_denied.html.haml
+++ b/app/views/errors/access_denied.html.haml
@@ -1,4 +1,5 @@
-%h1 Access Denied
+%h1 403
+%h3.page_title Access Denied
%hr
-%h2 You are not allowed to access this page.
+%p You are not allowed to access this page.
%p Read more about project permissions #{link_to "here", help_permissions_path, class: "vlink"}
diff --git a/app/views/errors/encoding.html.haml b/app/views/errors/encoding.html.haml
index d7b5e68e870..a0aa6306489 100644
--- a/app/views/errors/encoding.html.haml
+++ b/app/views/errors/encoding.html.haml
@@ -1,3 +1,4 @@
-%h1 Encoding Error
+%h1.http_status_code 500
+%h3.page_title Encoding Error
%hr
%p Page can't be loaded because of an encoding error.
diff --git a/app/views/errors/git_not_found.html.haml b/app/views/errors/git_not_found.html.haml
index cd01ea1b0e6..5c9c4953284 100644
--- a/app/views/errors/git_not_found.html.haml
+++ b/app/views/errors/git_not_found.html.haml
@@ -1,6 +1,6 @@
-%h1 404
+%h1.http_status_code 404
+%h3.page_title Git Resource Not found
%hr
-%h2 Git Resource Not found
%p
Application can't get access to some branch or commit in your repository. It
may have been moved.
diff --git a/app/views/errors/gitolite.html.haml b/app/views/errors/gitolite.html.haml
index 699e6984db6..2670f2d3fda 100644
--- a/app/views/errors/gitolite.html.haml
+++ b/app/views/errors/gitolite.html.haml
@@ -1,6 +1,6 @@
-%h1 Git Error
+%h1.http_status_code 500
+%h3.page_title GitLab was unable to access your Gitolite system.
%hr
-%h2 GitLab was unable to access your Gitolite system.
.git_error_tips
%h4 Tips for Administrator:
diff --git a/app/views/errors/not_found.html.haml b/app/views/errors/not_found.html.haml
index a4e8d0204a9..ee23d2197b4 100644
--- a/app/views/errors/not_found.html.haml
+++ b/app/views/errors/not_found.html.haml
@@ -1,4 +1,4 @@
-%h1 404
+%h1.http_status_code 404
+%h3.page_title The resource you were looking for doesn't exist.
%hr
-%h2 The resource you were looking for doesn't exist.
%p You may have mistyped the address or the page may have moved.