Rename master branch to main
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
parent
1bd32b4e36
commit
73a7ef988f
@ -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
|
||||
|
@ -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)
|
||||
|
@ -49,7 +49,7 @@
|
||||
<a
|
||||
rel="external"
|
||||
hreflang="en"
|
||||
href="https://framagit.org/framasoft/mobilizon/blob/master/LICENSE"
|
||||
href="https://framagit.org/framasoft/mobilizon/blob/main/LICENSE"
|
||||
>
|
||||
{{ $t("License") }}
|
||||
</a>
|
||||
|
@ -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", () => {
|
||||
|
Loading…
Reference in New Issue
Block a user