summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-09-01 11:48:40 +0000
committerDouwe Maan <douwe@gitlab.com>2017-09-01 11:48:40 +0000
commit538852fe5f15a779708ef51ca9e647100d41bdf1 (patch)
tree61d003511d4b0eb95612508ecb01aa28aadcb5b5
parent05825fe760d61a3a306a097449db2f27c872b2ad (diff)
parentd4b88c61a4f68c6e6d047f1df33eaa6280abbab4 (diff)
downloadgitlab-ce-538852fe5f15a779708ef51ca9e647100d41bdf1.tar.gz
Merge branch 'add_message_to_the_404_page' into 'master'
Changed message and title on the 404 page See merge request !13982
-rw-r--r--changelogs/unreleased/add_message_to_the_404_page.yml5
-rw-r--r--public/404.html3
2 files changed, 7 insertions, 1 deletions
diff --git a/changelogs/unreleased/add_message_to_the_404_page.yml b/changelogs/unreleased/add_message_to_the_404_page.yml
new file mode 100644
index 00000000000..f567796fe9f
--- /dev/null
+++ b/changelogs/unreleased/add_message_to_the_404_page.yml
@@ -0,0 +1,5 @@
+---
+title: Changed message and title on the 404 page
+merge_request:
+author: Branka Martinovic
+type: added
diff --git a/public/404.html b/public/404.html
index 4db72be6f8c..08f328da542 100644
--- a/public/404.html
+++ b/public/404.html
@@ -72,8 +72,9 @@
404
</h1>
<div class="container">
- <h3>The page you're looking for could not be found.</h3>
+ <h3>The page could not be found or you don't have permission to view it.</h3>
<hr />
+ <p>The resource that you are attempting to access does not exist or you don't have the necessary permissions to view it.</p>
<p>Make sure the address is correct and that the page hasn't moved.</p>
<p>Please contact your GitLab administrator if you think this is a mistake.</p>
<a href="javascript:history.back()" class="js-go-back go-back">Go back</a>