[gnome-control-center/main] Switch to 'main' everywhere
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/main] Switch to 'main' everywhere
- Date: Tue, 26 Apr 2022 17:43:30 +0000 (UTC)
commit bbe3ae4a91daccefa5e9b7380752421e0b6c21b4
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Tue Apr 26 14:43:01 2022 -0300
Switch to 'main' everywhere
.gitlab-ci.yml | 8 ++++----
.gitlab/issue_templates/Bug.md | 2 +-
.gitlab/issue_templates/Feature.md | 2 +-
README.md | 8 ++++----
docs/CONTRIBUTING.md | 2 +-
docs/MAINTAINERS.md | 4 ++--
panels/applications/cc-applications-panel.c | 2 +-
7 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab1efa6eb..492607fd0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -247,7 +247,7 @@ coverage:
BUILD_OPTS: "-Db_coverage=true"
coverage: '/^Lines:.\d+.\d+.(\d+\.\d+\%)/'
only:
- - master@GNOME/gnome-control-center
+ - main@GNOME/gnome-control-center
script:
- *environment_information
@@ -287,7 +287,7 @@ pages:
paths:
- public
only:
- - master@GNOME/gnome-control-center
+ - main@GNOME/gnome-control-center
except:
variables:
@@ -301,7 +301,7 @@ pages:
##
flatpak:
stage: manual
- image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
+ image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:main
artifacts:
name: package
paths:
@@ -353,7 +353,7 @@ flatpak:
except:
- tags
- gnome-3-.*
- - master@GNOME/gnome-control-center
+ - main@GNOME/gnome-control-center
# Runs the sanitizers [address, thread, undefined, and memory].
diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
index 1a3b131a2..db3fed882 100644
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -4,7 +4,7 @@ Not following the communication guidelines [1] will mean your issue or comment
will be removed. Read it carefully before submitting this issue.
-[1]
https://gitlab.gnome.org/GNOME/gnome-control-center/blob/master/docs/CONTRIBUTING.md#communication-guideline
+[1]
https://gitlab.gnome.org/GNOME/gnome-control-center/blob/main/docs/CONTRIBUTING.md#communication-guideline
-->
diff --git a/.gitlab/issue_templates/Feature.md b/.gitlab/issue_templates/Feature.md
index 9959b0dad..cfa65b89f 100644
--- a/.gitlab/issue_templates/Feature.md
+++ b/.gitlab/issue_templates/Feature.md
@@ -4,7 +4,7 @@ Not following the communication guidelines [1] will mean your issue or comment
will be removed. Read it carefully before submitting this issue.
-[1]
https://gitlab.gnome.org/GNOME/gnome-control-center/blob/master/docs/CONTRIBUTING.md#communication-guideline
+[1]
https://gitlab.gnome.org/GNOME/gnome-control-center/blob/main/docs/CONTRIBUTING.md#communication-guideline
-->
diff --git a/README.md b/README.md
index 4ab886812..85fb72c3e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-[![Build
Status](https://gitlab.gnome.org/GNOME/gnome-control-center/badges/master/pipeline.svg)](https://gitlab.gnome.org/GNOME/gnome-control-center/pipelines)
-[![Coverage
report](https://gitlab.gnome.org/GNOME/gnome-control-center/badges/master/coverage.svg)](https://gnome.pages.gitlab.gnome.org/gnome-control-center/)
-[![License](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://gitlab.gnome.org/GNOME/gnome-control-center/blob/master/COPYING)
+[![Build
Status](https://gitlab.gnome.org/GNOME/gnome-control-center/badges/main/pipeline.svg)](https://gitlab.gnome.org/GNOME/gnome-control-center/pipelines)
+[![Coverage
report](https://gitlab.gnome.org/GNOME/gnome-control-center/badges/main/coverage.svg)](https://gnome.pages.gitlab.gnome.org/gnome-control-center/)
+[![License](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://gitlab.gnome.org/GNOME/gnome-control-center/blob/main/COPYING)
GNOME Settings
====================
@@ -60,4 +60,4 @@ Note that GNOME Settings Flatpak will only work if you are running
the latest GNOME version in your host system.
-[communication-guidelines]:
https://gitlab.gnome.org/GNOME/gnome-control-center/blob/master/docs/CONTRIBUTING.md#communication-guidelines
+[communication-guidelines]:
https://gitlab.gnome.org/GNOME/gnome-control-center/blob/main/docs/CONTRIBUTING.md#communication-guidelines
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index 01e0462be..89fdd9065 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -209,4 +209,4 @@ available at [http://contributor-covenant.org/version/1/4][version]
[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
-[maintainers]: https://gitlab.gnome.org/GNOME/gnome-control-center/blob/master/docs/MAINTAINERS.md
+[maintainers]: https://gitlab.gnome.org/GNOME/gnome-control-center/blob/main/docs/MAINTAINERS.md
diff --git a/docs/MAINTAINERS.md b/docs/MAINTAINERS.md
index cdcdf5f1d..67fe47059 100644
--- a/docs/MAINTAINERS.md
+++ b/docs/MAINTAINERS.md
@@ -50,7 +50,7 @@ by being explicit. Suggested acceptance phrase:
Urgency commits should never happen, but in case they're needed, they are defined by the following
criteria:
- * On stable branches (or master right after a stable release)
+ * On stable branches (or `main` right after a stable release)
* Symptoms:
* Always OR often reproducible; AND
* Crash; OR
@@ -59,4 +59,4 @@ criteria:
* Quickly followed by an emergency release (at most 2 days after the commit)
-[doap]: https://gitlab.gnome.org/GNOME/gnome-control-center/blob/master/gnome-control-center.doap
+[doap]: https://gitlab.gnome.org/GNOME/gnome-control-center/blob/main/gnome-control-center.doap
diff --git a/panels/applications/cc-applications-panel.c b/panels/applications/cc-applications-panel.c
index 69cda412d..6b1e3935d 100644
--- a/panels/applications/cc-applications-panel.c
+++ b/panels/applications/cc-applications-panel.c
@@ -541,7 +541,7 @@ set_shortcuts_allowed (CcApplicationsPanel *self,
/* "GRANTED" and "DENIED" here match the values set by the "inhibit shortcut
* dialog" is GNOME Shell:
- * https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/master/js/ui/inhibitShortcutsDialog.js
+ * https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/inhibitShortcutsDialog.js
*/
perms[0] = granted ? "GRANTED" : "DENIED";
perms[1] = NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]