1
0
mirror of https://github.com/Mailu/Mailu.git synced 2024-12-12 10:45:38 +02:00
Commit Graph

24 Commits

Author SHA1 Message Date
Dimitri Huisman
453acad21f
Initial changes for Mailu 2.0 release 2023-04-02 16:45:42 +00:00
Dimitri Huisman
b4d3d4b3c9 Preparations for 1.9 release. 2021-12-29 14:40:45 +00:00
Dimitri Huisman
f2474c968e Modified trusted authors mergify config as disccused in #1932 2021-10-25 20:10:45 +00:00
Dimitri Huisman
52005cf4e9
Update list of trusted authors.
Now the list of trusted authors reflects the contributors group again.
2021-06-29 13:57:49 +02:00
Florent Daigniere
76e5614d13 Add mergify to the list of trusted authors
The idea is to prevent backports from being stuck pending for review for
too long.
2021-02-27 10:37:59 +01:00
Dimitri Huisman
17cea83301 Completely remove step 5 where you can set the replica count for docker-stack.
Add additional warning to ´experimental' notice in setup for stack.
Add a notice the shipped PostgreSQL is deprecated.
Make the external PostgreSQL database the default option.
Make 1.7 the default version (stable_version': '1.7', in docs\conf.py)
Update mergify.yml with 1.8 version
2020-10-04 13:22:59 +00:00
Dario Ernst
957b6ac104 Revert "Remove whitespaces in newlines"
This reverts commit 6c29d232e7.
2020-09-23 15:18:23 +02:00
Dario Ernst
7e1150d9e5 Sync mergify team-member list to actualy members 2020-09-21 11:58:18 +02:00
Dario Ernst
6c29d232e7 Remove whitespaces in newlines 2020-09-21 11:57:53 +02:00
Tim Möhlmann
99b3735276
Remove ionutfilip and add micw for single review merges 2019-10-13 20:03:19 +03:00
Ionut Filip
be1873e1e8 Update docs, travis and mergify for 1.7 release 2019-08-21 14:27:39 +03:00
Tim Möhlmann
3f4c65e6d1 Make mergify shut-up when merged or closed 2019-01-24 20:17:28 +02:00
Tim Möhlmann
33db705194
Use bors-ng to create and upload test images
- Reinstate Travis deploy phase
- Better labeling of Mergify rules
- Automatic `bors try` by Mergify
- Explain bors in comment message
- Skip push for staging branch
- Re-update docs to current situation
2019-01-24 15:23:25 +02:00
Tim Möhlmann
faca9983a8
Automatic creation of review images
- Enable bors-ng for better merging
- Re-enable mergify with a fixed up syntax, it will now only issue bors commands.
- Pull request build images are now pushed to docker hub
- Automatic backport rule
- Fix build tag for branches with slash (/)
- Only push when master and 1.6 target branch
2019-01-23 18:21:48 +02:00
Tim Möhlmann
2342f64270
Delete .mergify.yml 2019-01-15 14:33:29 +02:00
Tim Möhlmann
47234786ea
Disable mergify strict mode 2019-01-02 19:12:46 +02:00
Tim Möhlmann
28daa22842
Merge pull request #726 from usrpro/update-mergify
review/need2 in mergify
2018-12-07 13:48:15 +02:00
Tim Möhlmann
8e5ccf2754
Don't merge when WIP or Blocked 2018-12-07 13:47:22 +02:00
Tim Möhlmann
626559f99b
Mergify dismiss reviews 2018-12-07 13:43:53 +02:00
Tim Möhlmann
a2a9512afa
Enable mergify strict mode
In the past we had strict mode in branch protection. This didn't really work as it broke mergify. Now mergify supports this options and takes care of the merging automatically. Let's see how it goes ;)

Reason is the recent build failures we had on master, during a busy merge day. This could have been prevented if sequential PR's where re-merging with master.

More info: https://doc.mergify.io/strict-workflow.html
2018-12-07 11:53:43 +02:00
Tim Möhlmann
fee52e87ed
Don't allow for 1 review when review/need2 label is set 2018-12-06 11:34:28 +02:00
Tim Möhlmann
b564b879aa
Update .mergify.yml
- New syntax for mergify engine v. 2
- Relax review rules for trusted users
2018-12-05 12:38:06 +02:00
kaiyou
7a7854bf3f Disable strict checking 2018-10-06 19:09:59 +02:00
kaiyou
c135b37b07 Enable mergify 2018-10-06 18:53:49 +02:00