Automatic merge of gitlab-org/gitlab-ce master

app/views/projects/blob/viewers/_route_map.html.haml

@@ -6,4 +6,4 @@
   This Route Map is invalid:
   = viewer.validation_message
 
-= link_to 'Learn more', help_page_path('ci/environments', anchor: 'go-directly-from-source-files-to-public-pages-on-the-environment')
+= link_to 'Learn more', help_page_path('ci/environments', anchor: 'going-from-source-files-to-public-pages')

app/views/projects/blob/viewers/_route_map_loading.html.haml

 = icon('spinner spin fw')
 Validating Route Map…
 
-= link_to 'Learn more', help_page_path('ci/environments', anchor: 'go-directly-from-source-files-to-public-pages-on-the-environment')
+= link_to 'Learn more', help_page_path('ci/environments', anchor: 'going-from-source-files-to-public-pages')

changelogs/unreleased/fix-UI-links-to-route-map-info.yml

+---
+title: Fix UI anchor links after docs refactor
+merge_request: 26890
+author:
+type: fixed

qa/qa/specs/features/browser_ui/6_release/deploy_token/add_deploy_token_spec.rb

@@ -8,11 +8,11 @@ module QA
         Page::Main::Login.act { sign_in_using_credentials }
 
         deploy_token_name = 'deploy token name'
-        deploy_token_expires_at = Date.today + 7 # 1 Week from now
+        one_week_from_now = Date.today + 7
 
         deploy_token = Resource::DeployToken.fabricate! do |resource|
           resource.name = deploy_token_name
-          resource.expires_at = deploy_token_expires_at
+          resource.expires_at = one_week_from_now
         end
 
         expect(deploy_token.username.length).to be > 0