Closed bcattaneo closed 3 years ago
This looks good @bcattaneo ! :+1: I think you could probably rebase, and squash those commits into one, as you're only amending your first 'cut' at the API ! :wink:
I'll test it locally to verify all is good here, and then I have good cause to poke our maintainer(s) in Gentoo to push to the new release + patches! :grinning:
Ping @bcattaneo
Ping @bcattaneo
Hi!. Was waiting for that other PR to get merged, because there were some notable changes. I'll get my hands back at this asap :)
Ping @bcattaneo
Hi!. Was waiting for that other PR to get merged, because there were some notable changes. I'll get my hands back at this asap :)
Alas I fear that could be a very long wait .. not sure where the lead dev has gone .. :disappointed:
Ping @bcattaneo
Hi!. Was waiting for that other PR to get merged, because there were some notable changes. I'll get my hands back at this asap :)
Alas I fear that could be a very long wait .. not sure where the lead dev has gone .. 😞
Not so fast! 😃 Mind testing locally one more time?
Not so fast! Mind testing locally one more time?
Fine by me here!
This branch cannot be rebased due to conflicts
This branch cannot be rebased due to conflicts
I assume the issue is that feature/bpaste_v1_api
contains a merge commit?
If so, please take a look at https://github.com/nvinson/wgetpaste/tree/bpaste_v1. With the exception of 1 typographical error fix, this branch should have the same state as feature/bpaste_v1_api and has a merge-commit-less history.
Well, doing the following should fix it:
git fetch https://github.com/zlin/wgetpaste.git
git rebase FETCH_HEAD
git push -f
Where are we at with this @nvinson @bcattaneo @Cogitri ?! :smiley:
Still conflicts so can't merge this.
@bcattaneo are you OK to revisit the 'jq' stuff now this is merged?! :smiley:
Thanks for the merge! @zlogene for ebuild bump :stuck_out_tongue:
Solves issue https://github.com/zlin/wgetpaste/issues/15 plus transitioning to JSON in order to use the v1 API (thanks to @mjeveritt suggestion).