Merge branch 'master' into 'improve-versions-menu'

# Conflicts:
#   layouts/header.html

5 files changed, 27 insertions, 22 deletions

diff --git a/content/404.html b/content/404.html
index e8de077a..9cc54083 100644
--- a/content/404.html
+++ b/content/404.html
@@ -5,11 +5,16 @@ title: 404 not found I say you!
 <div class='four-oh-four'>
   <center>
     <h1>404</h1>
-      <img src="<%= @items['/assets/images/404.png'].path %>" alt="Thank you GitLab Fan for the image!"/>
-      <!-- https://gitlabfan.com/gitlab-stickers-for-telegram-and-slack-16639b2c126 -->
+    <img src="<%= @items['/assets/images/404.png'].path %>" alt="Thank you GitLab Fan for the image!"/>
+    <!-- https://gitlabfan.com/gitlab-stickers-for-telegram-and-slack-16639b2c126 -->
     <br>
     <h2>Oh noes! Something's not right!</h2>
     <br>
+    <p>
+      If you followed a link from the versions dropdown menu, that means that the
+      page you're looking for doesn't exist in this version!
+    </p>
+    <br>
   </center>
 
   <% unless ENV['NANOC_ENV'] == 'production' %>
@@ -32,22 +37,10 @@ title: 404 not found I say you!
   <% end %>
 
   <center>
-    <h3>
-      <a href="javascript:history.back()" class="js-go-back go-back">Go back</a>
-    </h3>
+    <a href="javascript:history.back()" class="btn btn-warning">← Go back</a>
   <center>
 </div>
 
-<script>
-  (function () {
-    var goBack = document.querySelector('.js-go-back');
-
-    if (history.length > 1) {
-      goBack.style.display = 'inline';
-    }
-  })();
-</script>
-
 <% if ENV['NANOC_ENV'] == 'production' %>
 <script type="text/javascript">
   // Redirect to /archives on a non-existing versions
diff --git a/content/assets/stylesheets/404.scss b/content/assets/stylesheets/404.scss
index b1833bb7..42411ebc 100644
--- a/content/assets/stylesheets/404.scss
+++ b/content/assets/stylesheets/404.scss
@@ -1,11 +1,12 @@
 ---
-version: 1
+version: 2
 ---
 
 // Override some main elements
 .four-oh-four {
   img {
     border: 0;
+    box-shadow: none;
   }
 
   h2, h3 {
diff --git a/content/cookies-policy/index.md b/content/cookies-policy/index.md
index 1c085d6e..cdc235c0 100644
--- a/content/cookies-policy/index.md
+++ b/content/cookies-policy/index.md
@@ -1,5 +1,6 @@
 ---
 comments: false
+noindex: true
 ---
 
 # Cookies policy
diff --git a/layouts/head.html b/layouts/head.html
index 63291657..e99be97c 100644
--- a/layouts/head.html
+++ b/layouts/head.html
@@ -10,6 +10,9 @@
   <meta name="description" content="Documentation for GitLab Community Edition, GitLab Enterprise Edition, Omnibus GitLab, and GitLab Runner.">
 <% end %>
 <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+<% if @item[:noindex] %>
+  <meta name="robots" content="noindex nofollow">
+<% end %>
 <link rel="stylesheet" href="<%= @items['/assets/stylesheets/bootstrap.min.*'].path %>">
 <link rel="stylesheet" href="<%= @items['/assets/stylesheets/stylesheet.*'].path %>">
 <link rel="stylesheet" href="<%= @items['/assets/stylesheets/highlight.*'].path %>">
diff --git a/layouts/header.html b/layouts/header.html
index b510913c..a039c8af 100644
--- a/layouts/header.html
+++ b/layouts/header.html
@@ -18,21 +18,28 @@
       </a>
       <ul class="dropdown-menu versions-menu" aria-labelledby="versions">
         <li>
-          <a href='/' class="versions-tooltip">master
+          <a href='<%= @item.identifier.without_ext + '.html' %>' class="versions-tooltip">master</a>
             <i class="fa fa-question-circle-o" aria-hidden="true" data-toggle="tooltip" data-placement="bottom" title="The latest docs from GitLab's master branches, to which this site defaults."></i>
           </a>
         </li>
         <li role="separator" class="divider"></li>
-        <li><a href='/<%= @items['/_data/versions.yaml'][:current].first %>/'>
-          <%= @items['/_data/versions.yaml'][:current].first %></a>
+        <li>
+          <a href='/<%= @items['/_data/versions.yaml'][:current].first %><%= @item.identifier.without_ext + '.html' %>'>
+          <%= @items['/_data/versions.yaml'][:current].first %>
+          </a>
         </li>
-      <% @items['/_data/versions.yaml'][:previous].each do |version| %>
-        <li><a href='/<%= version %>/'><%= version %></a></li>
-      <% end %>
+        <% @items['/_data/versions.yaml'][:previous].each do |version| %>
+        <li>
+          <a href='/<%= version %><%= @item.identifier.without_ext + '.html' %>'>
+            <%= version %>
+          </a>
+        </li>
+        <% end %>
         <li role="separator" class="divider"></li>
         <li><a href='/archives/'>Archives</a></li>
       </ul>
     </div>
+    <!-- versions dropdown-->
   </div>
   <div class="nav-container">
     <a class="nav-toggle" id="docs-nav-toggle">