From 2b97e4a02e01602f25307daa31fc422dba85603f Mon Sep 17 00:00:00 2001 From: Michael Lutz Date: Sun, 17 Jun 2018 13:45:51 +0200 Subject: Add: GDPR notice to contributing guide and a matching pull request template. Contents is adapted from the https://github.com/rsyslog/rsyslog project, which has mainly European contributors. --- CONTRIBUTING.md | 19 +++++++++++++++++++ docs/pull_request_template.md | 29 +++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 docs/pull_request_template.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ca151022b..7865a4175 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -149,6 +149,24 @@ git push **IMPORTANT**: By submitting a patch, you agree to the [License](#license). +### LEGAL GDPR NOTICE: +According to the European data protection laws (GDPR), we would like to make you aware that contributing to OpenTTD via git will permanently store the name and email address you provide as well as the actual commit and the time and date you made it inside git's version history. +This is inevitable, because it is a main feature git. If you are concerned about your privacy, we strongly recommend to use + +--author "anonymous " + +together with your commit. We reserve the right to refuse such pull requests. Also please do NOT sign your commit in this case, as that potentially could lead back to you. +Please note that if you use your real identity, the GDPR grants you the right to have this information removed later. However, we have valid reasons why we cannot remove that information later on. The reasons are: + +* this would break git history and make future merges unworkable +* the OpenTTD project has legitimate interest to keep a permanent record of the + contributor identity, once given, for + - copyright verification + - being able to provide proof should a malicious commit be made + +Please also note that your commit is public and as such will potentially be processed by many third-parties. Git's distributed nature makes it impossible to track where exactly your commit, and thus your personal data, will be stored and be processed. +If you would not like to accept this risk, please do either commit anonymously or refrain from contributing to the OpenTTD project. + ### Pull request validation Continuous integration (CI) tools monitor pull requests, and help us identify build and code quality issues. @@ -168,3 +186,4 @@ By contributing your code, you agree to license your contribution under the [GPL ### Attribution of this Contributing Guide This contributing guide is adapted from [Bootstrap](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md) under the [Creative Commons Attribution 3.0 Unported License](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE) terms for Bootstrap documentation. +The GDPR notice is adapted from [rsyslog](https://github.com/rsyslog/rsyslog/blob/master/CONTRIBUTING.md) under the [GNU General Public License] (https://github.com/rsyslog/rsyslog/blob/master/COPYING). diff --git a/docs/pull_request_template.md b/docs/pull_request_template.md new file mode 100644 index 000000000..c91a41744 --- /dev/null +++ b/docs/pull_request_template.md @@ -0,0 +1,29 @@ + -- 2.17.0