* Merge: Author and committer from request
* Squash: Author from request, committer from session
* Rebase: Rebase from original commit, committer from session
* Fast-forward: No changes, author and committer from tip
These are the four stratagies available for a merge. Each of them has a different requirement regarding who is seen as an author and who as a committer.
* Merge: Author and committer from request
* Squash: Author from request, committer from session
* Rebase: Rebase from original commit, committer from session
* Fast-forward: No changes, author and committer from tip
These are the four stratagies available for a merge. Each of them has a different requirement regarding who is seen as an author and who as a committer.
Tasks.documentation.javadoc threw around 50 errors due to multiple inconsistencies within the javadoc comments.
Furthermore, the option 'failOnError' is now set to 'true' so that future Javadoc errors in our codebase are avoided.
Squash commits of branch feature/repository-type-configuration:
- Refactor hg configuration form
- Add support of description text for checkbox and input fields
- Refactor git configuration form
- Refactor svn configuration form
- Add aria-describedby for checkbox and input fields
- Change hgBinary can also be null
- Fix naming of test
- Fix spelling
- Change logic of successfull notification to only be shown if the config rest api returns without an error
Reviewed-by: Philipp Ahrendt <philipp.ahrendt@cloudogu.com>, Till-André Diegeler <till-andre.diegeler@cloudogu.com>
Reviewed-by: Philipp Ahrendt <philipp.ahrendt@cloudogu.com>
The review plugin does not explicitly check, if the
branch provider is supported in events. It only checks,
whether the repository supports branches per se.
Therefor, if a tag is created from the ui, an internal server
error is thrown. We prevent this by implementing a
simple branch provider here, too.
The line `allowfilter = true` is inserted both in new Git repositories
and existing ones (via an UpdateStep). This enables clones with
`--filter` parameters.
Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com>
