Merge branch 'master' into hooray_apostrophes

4 files changed, 38 insertions, 43 deletions

diff --git a/app/views/errors/access_denied.html.haml b/app/views/errors/access_denied.html.haml
index d38e06137a1..3b60ed8b0ee 100644
--- a/app/views/errors/access_denied.html.haml
+++ b/app/views/errors/access_denied.html.haml
@@ -1,5 +1,4 @@
-.alert-message.block-message.error
-  %h3 Access Denied
-  %hr
-  %p You are not allowed to access this page.
-  %p Read more about project permissions #{link_to "here", help_permissions_path, class: "vlink"}
+%h1 Access Denied
+%hr
+%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/git_not_found.html.haml b/app/views/errors/git_not_found.html.haml
index 27ba201a43d..cd01ea1b0e6 100644
--- a/app/views/errors/git_not_found.html.haml
+++ b/app/views/errors/git_not_found.html.haml
@@ -1,9 +1,6 @@
-.alert-message.block-message.error
-  %h3 Git Resource Not found
-  %hr
-  %p
-    Application can't get access to some
-    %span.label branch
-    or
-    %span.label commit
-    in your repository. It may have been moved.
+%h1 404
+%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 3463e8f027a..4788c2e5237 100644
--- a/app/views/errors/gitolite.html.haml
+++ b/app/views/errors/gitolite.html.haml
@@ -1,27 +1,27 @@
-.alert-message.block-message.error
-  %h3 Gitolite Error
-  %h4 Application can't get access to your gitolite system.
+%h1 Git Error
+%hr
+%h2 Gitlab was unable to access your Gitolite system.
 
-%h4 Tips for Administrator:
-
-%ul
-  %li
-    %p
-      Check git logs in admin area
-  %li
-    %p
-      Check config/gitlab.yml for correct settings.
-  %li
-    %p
-      Diagnostic tool:
+.git_error_tips
+  %h4 Tips for Administrator:
+  %ol
+    %li
+      %p
+        Check git logs in admin area
+    %li
+      %p
+        Check config/gitlab.yml for correct settings.
+    %li
+      %p
+        Diagnostic tool:
+        %pre
+          bundle exec rake gitlab:app:status RAILS_ENV=production
+    %li
+      %p
+        Permissions:
       %pre
-        bundle exec rake gitlab:app:status RAILS_ENV=production
-  %li
-    %p
-      Permissions:
-    %pre
-      = preserve do
-        sudo chmod -R 770 /home/git/repositories/
-        sudo chown -R git:git /home/git/repositories/
-        sudo chown gitlab:gitlab /home/git/repositories/**/hooks/post-receive 
+        = preserve do
+          sudo chmod -R 770 /home/git/repositories/
+          sudo chown -R git:git /home/git/repositories/
+          sudo chown gitlab:gitlab /home/git/repositories/**/hooks/post-receive
 
diff --git a/app/views/errors/not_found.html.haml b/app/views/errors/not_found.html.haml
index 374c4f37d17..a4e8d0204a9 100644
--- a/app/views/errors/not_found.html.haml
+++ b/app/views/errors/not_found.html.haml
@@ -1,5 +1,4 @@
-.alert-message.block-message.error
-  %h3 Not found
-  %hr
-  %p The resource you were looking for doesn't exist.
-  %p You may have mistyped the address or it may have been removed.
+%h1 404
+%hr
+%h2 The resource you were looking for doesn't exist.
+%p You may have mistyped the address or the page may have moved.