Skip to content

Releases: smarkets/marge-bot

0.7.0

23 Jul 10:31
Compare
Choose a tag to compare
  • Feature: add --batch to better support repos with many daily MRs and slow-ish CI (#84, #116)
  • Fix: fix fuse() call when using experimental --use-merge-strategy to update source branch #102
  • Fix: Get latest CI status of a commit filtered by branch #96 (thanks to benjamb)
  • Enhancement: Check MR is mergeable before accepting MR #117

0.6.1

12 Mar 18:53
Compare
Choose a tag to compare
  • Fix when target SHA is retrieved #92.
  • Replace word "gitlab" with "GitLab" #93.

0.6.0

11 Mar 12:26
Compare
Choose a tag to compare
  • Fix issue due to a master branch being assumed when removing local branches #88.
  • Better error reporting when there are no changes left after rebasing #87.
  • Add --approval-reset-timeout option #85.
  • Fix encoding issues under Windows #86.
  • Support new merge-request status "locked" #79.
  • Fixes issue where stale branches in marge's repo could lead to conflicts #78.
  • Add experimental --use-merge-strategy flag that uses merge-commits instead of rebasing (#72, and also #90 for caveats).