Toootim / Discussion

A general forum for site wide discussion and issue reports
0 stars 0 forks source link

Hebrew translation of UI #9

Closed yair closed 7 years ago

seefood commented 7 years ago

well, we have some PRs you can include, but I see you didn't give me write permission to the repos (tried only the resources)

yair commented 7 years ago

Gave you resources write permission, but I'm afraid you'll have to walk me through what you see as the ideal workflow here, as I've never used it before. Specifically regarding the codebase, I'd like to know exactly what, when and why I'm pulling stuff into the site to minimize down time and other breakage. Wouldn't PRs from our individual forks be bestest (and am I wrong to assume that no additional permissions are needed?), or perhaps branches on the central repo (where they are)...

seefood commented 7 years ago

well, we could do it "The github way" and send you PRs from our own forks, or push new branch names and make PRs local to that one repo. wither is fine. I work in both modes and I can't say there's enough of a difference to pick sides. the only thing is of course security. if you don't trust one of us to push something directly to master where you might blindly deploy it, than either we keep at remote repos or you set masters as protected branches.

yair commented 7 years ago

Yeah, I worry about security. Not that I doubt anyone's intentions, but the thought of injecting untested code straight into production gives me the willies. And maintaining said code through the neck-break speed at which masto advances is worse. However, getting in the way while I learn the ropes seems like a major bottleneck without real benefits, so yeah, here are your perms. Do your worst >:)

seefood commented 7 years ago
yair commented 7 years ago

Oh, cool, let me see if I got this straight -- The site is on toootim/master, and only it contains all our changes. Every time master tags a commit (these are the quasi-stable ones, and what I've been using for upgrades until now), we rebase toootim/master to it and go our merry way. When we have a feature on toootim/master that we want to push upstream (RTL, HebTrans, etc.), we cherrypick it from master and PR tootsuite/mastodon. If, so, I'll think I'll start by rebasing toootim/master to the 1.2.2 release.

seefood commented 7 years ago

I did that I think, but in the future it's only for you, as the one deploying upgrades, to decide when to rebase.