#4016 Add the possibility to rebase pull-requests that can be
Merged by pingou. Opened by pingou.
rebase  into  master

Download 4016.patch
no initial comment

I'm putting this up here for folks who may want to test it, but this isn't ready for review / to be merged, it has basically 0 tests :)

@pingou please mark the PR as WIP then. :)

@pingou please mark the PR as WIP then. :)

Meh, to be honest I don't like this as 90% of the time the PR is still marked as WIP when it gets merged, it's just ignored most of the time (for what I've seen at least)

@pingou maybe we need a "block merge when marked as WIP" thing. :)

rebased onto ff81b0999f5b25407eea520c44fa72a611fba982

This is getting ready I think, more testers welcome and let's see what jenkins thinks :)

Jenkins looks happy with it!

@pingou Can you rebase this though?

rebased onto fb03e25926ea0972b1fcbba1f9aa9cb09e23c083

rebased onto 5c9486ae9b78b223dbb1224989f75e8cbe277fae

:thumbsup:

rebased onto 8bced834a0619b2c9be06958645070c229076f5b

15 new commits added

  • Project wide black and flake8 fixes
  • Catch exception thrown by merge_pull_request
  • Fix notifications and refreshing the cached merge status upon updates
  • Small code style change to improve readability
  • Add unit-tests for the PR rebase functionality
  • Allow specifying a branch when adding content to git
  • Small wording improvement in the logs
  • Adjust the update_pull_request task so it refreshes all the information
  • Show a rebase button in the UI when needed
  • Add a new API endpoint allowing to rebase a given pull-request
  • Introduce a new status: NEEDSREBASE
  • Add a dedicated task for rebasing pull-requests
  • Add a method in pagure.lib.git to rebase pull-requests
  • Support force push for project not on repospanner
  • When doing temp clone allow specifying a path directly

Thanks for the review :)

Pull-Request has been merged by pingou

Metadata