As some of you might have noticed already, we made some major changes to the branches in our GitLab: master is now old-master stable-3.1 is now stable-old New: develop (created from stable-3.1) The master branch became unusable because some changes were there, but not in the stable branch, and vice versa. We have ported some code from master to the new develop branch, so it's included in the upcoming versions of ISPConfig (mostly translations). From today onwards, all merge requests should be made against the develop branch. If (some of) your merge requests were merged into the master branch, and the code is currently not included in the develop branch, feel free to create a MR to backport it. If you have a open merge request against the master branch, please close it and create a new one against the develop branch. Starting with 3.2, all releases are based on the develop branch.
For trivial changes like spelling errors or minor HTML issues, does the team prefer an Issue, a MR, or both, as in the MR followed by the Issue? And to be clear, are nightly builds based off of develop?
I'll leave a official statement for this to @till or @Croydon Yes, they are generated every night based on the develop branch.
I'd just create an MR. If I have a fix/addition for something that doesn't already have an issue, I only create one when I want it to show up in the "changelog" (ie. if someone were to look up the issues fixed in a release or similar).
+1, so for a typo in a translation it is usually not necessary. But issues are a better place for discussion and scheduling.
