Commit 492b02ee authored by Etienne Baqué's avatar Etienne Baqué

Merge branch 'eread/update-help-for-renamed-index' into 'master'

Update help for renamed documentation index

See merge request gitlab-org/gitlab!65624
parents 60059920 5a633772
...@@ -13,7 +13,7 @@ class HelpController < ApplicationController ...@@ -13,7 +13,7 @@ class HelpController < ApplicationController
def index def index
# Remove YAML frontmatter so that it doesn't look weird # Remove YAML frontmatter so that it doesn't look weird
@help_index = File.read(Rails.root.join('doc', 'README.md')).sub(YAML_FRONT_MATTER_REGEXP, '') @help_index = File.read(Rails.root.join('doc', 'index.md')).sub(YAML_FRONT_MATTER_REGEXP, '')
# Prefix Markdown links with `help/` unless they are external links. # Prefix Markdown links with `help/` unless they are external links.
# '//' not necessarily part of URL, e.g., mailto:mail@example.com # '//' not necessarily part of URL, e.g., mailto:mail@example.com
......
...@@ -274,7 +274,7 @@ RSpec.describe HelpController do ...@@ -274,7 +274,7 @@ RSpec.describe HelpController do
end end
def stub_readme(content) def stub_readme(content)
expect_file_read(Rails.root.join('doc', 'README.md'), content: content) expect_file_read(Rails.root.join('doc', 'index.md'), content: content)
end end
def stub_two_factor_required def stub_two_factor_required
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment