Merge branch 'master-to-main' into 'main'

ci: Rename master to main branch

See merge request pwithnall/malcontent!121

.gitlab-ci.yml

@@ -60,7 +60,7 @@ debian:
 pages:
   stage: deploy
   only:
-    - master
+    - main
   script:
     - mv _coverage/ public/
   artifacts:

.gitlab-ci/meson-junit-report.py

@@ -24,7 +24,7 @@ aparser.add_argument('--job-id', metavar='ID',
                      default='Unknown')
 aparser.add_argument('--branch', metavar='NAME',
                      help='Branch of the project being tested',
-                     default='master')
+                     default='main')
 aparser.add_argument('--output', metavar='FILE',
                      help='The output file, stdout by default',
                      type=argparse.FileType('w', encoding='UTF-8'),

malcontent-control/org.freedesktop.MalcontentControl.appdata.xml.in

@@ -21,7 +21,7 @@
   </description>
   <screenshots>
     <screenshot height="552" width="699" type="default">
-      <image>https://gitlab.freedesktop.org/pwithnall/malcontent/-/raw/master/malcontent-control/malcontent-control.png</image>
+      <image>https://gitlab.freedesktop.org/pwithnall/malcontent/-/raw/HEAD/malcontent-control/malcontent-control.png</image>
       <caption>Main window</caption>
     </screenshot>
   </screenshots>