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:
authorMarcia Ramos <virtua.creative@gmail.com>2018-03-23 20:17:29 +0300
committerMarcia Ramos <virtua.creative@gmail.com>2018-03-23 20:17:29 +0300
commita2d404c6a87178830ef41e5908f4f8e8a53ce8a1 (patch)
treef13672a16e1bd0f214d1f327071c850e5b400dd5
parent715c566932b3414857982562b9af106eb05f7250 (diff)
parent16375180f3b826e8d71b0b674d9d6c72201e6634 (diff)
Merge branch 'add-com-settings' into 'master'
Expose GitLab.com settings under the home page See merge request gitlab-com/gitlab-docs!217
-rw-r--r--content/index.erb29
-rw-r--r--nanoc.yaml4
2 files changed, 19 insertions, 14 deletions
diff --git a/content/index.erb b/content/index.erb
index 3b8134b2..5653cc54 100644
--- a/content/index.erb
+++ b/content/index.erb
@@ -43,7 +43,15 @@ title: GitLab Documentation
</div>
</a>
</li>
- <li class="subtopic topic-ssh">
+ <li class="subtopic topic-api">
+ <a href="ee/api/">
+ <div class="wrapper">
+ <h2>GitLab API</h2>
+ <p>Automate GitLab via a simple and powerful API.</p>
+ </div>
+ </a>
+ </li>
+ <li class="subtopic topic-ssh">
<a href="ee/ssh/">
<div class="wrapper">
<h2>SSH</h2>
@@ -53,19 +61,14 @@ title: GitLab Documentation
</div>
</a>
</li>
- <li class="subtopic topic-pages">
- <a href="ee/user/project/pages/">
+ <li class="subtopic topic-com-settings">
+ <a href="ee/user/gitlab_com/">
<div class="wrapper">
- <h2>GitLab Pages</h2>
- <p>Learn how to publish a static website directly from GitLab.</p>
- </div>
- </a>
- </li>
- <li class="subtopic topic-api">
- <a href="ee/api/">
- <div class="wrapper">
- <h2>GitLab API</h2>
- <p>Automate GitLab via a simple and powerful API.</p>
+ <h2>GitLab.com settings</h2>
+ <p>
+ Information about the settings that are used on GitLab.com, like SSH
+ keys fingerprints, shared Runners configuration, etc.
+ </p>
</div>
</a>
</li>
diff --git a/nanoc.yaml b/nanoc.yaml
index 75c9e8af..c19529e1 100644
--- a/nanoc.yaml
+++ b/nanoc.yaml
@@ -81,10 +81,12 @@ checks:
# Exclude major.minor versions that are used under /archives
- '^/\d{1,2}\.\d{1,2}/$'
# Exclude the extra links listed in the home page
+ - 'ee\/api\/'
+ - 'ee\/ci\/'
- 'ee\/ci\/yaml\/'
- 'ee\/ssh\/'
+ - 'ee\/user\/gitlab_com\/'
- 'ee\/user\/project\/pages\/'
- - 'ee\/api\/'
# Configuration for the “external_links” checker, which checks whether all
# external links are valid.