aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Gareth Coles <[email protected]>2018-07-03 12:50:08 +0100
committerGravatar Gareth Coles <[email protected]>2018-07-03 12:50:08 +0100
commit7fb070f7b15f8698407107e5a6a851346ab16e0d (patch)
tree1778ef266049bba3a62127635bbae0d73d21bd6d
parentMerge branch 'momo/optimize-team-list-v2' into 'master' (diff)
[Privacy] Point out that emailing GitLab does show your email
-rw-r--r--templates/main/about/privacy.html24
1 files changed, 23 insertions, 1 deletions
diff --git a/templates/main/about/privacy.html b/templates/main/about/privacy.html
index ec446bac..b1d778c2 100644
--- a/templates/main/about/privacy.html
+++ b/templates/main/about/privacy.html
@@ -96,15 +96,30 @@
<td>Administrative staff</td>
</tr>
- <tr>
+ <tr class="thick-bottom-border">
<td>System Information</td>
<td class="uk-table-shrink">Code jam signup</td>
<td>Used to verify that you have a working environment</td>
<td>Administrative staff</td>
</tr>
+
+ <tr>
+ <td>Email Address</td>
+ <td class="uk-table-shrink">Issues emailed directly to GitLab</td>
+ <td>Used to keep track of issue submissions</td>
+ <td>GitLab staff - never stored in our database</td>
+ </tr>
</tbody>
</table>
+ <p>
+ Note that we don't ordinarily collect your email address, and your email address will never be
+ stored on our servers. The only time it will be shown is in the title of any issues you create on
+ GitLab by directly emailing us on the <code>meta@</code> email address. These issues are confidential,
+ not associated with a user account, do not require a GitLab account, and will only ever be seen by
+ staff.
+ </p>
+
<h1 class="uk-article-title hover-title" id="consent">
Collecting consent
@@ -238,6 +253,13 @@
<ul class="uk-list uk-list-divider">
<li>
+ <h4>July 3rd, 2018</h4>
+ <p>
+ While we don't collect your email addresses, they are visible on GitLab if you email an
+ issue directly to our <code>meta@</code> email address, but only to staff.
+ </p>
+ </li>
+ <li>
<h4>June 7th, 2018</h4>
<p>
We no longer collect GitHub usernames - instead, we collect GitLab usernames. Additionally,