Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-docs.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Norris <cnorris@gitlab.com>2021-04-06 18:56:55 +0300
committerCraig Norris <cnorris@gitlab.com>2021-04-06 18:56:55 +0300
commit82ce0c30638fea6dd510bf45b78c5dbf40c66275 (patch)
tree0651590a9045d431ede2fbc6d451bef49ec6c410
parent301bdc9a8e9e73b3e32a0e4875bc120cfc4febb5 (diff)
parentfc979174046d7ac5abc028fd3464b79470c63e73 (diff)
Merge branch 'rename-global-nav-yaml' into 'master'
Rename global navigation YAML file See merge request gitlab-org/gitlab-docs!1662
-rw-r--r--content/_data/navigation.yaml (renamed from content/_data/default-nav.yaml)0
-rw-r--r--lib/gitlab/navigation.rb2
-rw-r--r--spec/gitlab/navigation_spec.rb2
3 files changed, 2 insertions, 2 deletions
diff --git a/content/_data/default-nav.yaml b/content/_data/navigation.yaml
index 694a6f93..694a6f93 100644
--- a/content/_data/default-nav.yaml
+++ b/content/_data/navigation.yaml
diff --git a/lib/gitlab/navigation.rb b/lib/gitlab/navigation.rb
index fafd846d..9ce79662 100644
--- a/lib/gitlab/navigation.rb
+++ b/lib/gitlab/navigation.rb
@@ -15,7 +15,7 @@ module Gitlab
end
def nav_items
- @nav_items ||= items["/_data/default-nav.yaml"]
+ @nav_items ||= items["/_data/navigation.yaml"]
end
def element_href(element)
diff --git a/spec/gitlab/navigation_spec.rb b/spec/gitlab/navigation_spec.rb
index abcf1fee..68ac6a3d 100644
--- a/spec/gitlab/navigation_spec.rb
+++ b/spec/gitlab/navigation_spec.rb
@@ -9,7 +9,7 @@ describe Gitlab::Navigation do
let(:item) { double(path: '/omnibus/user/README.html', identifier: double(to_s: '/omnibus/user/README.md')) }
let(:items) do
{
- '/_data/default-nav.yaml' => { sections: [Gitlab::Navigation::Section.new(section_title: 'Default Section')] }
+ '/_data/navigation.yaml' => { sections: [Gitlab::Navigation::Section.new(section_title: 'Default Section')] }
}
end