potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

Rename master branch to main

Browse source 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2021-11-09 09:12:04 +01:00
parent 1bd32b4e36
commit 73a7ef988f
No known key found for this signature in database
GPG key ID: A061B9DDE0CA0773
4 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci.yml
View file

@ -172,7 +172,7 @@ pages:
# #- yarn run --cwd "js" styleguide:build # #- yarn run --cwd "js" styleguide:build
# #- mv js/styleguide public/frontend # #- mv js/styleguide public/frontend
rules: rules:
- if: '$CI_COMMIT_BRANCH == "master"' - if: '$CI_COMMIT_BRANCH == "main"'
artifacts: artifacts:
expire_in: 1 hour expire_in: 1 hour
paths: paths:
@ -216,14 +216,14 @@ pages:
- "privileged" - "privileged"
timeout: 3 hours timeout: 3 hours
build-docker-master: build-docker-main:
<<: *docker <<: *docker
rules: rules:
- if: '$CI_PROJECT_NAMESPACE != "framasoft"' - if: '$CI_PROJECT_NAMESPACE != "framasoft"'
when: never when: never
- if: '$CI_PIPELINE_SOURCE == "schedule"' - if: '$CI_PIPELINE_SOURCE == "schedule"'
variables: variables:
DOCKER_IMAGE_NAME: framasoft/mobilizon:master DOCKER_IMAGE_NAME: framasoft/mobilizon:main
build-docker-tag: build-docker-tag:
<<: *docker <<: *docker

6
CHANGELOG.md
View file

@ -958,7 +958,7 @@ Updated translations:
MIX_ENV=prod mix deps.clean mime --build 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)) * 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). 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 ### Added
- Possibility to participate to an event without an account (confirmation through email required) - Possibility to participate to an event without an account (confirmation through email required)

2
js/src/components/Footer.vue
View file

@ -49,7 +49,7 @@
<a <a
rel="external" rel="external"
hreflang="en" hreflang="en"
href="https://framagit.org/framasoft/mobilizon/blob/master/LICENSE" href="https://framagit.org/framasoft/mobilizon/blob/main/LICENSE"
> >
{{ $t("License") }} {{ $t("License") }}
</a> </a>

5
js/tests/e2e/specs/dashboard.js
View file

@ -12,10 +12,7 @@ describe("Homepage", () => {
cy.contains("License") cy.contains("License")
.should("have.attr", "href") .should("have.attr", "href")
.and( .and("eq", "https://framagit.org/framasoft/mobilizon/blob/main/LICENSE");
"eq",
"https://framagit.org/framasoft/mobilizon/blob/master/LICENSE"
);
}); });
it("Tries to register from the hero section", () => { it("Tries to register from the hero section", () => {