scottk/Mailu-OIDC
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu-OIDC.git synced 2025-10-30 01:32:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update version numbers

Browse Source
This commit is contained in:
Dimitri Huisman
2024-06-09 14:56:34 +00:00
parent f5cc8163c5
commit 415c55e73b
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/multiarch.yml vendored
View File

@@ -4,7 +4,7 @@ on:
branches: branches:
- testing - testing
- staging - staging
- '2024.03' - '2024.06'
- master - master
- test-* - test-*

6
.mergify.yml
View File

@@ -35,18 +35,18 @@ pull_request_rules:
comment: comment:
message: bors r+ message: bors r+
- name: Backport to 2024.03 branch - name: Backport to 2024.06 branch
conditions: conditions:
- base=master - base=master
- label=type/backport - label=type/backport
actions: actions:
backport: backport:
branches: branches:
- '2024.03' - '2024.06'
- name: remove outdated reviews - name: remove outdated reviews
conditions: conditions:
- base~=^(master|2024.03)$ - base~=^(master|2024.06)$
actions: actions:
dismiss_reviews: dismiss_reviews:
approved: True approved: True

2
core/admin/mailu/configuration.py
View File

@@ -31,7 +31,7 @@ DEFAULT_CONFIG = {
'SQLALCHEMY_TRACK_MODIFICATIONS': False, 'SQLALCHEMY_TRACK_MODIFICATIONS': False,
# Statistics management # Statistics management
'INSTANCE_ID_PATH': '/data/instance', 'INSTANCE_ID_PATH': '/data/instance',
'STATS_ENDPOINT': '202403.{}.stats.mailu.io', 'STATS_ENDPOINT': '202406.{}.stats.mailu.io',
# Common configuration variables # Common configuration variables
'SECRET_KEY': 'changeMe', 'SECRET_KEY': 'changeMe',
'DOMAIN': 'mailu.io', 'DOMAIN': 'mailu.io',

4
docs/conf.py
View File

@@ -36,10 +36,10 @@ html_context = {
'github_user': 'mailu', 'github_user': 'mailu',
'github_repo': 'mailu', 'github_repo': 'mailu',
'github_version': version, 'github_version': version,
'stable_version': '2024.03', 'stable_version': '2024.06',
'versions': [ 'versions': [
('2.0', '/2.0/'), ('2.0', '/2.0/'),
('2024.03', '/2024.03/'), ('2024.06', '/2024.06/'),
('master', '/master/') ('master', '/master/')
], ],
'conf_py_path': '/docs/' 'conf_py_path': '/docs/'

2
docs/setup.rst
View File

@@ -32,7 +32,7 @@ Pick a Mailu version
Mailu is shipped in multiple versions. Mailu is shipped in multiple versions.
- ``2024.03`` features the most recent stable version for Mailu. This is the - ``2024.06`` features the most recent stable version for Mailu. This is the
recommended build for new setups, old setups should migrate when possible. recommended build for new setups, old setups should migrate when possible.
- ``1.0``, ``1.1``, and other version branches feature old versions of Mailu - ``1.0``, ``1.1``, and other version branches feature old versions of Mailu