22 Commits (1a41657f904552ec01a79206bfb7d387ed3c38d0)

Author SHA1 Message Date
Dimitri Huisman f2474c968e Modified trusted authors mergify config as disccused in #1932 3 years ago
Dimitri Huisman 52005cf4e9
Update list of trusted authors.
Now the list of trusted authors reflects the contributors group again.
3 years ago
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.
4 years ago
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
4 years ago
Dario Ernst 957b6ac104 Revert "Remove whitespaces in newlines"
This reverts commit 6c29d232e7.
4 years ago
Dario Ernst 7e1150d9e5 Sync mergify team-member list to actualy members 4 years ago
Dario Ernst 6c29d232e7 Remove whitespaces in newlines 4 years ago
Tim Möhlmann 99b3735276
Remove ionutfilip and add micw for single review merges 5 years ago
Ionut Filip be1873e1e8 Update docs, travis and mergify for 1.7 release 5 years ago
Tim Möhlmann 3f4c65e6d1 Make mergify shut-up when merged or closed 6 years ago
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
6 years ago
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
6 years ago
Tim Möhlmann 2342f64270
Delete .mergify.yml 6 years ago
Tim Möhlmann 47234786ea
Disable mergify strict mode 6 years ago
Tim Möhlmann 28daa22842
Merge pull request #726 from usrpro/update-mergify
review/need2 in mergify
6 years ago
Tim Möhlmann 8e5ccf2754
Don't merge when WIP or Blocked 6 years ago
Tim Möhlmann 626559f99b
Mergify dismiss reviews 6 years ago
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
6 years ago
Tim Möhlmann fee52e87ed
Don't allow for 1 review when review/need2 label is set 6 years ago
Tim Möhlmann b564b879aa
Update .mergify.yml
- New syntax for mergify engine v. 2
- Relax review rules for trusted users
6 years ago
kaiyou 7a7854bf3f Disable strict checking 6 years ago
kaiyou c135b37b07 Enable mergify 6 years ago