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:
authorMarcel Amirault <mamirault@gitlab.com>2021-06-02 08:37:28 +0300
committerMarcel Amirault <mamirault@gitlab.com>2021-08-24 04:21:57 +0300
commit269fb5beb972aea16672d855e2ac3b0ad3abaabb (patch)
treeb75b50b3069300207042b9377f1e080ee8d03a5d
parent82ffd7ac8b036b8ed7ce7a516c4b5717a061fa71 (diff)
Update references of master to main for gitlab repoupdate-gitlab-to-main
-rw-r--r--.gitlab-ci.yml4
-rw-r--r--Rakefile2
-rw-r--r--content/archives/index.html2
-rw-r--r--dockerfiles/Dockerfile.gitlab-docs-lint-markdown4
-rw-r--r--lib/helpers/edit_on_gitlab.rb4
5 files changed, 8 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4dfbb069..74f82b73 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,10 +25,10 @@ stages:
- post-deploy
#
-# Pick the remote branch, by default master (see the Rakefile for more info)
+# Pick the remote branch (see the Rakefile for more info)
#
variables:
- BRANCH_EE: 'master'
+ BRANCH_EE: 'main'
BRANCH_OMNIBUS: 'master'
BRANCH_RUNNER: 'main'
BRANCH_CHARTS: 'master'
diff --git a/Rakefile b/Rakefile
index 259fe058..f2222c78 100644
--- a/Rakefile
+++ b/Rakefile
@@ -107,7 +107,7 @@ namespace :release do
# Replace the branches variables in .gitlab-ci.yml
ci_yaml = "#{source_dir}/.gitlab-ci.yml"
ci_yaml_content = File.read(ci_yaml)
- ci_yaml_content.gsub!("BRANCH_EE: 'master'", "BRANCH_EE: '#{version.tr('.', '-')}-stable-ee'")
+ ci_yaml_content.gsub!("BRANCH_EE: 'main'", "BRANCH_EE: '#{version.tr('.', '-')}-stable-ee'")
ci_yaml_content.gsub!("BRANCH_OMNIBUS: 'master'", "BRANCH_OMNIBUS: '#{version.tr('.', '-')}-stable'")
ci_yaml_content.gsub!("BRANCH_RUNNER: 'main'", "BRANCH_RUNNER: '#{version.tr('.', '-')}-stable'")
ci_yaml_content.gsub!("BRANCH_CHARTS: 'master'", "BRANCH_CHARTS: '#{chart_version(version).tr('.', '-')}-stable'")
diff --git a/content/archives/index.html b/content/archives/index.html
index f8e98370..699b7cab 100644
--- a/content/archives/index.html
+++ b/content/archives/index.html
@@ -21,7 +21,7 @@ The <a href="/">default version</a> of this website
is built from the documentation directories on the default branches of:
<ul>
- <li><a href="https://gitlab.com/gitlab-org/gitlab/-/tree/master/doc">GitLab</a></li>
+ <li><a href="https://gitlab.com/gitlab-org/gitlab/-/tree/main/doc">GitLab</a></li>
<li><a href="https://gitlab.com/gitlab-org/omnibus-gitlab/-/tree/master/doc">Omnibus GitLab</a></li>
<li><a href="https://gitlab.com/gitlab-org/gitlab-runner/-/tree/main/docs">GitLab Runner</a></li>
<li><a href="https://gitlab.com/gitlab-org/charts/gitlab/-/tree/master/doc"> GitLab Charts</a></li>
diff --git a/dockerfiles/Dockerfile.gitlab-docs-lint-markdown b/dockerfiles/Dockerfile.gitlab-docs-lint-markdown
index 29e4f6ba..39ee1645 100644
--- a/dockerfiles/Dockerfile.gitlab-docs-lint-markdown
+++ b/dockerfiles/Dockerfile.gitlab-docs-lint-markdown
@@ -38,8 +38,8 @@ RUN curl -sfL https://install.goreleaser.com/github.com/ValeLint/vale.sh | sh -s
# Set up needed environment variables that are called with --build-arg when
# the Docker image is built (see .gitlab-ci.yml).
ARG CI_COMMIT_REF_NAME
-# If CI_COMMIT_REF_NAME is not set (local development), set it to master
-ENV CI_COMMIT_REF_NAME ${CI_COMMIT_REF_NAME:-master}
+# If CI_COMMIT_REF_NAME is not set (local development), set it to main
+ENV CI_COMMIT_REF_NAME ${CI_COMMIT_REF_NAME:-main}
WORKDIR /tmp
diff --git a/lib/helpers/edit_on_gitlab.rb b/lib/helpers/edit_on_gitlab.rb
index ea77df93..7f45c98b 100644
--- a/lib/helpers/edit_on_gitlab.rb
+++ b/lib/helpers/edit_on_gitlab.rb
@@ -25,8 +25,8 @@ module Nanoc::Helpers
gitlab_ide_url = "https://gitlab.com/-/ide/project/gitlab-org/#{product}/gitlab/edit/master/-/doc/#{docs_content_filename}"
# gitlab-foss and gitlab repos
when "ee"
- 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}"
+ gitlab_url = "https://gitlab.com/gitlab-org/gitlab/blob/main/doc/#{docs_content_filename}"
+ gitlab_ide_url = "https://gitlab.com/-/ide/project/gitlab-org/gitlab/edit/main/-/doc/#{docs_content_filename}"
else
# gitlab-docs pages
gitlab_url = "https://gitlab.com/gitlab-org/gitlab-docs/blob/main/#{@item[:content_filename]}"