diff options
| author | Amy Qualls <aqualls@gitlab.com> | 2021-06-21 18:35:51 +0300 |
|---|---|---|
| committer | Amy Qualls <aqualls@gitlab.com> | 2021-06-21 18:35:51 +0300 |
| commit | ed9ca826a6cbba3288d4f7545d0bf2d3139cdecc (patch) | |
| tree | 870ac109ec1ff98701d997cdf54c2d774e017836 | |
| parent | 87e2690000faa84b73213e977e7960add1be76a7 (diff) | |
| parent | acabee16168074d9a4e915c74cb41cb68f4faf82 (diff) | |
Merge branch 'update-runner-repo-links-to-main' into 'main'
Update runner default branch to main
See merge request gitlab-org/gitlab-docs!1907
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | Rakefile | 2 | ||||
| -rw-r--r-- | lib/helpers/edit_on_gitlab.rb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 18ac7191..39f3988b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,7 +30,7 @@ stages: variables: BRANCH_EE: 'master' BRANCH_OMNIBUS: 'master' - BRANCH_RUNNER: 'master' + BRANCH_RUNNER: 'main' BRANCH_CHARTS: 'master' BUNDLE_PATH__SYSTEM: 'false' GIT_DEPTH: '20' @@ -115,7 +115,7 @@ namespace :release do 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_OMNIBUS: 'master'", "BRANCH_OMNIBUS: '#{version.tr('.', '-')}-stable'") - ci_yaml_content.gsub!("BRANCH_RUNNER: 'master'", "BRANCH_RUNNER: '#{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'") File.open(ci_yaml, 'w') do |post| diff --git a/lib/helpers/edit_on_gitlab.rb b/lib/helpers/edit_on_gitlab.rb index 97b4d62a..ea77df93 100644 --- a/lib/helpers/edit_on_gitlab.rb +++ b/lib/helpers/edit_on_gitlab.rb @@ -17,8 +17,8 @@ module Nanoc::Helpers gitlab_ide_url = "https://gitlab.com/-/ide/project/gitlab-org/#{product}-gitlab/edit/master/-/doc/#{docs_content_filename}" when "runner" # gitlab-runner repo - gitlab_url = "https://gitlab.com/gitlab-org/gitlab-#{product}/blob/master/docs/#{docs_content_filename}" - gitlab_ide_url = "https://gitlab.com/-/ide/project/gitlab-org/gitlab-#{product}/edit/master/-/docs/#{docs_content_filename}" + gitlab_url = "https://gitlab.com/gitlab-org/gitlab-#{product}/blob/main/docs/#{docs_content_filename}" + gitlab_ide_url = "https://gitlab.com/-/ide/project/gitlab-org/gitlab-#{product}/edit/main/-/docs/#{docs_content_filename}" when "charts" # GitLab Helm chart repo gitlab_url = "https://gitlab.com/gitlab-org/#{product}/gitlab/blob/master/doc/#{docs_content_filename}" |