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." #1357 (comment) * 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 <[email protected]>
mastodon · Jan 2, 2024 · 5222920 · 5222920
1 parent ec5ea76
commit 5222920
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 17 deletions.
diff --git 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
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
@@ -11,7 +11,7 @@ <h1>{{ .Title }}</h1>
     {{ .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
@@ -11,7 +11,7 @@ <h1>{{ .Title }}</h1>
     {{ .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
@@ -35,5 +35,5 @@ <h2>
     <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>
-Original file line number
+Diff line change
@@ Expand Up / @@ -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:
@@ Expand Down @@