From 5222920fe62a71c7d2e9ef0c3818fe6936c7160b Mon Sep 17 00:00:00 2001
From: aaaaalbert <aaaaalbert@users.noreply.github.com>
Date: Tue, 2 Jan 2024 10:45:25 +0000
Subject: [PATCH] Rename default branch to main (#1373)

* Remove GitLab CI configuration

As noted by @renchap, "We do not rely on Gitlab CI anymore, this
can be dropped."

https://github.com/mastodon/documentation/issues/1357#issuecomment-1851642299

* Fix #1357, Use new default branch name "main"

This requires changes in
* the GitHub Pages deployment config
* a few HTML page templates, where the default branch name is
  included in links to the repo (stylized as "Improve this page"
  in the English version of the live docs webpage)

---------

Co-authored-by: albert <albert.rafetseder+gitlab@univie.ac.at>
---
 .github/workflows/deploy.yml |  2 +-
 .gitlab-ci.yml               | 13 -------------
 layouts/_default/single.html |  2 +-
 layouts/index.html           |  2 +-
 layouts/partials/footer.html |  2 +-
 5 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 .gitlab-ci.yml

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index e5df6c88..6e1e26c1 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -3,7 +3,7 @@ name: Deploy on Github Pages
 on:
   push:
     branches:
-      - master
+      - main
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 15c7adb1..00000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-image: monachus/hugo:latest
-
-variables:
-  GIT_SUBMODULE_STRATEGY: recursive
-
-pages:
-  script:
-    - hugo
-  artifacts:
-    paths:
-      - public
-  only:
-    - master
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index a9e2ecd5..13a6ff67 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -11,7 +11,7 @@
     {{ .Content }}
 
     <p style="color: #687590;">
-      {{ i18n "lastUpdated" }} {{ .Lastmod.Format "January 2, 2006" }}{{ with .File }} · <a href='https://github.com/mastodon/documentation/tree/master/content/{{ .Lang }}/{{ .Path }}' style="color: #687590;">{{ i18n "improvePage" }}{{ end }}</a>
+      {{ i18n "lastUpdated" }} {{ .Lastmod.Format "January 2, 2006" }}{{ with .File }} · <a href='https://github.com/mastodon/documentation/tree/main/content/{{ .Lang }}/{{ .Path }}' style="color: #687590;">{{ i18n "improvePage" }}{{ end }}</a>
 
       {{ if .IsTranslated }}
         <br />
diff --git a/layouts/index.html b/layouts/index.html
index 87feefa8..9e037302 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -11,7 +11,7 @@
     {{ .Content }}
 
     <p style="color: #687590;">
-      {{ i18n "lastUpdated" }} {{ i18n "lastUpdatedDateFormat"  .Lastmod }}{{ with .File }} · <a href='https://github.com/mastodon/documentation/tree/master/content/{{ .Lang }}/{{ .Path }}' style="color: #687590;">{{ i18n "improvePage" }}{{ end }}</a>
+      {{ i18n "lastUpdated" }} {{ i18n "lastUpdatedDateFormat"  .Lastmod }}{{ with .File }} · <a href='https://github.com/mastodon/documentation/tree/main/content/{{ .Lang }}/{{ .Path }}' style="color: #687590;">{{ i18n "improvePage" }}{{ end }}</a>
 
       {{ if .IsTranslated }}
         <br />
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 09f2c276..56bccdc5 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -35,5 +35,5 @@
     <a href='https://joinmastodon.org'>{{ i18n "joinMastodon" }}</a> · <a href='https://blog.joinmastodon.org'>{{ i18n "blog" }}</a> · <a href='https://mastodon.social/@Mastodon' target='_blank'><i class='fab fa-mastodon'></i></a>
   </p>
 
-  <p class="legal">{{ with .File }}<a href='https://github.com/mastodon/documentation/tree/master/content/{{ .Lang }}/{{ .File.Path }}'>{{ i18n "viewSource" }}</a> · {{ end }}<a href='https://creativecommons.org/licenses/by-sa/4.0/'>CC BY-SA 4.0</a> · <a href='https://joinmastodon.org/imprint'>{{ i18n "imprint" }}</a></p>
+  <p class="legal">{{ with .File }}<a href='https://github.com/mastodon/documentation/tree/main/content/{{ .Lang }}/{{ .File.Path }}'>{{ i18n "viewSource" }}</a> · {{ end }}<a href='https://creativecommons.org/licenses/by-sa/4.0/'>CC BY-SA 4.0</a> · <a href='https://joinmastodon.org/imprint'>{{ i18n "imprint" }}</a></p>
 </footer>