VITAS changed the topic of #spacedock to: Problems?: https://github.com/KSP-SpaceDock/SpaceDock/issues | Matrix/Riot Chat: https://im.52k.de +spacedock:52k.de Feel free to ask for help, we only bite a little bit! | If you want to help, please check https://github.com/KSP-SpaceDock/SpaceDock-Backend/issues/5 :) | <VITAS> inet users have the attentionspan of a squirrel....oh a nut!
uovo has joined #spacedock
oeuf has quit [Ping timeout: 190 seconds]
Daz has quit [Remote host closed the connection]
Daz has joined #spacedock
<RockyTV> VITAS, matrix uploads are returning 500 server error as well
Webchat579 has joined #spacedock
Webchat579 has quit [Quit: webchat.esper.net]
HebaruSan[m] has joined #spacedock
<HebaruSan[m]> VITAS you just merged a bunch of stuff into master instead of alpha. Now the branches are inconsistent and maintenance will be harder.
<HebaruSan[m]> Everything should go to alpha first.
<DasSkelett> Oh and I wondered why #197 doesn't work...
AllisTauri[m] has joined #spacedock
<AllisTauri[m]> If I have enough rights, I can re-merge it to alpha and reset master to where it was; then force push it
aradapilot has quit [Remote host closed the connection]
<RockyTV> you should be able to
aradapilot has joined #spacedock
aradapilot has quit [Remote host closed the connection]
aradapilot has joined #spacedock
HebaruSan[m] has quit [Quit: Idle timeout reached: 10800s]
<AllisTauri[m]> Ok, I remerged PRs to `alpha`. I could reset the `master`, or could leave it as is, since it won't cause conflicts when the `alpha` will eventually be merged there.
<AllisTauri[m]> Opinions?
<RockyTV> uh I think we should wait for DasSkelett or hebarusan for their opinion
<RockyTV> also, the file size PR isn't working?
<RockyTV> either that or it wasn't triggered https://alpha.spacedock.info/mod/1/Astrogator
<DasSkelett> It's working locally on my system, so I think the GitHub <-> Server hook is not working yet
<DasSkelett> Regarding the master branch: I don't like manipulating the commit history of public branches, especially the master branch.
<DasSkelett> Either do dedicated reversion commits, or keep it now (provided that everything is working, or at least not breaking anything...)
HebaruSan[m] has joined #spacedock
<HebaruSan[m]> Yeah the restart trigger isn't working yet. Restarted manually just now
<AllisTauri[m]> I don't see anything in these PRs that could break things, so I'd also leave `master` alone this time.
HebaruSan[m] has quit [Quit: Idle timeout reached: 10800s]
<RockyTV> AllisTauri[m], I've added a comment on your pr
aradapil_ has joined #spacedock
aradapilot has quit [Read error: Connection reset by peer]
Bart[m] has joined #spacedock
<Bart[m]> Did someone spill a can of Germanaway on Vitas? 😛