From 73a7ef988ff3413992613aeb05e5724f7ac1810b Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 9 Nov 2021 09:12:04 +0100 Subject: [PATCH] Rename master branch to main Signed-off-by: Thomas Citharel --- .gitlab-ci.yml | 6 +++--- CHANGELOG.md | 6 +++--- js/src/components/Footer.vue | 2 +- js/tests/e2e/specs/dashboard.js | 5 +---- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ee35a2653..69c865a65 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -172,7 +172,7 @@ pages: # #- yarn run --cwd "js" styleguide:build # #- mv js/styleguide public/frontend rules: - - if: '$CI_COMMIT_BRANCH == "master"' + - if: '$CI_COMMIT_BRANCH == "main"' artifacts: expire_in: 1 hour paths: @@ -216,14 +216,14 @@ pages: - "privileged" timeout: 3 hours -build-docker-master: +build-docker-main: <<: *docker rules: - if: '$CI_PROJECT_NAMESPACE != "framasoft"' when: never - if: '$CI_PIPELINE_SOURCE == "schedule"' variables: - DOCKER_IMAGE_NAME: framasoft/mobilizon:master + DOCKER_IMAGE_NAME: framasoft/mobilizon:main build-docker-tag: <<: *docker diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f140c231..760bcdd51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -958,7 +958,7 @@ Updated translations: MIX_ENV=prod mix deps.clean mime --build ``` -* The [nginx configuration](https://framagit.org/framasoft/mobilizon/-/blob/master/support/nginx/mobilizon.conf) has been changed with improvements and support for custom error pages. +* The [nginx configuration](https://framagit.org/framasoft/mobilizon/-/blob/main/support/nginx/mobilizon.conf) has been changed with improvements and support for custom error pages. * The cmake dependency has been added (see [our documentation](https://docs.joinmobilizon.org/administration/dependencies/#basic-tools)) @@ -999,9 +999,9 @@ Config has moved from `.env` files to a more traditional way to handle things in To migrate existing configuration, you can simply run `mix mobilizon.instance gen` and fill in the adequate values previously in `.env` files (you don't need to perform the operations to create the database). -A minimal file template [is available](https://framagit.org/framasoft/mobilizon/blob/master/priv/templates/config.template.eex) to check for missing configuration. +A minimal file template [is available](https://framagit.org/framasoft/mobilizon/blob/main/priv/templates/config.template.eex) to check for missing configuration. -Also make sure to remove the `EnvironmentFile=` line from the systemd service and set `Environment=MIX_ENV=prod` instead. See [the updated file](https://framagit.org/framasoft/mobilizon/blob/master/support/systemd/mobilizon.service). +Also make sure to remove the `EnvironmentFile=` line from the systemd service and set `Environment=MIX_ENV=prod` instead. See [the updated file](https://framagit.org/framasoft/mobilizon/blob/main/support/systemd/mobilizon.service). ### Added - Possibility to participate to an event without an account (confirmation through email required) diff --git a/js/src/components/Footer.vue b/js/src/components/Footer.vue index d4c99d937..5c1a18a9a 100644 --- a/js/src/components/Footer.vue +++ b/js/src/components/Footer.vue @@ -49,7 +49,7 @@ {{ $t("License") }} diff --git a/js/tests/e2e/specs/dashboard.js b/js/tests/e2e/specs/dashboard.js index 23c325c02..47106fcfd 100644 --- a/js/tests/e2e/specs/dashboard.js +++ b/js/tests/e2e/specs/dashboard.js @@ -12,10 +12,7 @@ describe("Homepage", () => { cy.contains("License") .should("have.attr", "href") - .and( - "eq", - "https://framagit.org/framasoft/mobilizon/blob/master/LICENSE" - ); + .and("eq", "https://framagit.org/framasoft/mobilizon/blob/main/LICENSE"); }); it("Tries to register from the hero section", () => {