diff options
-rw-r--r-- | .gitlab/ci/test.gitlab-ci.yml | 2 | ||||
-rw-r--r-- | .nvmrc | 2 | ||||
-rw-r--r-- | .tool-versions | 2 | ||||
-rw-r--r-- | content/_data/navigation.yaml | 28 |
4 files changed, 17 insertions, 17 deletions
diff --git a/.gitlab/ci/test.gitlab-ci.yml b/.gitlab/ci/test.gitlab-ci.yml index afbc2dde..89600960 100644 --- a/.gitlab/ci/test.gitlab-ci.yml +++ b/.gitlab/ci/test.gitlab-ci.yml @@ -41,10 +41,10 @@ check_duplicate_redirects: check_global_nav_entries: extends: - .rules_site_tests + - .bundle needs: [] stage: test script: - - bundle install - make check-global-navigation # @@ -1 +1 @@ -18.14.2 +18.15.0 diff --git a/.tool-versions b/.tool-versions index 05cc0226..34d3a372 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,4 +1,4 @@ ruby 3.0.5 -nodejs 18.14.2 +nodejs 18.15.0 shellcheck 0.9.0 yarn 1.22.19 diff --git a/content/_data/navigation.yaml b/content/_data/navigation.yaml index e3a9c0e1..425962c4 100644 --- a/content/_data/navigation.yaml +++ b/content/_data/navigation.yaml @@ -1139,7 +1139,7 @@ sections: doc_url: 'ee/user/project/deploy_tokens/' - doc_title: File finder doc_url: 'ee/user/project/repository/file_finder.html' - - doc_title: Migrating projects + - doc_title: Import projects doc_url: 'ee/user/project/import/' docs: - doc_title: Bitbucket Cloud @@ -1152,13 +1152,24 @@ sections: doc_url: 'ee/user/project/import/cvs.html' - doc_title: FogBugz doc_url: 'ee/user/project/import/fogbugz.html' + - doc_title: Gitea + doc_url: 'ee/user/project/import/gitea.html' - doc_title: GitHub doc_url: 'ee/user/project/import/github.html' docs: - doc_title: GitHub import Rake task doc_url: 'ee/administration/raketasks/github_import.html' - - doc_title: Gitea - doc_url: 'ee/user/project/import/gitea.html' + - doc_title: GitLab + doc_url: 'ee/user/project/settings/import_export.html' + docs: + - doc_title: Troubleshooting + doc_url: 'ee/user/project/settings/import_export_troubleshooting.html' + - doc_title: Rate limits for project and group imports and exports + doc_url: 'ee/user/admin_area/settings/import_export_rate_limits.html' + - doc_title: Decompressed archive size limits + doc_url: 'ee/security/project_import_decompressed_archive_size_limits.html' + - doc_title: Rake tasks + doc_url: 'ee/administration/raketasks/project_import_export.html' - doc_title: Jira doc_url: 'ee/user/project/import/jira.html' - doc_title: Perforce Helix @@ -1169,17 +1180,6 @@ sections: doc_url: 'ee/user/project/import/repo_by_url.html' - doc_title: TFVC doc_url: 'ee/user/project/import/tfvc.html' - - doc_title: Migrate projects using file exports - doc_url: 'ee/user/project/settings/import_export.html' - docs: - - doc_title: Troubleshooting - doc_url: 'ee/user/project/settings/import_export_troubleshooting.html' - - doc_title: Rate limits for project and group imports and exports - doc_url: 'ee/user/admin_area/settings/import_export_rate_limits.html' - - doc_title: Decompressed archive size limits - doc_url: 'ee/security/project_import_decompressed_archive_size_limits.html' - - doc_title: Rake tasks - doc_url: 'ee/administration/raketasks/project_import_export.html' - category_title: Plan and track work category_url: 'ee/topics/plan_and_track.html' |