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:
Diffstat (limited to 'app/views/errors')
-rw-r--r--app/views/errors/access_denied.html.haml2
-rw-r--r--app/views/errors/encoding.html.haml3
-rw-r--r--app/views/errors/git_not_found.html.haml3
-rw-r--r--app/views/errors/gitolite.html.haml3
-rw-r--r--app/views/errors/not_found.html.haml2
5 files changed, 6 insertions, 7 deletions
diff --git a/app/views/errors/access_denied.html.haml b/app/views/errors/access_denied.html.haml
index 4766ef7bcdd..3b60ed8b0ee 100644
--- a/app/views/errors/access_denied.html.haml
+++ b/app/views/errors/access_denied.html.haml
@@ -1,4 +1,4 @@
%h1 Access Denied
%hr
-%h2 You are not allowed to access this page
+%h2 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 0ffbadeb08d..4662437f2d2 100644
--- a/app/views/errors/encoding.html.haml
+++ b/app/views/errors/encoding.html.haml
@@ -2,5 +2,4 @@
%h3 Encoding Error
%hr
%p
- Page cant be loaded cause of encoding error
-
+ 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 7bc6e98026e..cd01ea1b0e6 100644
--- a/app/views/errors/git_not_found.html.haml
+++ b/app/views/errors/git_not_found.html.haml
@@ -2,4 +2,5 @@
%hr
%h2 Git Resource Not found
%p
- Application cant get access to some branch or commit in your repository. Maybe it was removed
+ 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 44276419bac..4788c2e5237 100644
--- a/app/views/errors/gitolite.html.haml
+++ b/app/views/errors/gitolite.html.haml
@@ -1,7 +1,6 @@
%h1 Git Error
%hr
-%h2 Application cant get access to your gitolite system.
-
+%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 d3734e07d3c..a4e8d0204a9 100644
--- a/app/views/errors/not_found.html.haml
+++ b/app/views/errors/not_found.html.haml
@@ -1,4 +1,4 @@
%h1 404
%hr
-%h2 Resource you were looking for doesn't exist.
+%h2 The resource you were looking for doesn't exist.
%p You may have mistyped the address or the page may have moved.