From 2f5e895aebfa5678e51db303b97de56c51e3cebe Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Fri, 13 Sep 2019 14:03:01 +0000 Subject: Remove gitlab-foss Git URLs as we don't need them anymore [ci skip] --- README.md | 22 +++++++++------------- content/archives/index.html | 4 ++-- layouts/feedback.html | 6 +++--- lib/helpers/edit_on_gitlab.rb | 10 +++------- nanoc.yaml | 8 ++++---- 5 files changed, 21 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 926cf55f..8c108fb0 100644 --- a/README.md +++ b/README.md @@ -46,18 +46,18 @@ See [LICENSE](LICENSE). ## Projects we pull from -There are currently 5 products that are pulled and generate the docs website: +There are currently 4 products that are pulled and generate the docs website: -- [GitLab Enterprise Edition](https://gitlab.com/gitlab-org/gitlab-ee) -- [GitLab Community Edition](https://gitlab.com/gitlab-org/gitlab-ce) +- [GitLab](https://gitlab.com/gitlab-org/gitlab) - [Omnibus GitLab](https://gitlab.com/gitlab-org/omnibus-gitlab) - [GitLab Runner](https://gitlab.com/gitlab-org/gitlab-runner) - [GitLab Chart](https://gitlab.com/gitlab-org/charts/gitlab) **Note:** Although GitLab Community Edition is generated, it is hidden from the website -as it's a subset of the Enterprise Edition. We generate it for consistency, -until the [GitLab codebase is unified](https://gitlab.com/gitlab-org/gitlab-ee/issues/2952). +as it's the same as the Enterprise Edition. We generate it for consistency, +until [better redirects](https://gitlab.com/gitlab-org/gitlab-pages/issues/24) +are implemented. ## Requirements @@ -167,8 +167,7 @@ Then, it's time to clone the needed repositories. ```sh ## Using HTTPS (for members that do not have Developer access) - git clone https://gitlab.com//gitlab-ce.git - git clone https://gitlab.com//gitlab-ee.git + git clone https://gitlab.com//gitlab.git git clone https://gitlab.com//gitlab-runner.git git clone https://gitlab.com//omnibus-gitlab.git git clone https://gitlab.com//gitlab.git charts @@ -180,8 +179,7 @@ Then, it's time to clone the needed repositories. ```sh ## Using SSH (for members that have Developer access) - git clone git@gitlab.com:gitlab-org/gitlab-ce.git - git clone git@gitlab.com:gitlab-org/gitlab-ee.git + git clone git@gitlab.com:gitlab-org/gitlab.git git clone git@gitlab.com:gitlab-org/gitlab-runner.git git clone git@gitlab.com:gitlab-org/omnibus-gitlab.git git clone git@gitlab.com:gitlab-org/charts/gitlab.git charts @@ -200,8 +198,7 @@ the directory that holds the documentation content. 1. For each one of the products, create the symlink: ```sh - ln -s ~/dev/gitlab/gitlab-ce/doc ~/dev/gitlab/gitlab-docs/content/ce - ln -s ~/dev/gitlab/gitlab-ee/doc ~/dev/gitlab/gitlab-docs/content/ee + ln -s ~/dev/gitlab/gitlab/doc ~/dev/gitlab/gitlab-docs/content/ee ln -s ~/dev/gitlab/omnibus-gitlab/doc ~/dev/gitlab/gitlab-docs/content/omnibus ln -s ~/dev/gitlab/gitlab-runner/docs ~/dev/gitlab/gitlab-docs/content/runner ln -s ~/dev/gitlab/charts/doc ~/dev/gitlab/gitlab-docs/content/charts @@ -380,7 +377,7 @@ for its search function. This is how it works: 1. On the docs side, we use a [docsearch layout](/layouts/docsearch.html) which is present on pretty much every page except https://docs.gitlab.com/search/, which uses its [own layout](/layouts/instantsearch.html). In those layouts, - there's a javascript snippet which initiates docsearch by using an API key + there's a Javascript snippet which initiates docsearch by using an API key and an index name (`gitlab`) that are needed for Algolia to show the results. **For GitLab employees:** @@ -390,7 +387,6 @@ title "Email, Slack, and GitLab Groups and Aliases", search for `docsearch`, and add a comment with your email to be added to the alias that gets the weekly reports. -[job]: https://gitlab.com/gitlab-org/gitlab-ce/blob/2c00d00ec1c39dbea0e0e54265027b5476b78e3c/.gitlab-ci.yml#L308-318 [pages]: https://about.gitlab.com/features/pages/ [environments page]: https://gitlab.com/gitlab-org/gitlab-docs/environments/folders/review [env-url-button]: https://docs.gitlab.com/ce/ci/environments.html#making-use-of-the-environment-url diff --git a/content/archives/index.html b/content/archives/index.html index fe70b9a4..1393d4e8 100644 --- a/content/archives/index.html +++ b/content/archives/index.html @@ -21,8 +21,8 @@ locally. The default version of this website is built from the doc directories on the master branches of -GitLab Community Edition, -GitLab Enterprise Edition, +GitLab Community Edition, +GitLab Enterprise Edition, Omnibus GitLab, and GitLab Runner, all of them brought together by the diff --git a/layouts/feedback.html b/layouts/feedback.html index 859dcab1..dfc9a72b 100644 --- a/layouts/feedback.html +++ b/layouts/feedback.html @@ -37,7 +37,7 @@

- + CREATE AN ISSUE @@ -50,7 +50,7 @@

- + SUBMIT FEATURE PROPOSAL @@ -188,7 +188,7 @@

- + CREATE AN ISSUE diff --git a/lib/helpers/edit_on_gitlab.rb b/lib/helpers/edit_on_gitlab.rb index d6dbd8ad..5bc70f33 100644 --- a/lib/helpers/edit_on_gitlab.rb +++ b/lib/helpers/edit_on_gitlab.rb @@ -23,14 +23,10 @@ module Nanoc::Helpers # GitLab Helm chart repo gitlab_url = "https://gitlab.com/#{product}/gitlab/blob/master/doc/#{docs_content_filename}" gitlab_ide_url = "https://gitlab.com/-/ide/project/#{product}/gitlab/edit/master/-/doc/#{docs_content_filename}" + # gitlab-foss and gitlab repos elsif %w[ce ee].include?(product) - # gitlab-ce and gitlab-ee repos - if product == "ee" - ce_file = File.join(root_dir, @item[:content_filename].sub(@config[:products][:ee][:dirs][:dest_dir], @config[:products][:ce][:dirs][:dest_dir])) - product = "ce" if File.exists?(ce_file) - end - gitlab_url = "https://gitlab.com/gitlab-org/gitlab-#{product}/blob/master/doc/#{docs_content_filename}" - gitlab_ide_url = "https://gitlab.com/-/ide/project/gitlab-org/gitlab-#{product}/edit/master/-/doc/#{docs_content_filename}" + gitlab_url = "https://gitlab.com/gitlab-org/gitlab/blob/master/doc/#{docs_content_filename}" + gitlab_ide_url = "https://gitlab.com/-/ide/project/gitlab-org/gitlab/edit/master/-/doc/#{docs_content_filename}" else # gitlab-docs pages gitlab_url = "https://gitlab.com/gitlab-org/gitlab-docs/blob/master/#{@item[:content_filename]}" diff --git a/nanoc.yaml b/nanoc.yaml index 0e31849b..c8ec5dcd 100644 --- a/nanoc.yaml +++ b/nanoc.yaml @@ -128,13 +128,13 @@ debug: false products: ce: - full_name: 'GitLab CE' - short_name: 'GitLab CE' + full_name: 'GitLab FOSS' + short_name: 'GitLab FOSS' slug: 'ce' index_file: 'README.*' img: '/assets/images/docs-gitlab.svg' description: 'Browse user and administration documentation and guides for GitLab Community Edition.' - repo: 'https://gitlab.com/gitlab-org/gitlab-ce.git' + repo: 'https://gitlab.com/gitlab-org/gitlab-foss.git' dirs: temp_dir: 'tmp/ce/' dest_dir: 'content/ce' @@ -147,7 +147,7 @@ products: index_file: 'README.*' img: '/assets/images/docs-gitlab.svg' description: 'Usage and administration of GitLab Community Edition (CE), Enterprise Edition (EE), and GitLab.com.' - repo: 'https://gitlab.com/gitlab-org/gitlab-ee.git' + repo: 'https://gitlab.com/gitlab-org/gitlab.git' dirs: temp_dir: 'tmp/ee/' dest_dir: 'content/ee' -- cgit v1.2.3