Skip to content
Snippets Groups Projects
Commit c25d1b93 authored by Christian Krippes's avatar Christian Krippes :construction:
Browse files

Merge branch 'language_check'

# Conflicts:
#	en/Help.md
#	en/Information.md
parents 4969624b 7f97c135
No related branches found
No related tags found
1 merge request!1Überarbeitung der englischen Fassung
# Information on data protection
*Please note that this text is a translation that cannot replace the legally binding German version, ["Informationen zum Datenschutz"](https://gitlab.test.uni-giessen.de/jlugitlab/support/-/blob/master/de/Datenschutzerklärung.md)*
*Please note that this text is a translation only, which cannot replace the legally binding German version, ["Informationen zum Datenschutz"](https://gitlab.test.uni-giessen.de/jlugitlab/support/-/blob/master/de/Datenschutzerklärung.md)*
Justus Liebig University processes your personal data to create user access to the JLU GitLab system and to receive e-mail notifications from the system.
The legal basis is Art. 6 para. 1 a) of the European General Data Protection Regulation (EU-GDPR) in conjunction with your consent.
The legal basis is Art. 6 para. 1 a) of the European General Data Protection Regulation (EU-GDPR) in combination with your consent.
Your data may be disclosed to those employees of Justus Liebig University who need it to perform their duties.
Your data will be processed for as long as necessary to fulfill the above-mentioned purposes, at the longest until the end of your occupation at the university.
Your data will be processed for as long as is necessary to fulfill the above-mentioned purposes, at the longest until the end of your occupation at the university.
You are entitled at any time to obtain information about your data and to have inaccurate data rectified or their processing restricted (Art. 15, 16 and 18 EU-GDPR).
You are entitled to obtain information about your data and to have inaccurate data rectified or their processing restricted (Art. 15, 16 and 18 EU-GDPR) at any time.
If you consider data processing to be unlawful, you can lodge a complaint with the Hessian Data Protection Commissioner (Art. 77 EU-GDPR, § 55 of the Hessian Data Protection and Freedom of Information Act).
In addition, you are entitled to revoke your consent to data processing and obtain the erasure of your data, whereby the data processing carried out up to that point remains lawful (Art. 7 (3) and Art. 17 EU-GDPR).
In addition, you are entitled to revoke your consent to data processing and you have the right to obtain the erasure of your data, whereby the data processing carried out up to that point remains lawful (Art. 7 (3) and Art. 17 EU-GDPR).
You may also request to have your data transmitted in portable form or to have it transmitted to another person responsible (Art. 20 EU-GDPR).
Responsible for data processing is the Justus Liebig University Giessen, Ludwigstrasse 23, 38390 Giessen, represented by its president.
Responsible for data processing is Justus Liebig University Giessen, Ludwigstrasse 23, 38390 Giessen, represented by its president.
Data protection officers are:
Dr. Robert Pfeffer
......
This diff is collapsed.
......@@ -10,23 +10,23 @@ GitLab is a versatile tool for the management of projects that involve file edit
At the core of each GitLab project is a [Git repository](https://en.wikipedia.org/wiki/Git) that keeps versions of the edited files.
For each project, GitLab also provides a wiki, an issue tracker, and much more.
JLU GitLab is accessible with a web browser at [https://gitlab.test.uni-giessen.de](https://gitlab.test.uni-giessen.de) and is hosted on systems of the [Justus Liebig University (JLU) Giessen](https://www.uni-giessen.de/fbz/svc/hrz).
The deployed GitLab Community Edition is licensed as free software, so JLU GitLab is technically and legally independent from [GitLab.com](https://gitlab.com).
JLU GitLab is accessible through a web browser at [https://gitlab.test.uni-giessen.de](https://gitlab.test.uni-giessen.de) and is hosted on systems of [Justus Liebig University (JLU) Giessen](https://www.uni-giessen.de/fbz/svc/hrz).
The GitLab Community Edition operated is licensed as free software, so JLU GitLab is technically and legally independent from [GitLab.com](https://gitlab.com).
JLU GitLab is maintained by a [team of voluntary employees](#who-is-maintaining-jlu-gitlab).
## Use cases
* In [Good enough practices in scientific computing von G. Wilseon et. al. (2017)](http://journals.plos.org/ploscompbiol/article?id=10.1371/journal.pcbi.1005510) reasons and how to use tools for versioning scientific software and programming code are shown.
* In [Good enough practices in scientific computing von G. Wilseon et. al. (2017)](http://journals.plos.org/ploscompbiol/article?id=10.1371/journal.pcbi.1005510) reasons for and how to use tools for versioning scientific software and programming code are outlined.
* TODO: Add more: lab management, writing and publishing, ...
## No storage of research data
JLU GitLab is currently not suited to store research data.
Such use is explicitly advised against.
We explicitly advice against using it that way.
For storage of research data, the JLU provides the [JLUbox](https://www.uni-giessen.de/fbz/svc/hrz/svc/daten/jlubox) as well as [network drives](https://www.uni-giessen.de/fbz/svc/hrz/svc/daten/san/index_html).
For questions regarding management of research data, you find further help at [this FAQ](https://www.uni-giessen.de/ub/digitales-publizieren/fdm/faq/) or write an email to [forschungsdaten@uni-giessen.de](mailto:forschungsdaten@uni-giessen.de).
To store research data, JLU provides [JLUbox](https://www.uni-giessen.de/fbz/svc/hrz/svc/daten/jlubox) as well as [network drives](https://www.uni-giessen.de/fbz/svc/hrz/svc/daten/san/index_html).
For questions regarding research data management, you can find further information at [this FAQ](https://www.uni-giessen.de/ub/digitales-publizieren/fdm/faq/) or write an email to [forschungsdaten@uni-giessen.de](mailto:forschungsdaten@uni-giessen.de).
## Who can access JLU GitLab?
......@@ -51,7 +51,7 @@ You can find information on the practical use of JLU GitLab at [help on use](Hel
## Account termination
Accounts on JLU GitLab may be terminated in multiple ways:
JLU GitLab accounts may be terminated in multiple ways:
- Users may voluntarily delete their account at any time.
If you want to delete your account, please [follow these steps](Help.md#how-to-delete-my-account).
......@@ -64,21 +64,21 @@ Below you find an [overview what data will also be deleted](#what-happens-to-my-
### What happens when I leave JLU?
Once you leave the university (e.g. end of contract, exmatriculation), your [JLU account will become invalid](#what-happens-if-my-jlu-account-becomes-invalid) within a few weeks.
The [IT service centre](https://www.uni-giessen.de/fbz/svc/hrz) is responsible for this procedure; please contact them if you have questions.
The [IT service centre](https://www.uni-giessen.de/fbz/svc/hrz) is responsible for this procedure; please contact them if you have any questions.
### What happens if my JLU account becomes invalid?
If your g-, s-, or n- account becomes invalid, your account on JLU GitLab will become blocked automatically within 24 hours.
If your account is blocked, you will not be able to log in to JLU GitLab.
After your account has been blocked for 6 months, it will be deleted, see below.
If your g-, s-, or n- account becomes invalid, your account on JLU GitLab will automatically become blocked within 24 hours.
If your account is blocked, you will not be able to log into JLU GitLab.
After your account has been blocked for 6 months, it will be deleted (see below).
### What happens to my data when my account is deleted?
How much of your data will be deleted depends on how you used JLU GitLab.
Your account data and personal projects will be deleted (including contained Git repositories).
How much of your data will be deleted depends on how you have used JLU GitLab.
Your account data and personal projects will be deleted (including Git repositories).
If you contributed to projects of groups or other users, the association to your account will be removed, but the content will continue to be available to the remaining members.
Your commits to Git repositories of groups or other users (including wikis) will remain unchanged.
If you contributed to projects by groups or other users, the connection to your account will be removed. But the contents will not be deleted and continue to be available to the remaining members.
Your commits in Git repositories by groups or other users (including wikis) will remain unchanged.
#### Deletion of abandoned groups and their projects
......@@ -86,40 +86,40 @@ Once the last member of a group gets deleted, the group is considered abandoned,
<!-- NOTE, JK: Commented out because it seemed too detailed, but may clarify reasoning.
#### More precise details
To explain more details, the following explanation relies on some [important concepts of Git and GitLab](Help.md#important-concepts).
To explain in more detail, the following explanation relies on some [important concepts of Git and GitLab](Help.md#important-concepts).
Once your account is deleted, also all data from your user profile will be deleted, along with all your own projects in your *namespace*.
Once your account is deleted, also all data from your user profile will be deleted, along with all your projects within your *namespace*.
Note that these projects will be deleted unconditionally, even if they have other project members.
You may take some [last steps](Help.md#last-steps) to avoid possible disruptions.
You may want to take some [last steps](Help.md#last-steps) to avoid possible problems.
Data that you contributed to other projects (in namespaces of other users or groups) will not be deleted ([unless a group becomes abandoned](#deletion-of-abandoned-groups-and-their-projects)).
Data that you contributed to other projects (within namespaces of other users or groups) will not be deleted ([unless a group becomes abandoned](#deletion-of-abandoned-groups-and-their-projects)).
Instead, your contributions will be anonymized as much as is technically possible and acceptable for the remaining members.
This prevents disruption of the remaining members, whose work builds upon your contributions.
This prevents trouble for the remaining members, whose work builds upon your own contributions.
For example, the content of your comments in issue trackers of other projects will remain visible, just without a link to your deleted account.
Instead, your comments will appear to be written by a *Ghost* account, which is a placeholder account to manage such anonymized data.
An important exception are your Git *commits* in *repositories* of other projects: They will neither be deleted nor anonymized.
Instead, all information that were used to create the commit will remain as they were; they cannot be altered or deleted without causing disruption for the remaining members.
Also note that your commit data are probably not only saved on JLU GitLab but also on the devices of fellow members, because the Git commands *push* and *pull* can synchronize the entire repository across devices.
JLU GitLab will not (and neither can) delete data from other user's devices.
Importantly, commits may include your real name and email address, depending on the settings of your own device and JLU GitLab.
You can read about [settings concerning your private information](Help.md#settings-concerning-private-information) how to set them up according to your preferences.
Another important exception are your Git *commits* in *repositories* of other projects: They will neither be deleted nor anonymized.
Instead, all information used to create the commit will remain as it were; it cannot be altered or deleted without causing disruption for the remaining members.
Also note that your commit data is probably not only saved on JLU GitLab but also on the devices of fellow members, because the Git commands *push* and *pull* can synchronize the entire repository across devices.
JLU GitLab will not (and neither can) delete data from other users' devices.
It is important to note that commits may include your real name and email address, depending on the settings of your own devices and JLU GitLab.
You can read the [settings concerning your private information](Help.md#settings-concerning-private-information) to set them up according to your preferences.
-->
## Who is maintaining JLU GitLab?
JLU GitLab is maintained by a team consisting of volunteers from the faculties and the [university library](https://www.uni-giessen.de/ub/en/), in accordance with the [Guidelines for the IT-system administration at the JLU Giessen (in German)](https://www.uni-giessen.de/fbz/mug/2/pdf/2_26_30_4).
We work in consultation with the [JLU-internal IKM work group](https://www.uni-giessen.de/org/cio/cio/ikm-ag), and for service operations we exclusively use infrastructure of the [IT service centre](https://www.uni-giessen.de/fbz/svc/hrz).
We are working in consultation with the [JLU-internal IKM work group](https://www.uni-giessen.de/org/cio/cio/ikm-ag), and we exclusively use infrastructure of the [IT service centre](https://www.uni-giessen.de/fbz/svc/hrz) to run JLU GitLab.
We are always looking for more volunteers who want to join our efforts.
Feel free to contact us if you want to know more about our our way of working and decision process.
Feel free to contact us if you want to know more about our way of working and our decision process.
You can contact us in various ways, see the [contact information](#contact).
## The goals of JLU GitLab
JLU GitLab first serves to assess demands across the JLU and for evaluation of its features in a research context.
We believe that currently, Git and GitLab provide the best tools to manage and document the software for our research.
JLU GitLab first serves to assess demands across JLU and to evaluate its features in a research context.
We believe that currently, Git and GitLab provide the best tools to manage the software for our research projects and to document them.
Only a locally installed, freely licensed platform like GitLab can ensure our long-term control over its implementation and administration.
<!-- NOTE: Delete, or move to data section and clarify?
Within this context it seems noteworthy that the documentation and software necessary for the understanding of research data are themselves regarded as research data by [JLU's guideline on research data](https://www.uni-giessen.de/mug/5/pdf/forschung/5_00_00_1).
......@@ -137,8 +137,8 @@ We would like to...
For questions regarding help and support, please write an email to our support mailing list, [gitlab-help@lists.uni-giessen.de](mailto:gitlab-help@lists.uni-giessen.de).
For anything else, can contact the [team of maintainers](#maintainers) at our internal mailing list at [gitlab-admin@lists.uni-giessen.de](mailto:gitlab-admin@lists.uni-giessen.de).
For anything else, you can contact the [team of maintainers](#maintainers) at our internal mailing list at [gitlab-admin@lists.uni-giessen.de](mailto:gitlab-admin@lists.uni-giessen.de).
If you want to get receive news about JLU GitLab, you can subscribe to the mailing list [gitlab-news@lists.uni-giessen.de](mailto:gitlab-news@lists.uni-giessen.de).
If you want to receive news about JLU GitLab, you can subscribe to the mailing list [gitlab-news@lists.uni-giessen.de](mailto:gitlab-news@lists.uni-giessen.de).
You can also follow the [protocols of the IKM work group](https://www.uni-giessen.de/org/cio/cio/ikm-ag) (only accessible internally, in German).
......@@ -3,7 +3,7 @@
*Effective 04/28/2020*
*Please note that this text is a translation that cannot replace the legally binding German version, ["Nutzungsbedingungen für JLU GitLab"](https://gitlab.test.uni-giessen.de/jlugitlab/support/-/blob/master/de/Nutzungsbedingungen.md)*
The following terms and conditions apply to the use of JLU GitLab in addition to the [usage regulations of the IT Service Centre (ISC)](https://www.uni-giessen.de/mug/2/pdf/2_32_01_2/) of the Justus Liebig University Giessen (JLU).
The following terms and conditions apply to the use of JLU GitLab in addition to the [usage regulations of the IT Service Centre (ISC)](https://www.uni-giessen.de/mug/2/pdf/2_32_01_2/) of Justus Liebig University Giessen (JLU).
When logging on to JLU GitLab for the first time, the current version of the Terms of Use for JLU GitLab and the ISC's usage regulations must be read and accepted.
## The Operators
......@@ -14,20 +14,20 @@ The operators can be reached via an e-mail list.
## Range of functions and eligible users
JLU GitLab is a web service for managing files versioned with the Git software (in so-called "Git repositories").
The service is available to members and associates of JLU with a valid g- or s-account (from here referred to as "users").
The service is available to members and associates of JLU with a valid g- or s-account (from here on referred to as "users").
In JLU GitLab, each user has access to so-called projects, each of which may contain a Git repository and other data (e.g. in the ticket system).
Users can exchange project data between JLU GitLab and their devices via web browser.
For synchronizing Git repositories between devices and JLU GitLab, the Git software is available for various operating systems.
In addition to the user's own namespace, user groups can also be created that provide separate namespaces for projects.
For collaborative work, projects can be made accessible in various degrees of read and write access.
In addition to the users' own namespaces, user groups providing separate namespaces for projects can also be created.
For collaborative work, projects can be made accessible in various levels of access rights (such as read-only and write access).
The operators may restrict or terminate access to JLU GitLab at any time for technical or organizational reasons; there is no entitlement to access the system.
If foreseeable, the operators pledge to inform the users about this in advance and in good time.
The operators may restrict or terminate access to JLU GitLab at any time due to technical or organizational reasons; there is no entitlement to access this system.
If foreseeable, the operators pledge to inform the users about this well in advance.
## Storage space
As a rule, 50 projects with up to 1 GB memory each are available to all users.
As a rule, 50 projects containing up to 1 GB memory each are available to all users.
## Private use
......@@ -39,25 +39,25 @@ It is expressly prohibited to use JLU GitLab to monitor the behavior or performa
## Data Security
Communication between the user's devices and JLU GitLab is encrypted.
Communication between the users' devices and JLU GitLab is encrypted.
The data is stored unencrypted on access-restricted storage systems of the ISC.
A backup of the data is created at regular intervals on access-restricted systems of the ISC.
JLU GitLab is suitable for storing data with normal protection requirements.
A data backup is created at regular intervals on access-restricted systems of the ISC.
JLU GitLab is suitable for storing data in need of regular data protection.
## Responsibility for content
The respective users with ownership rights (highest possible user role) in a project or user group are solely responsible for the conformity of the contents of the stored data with legal regulations, even if they originate from other users.
The respective users with ownership rights (highest possible user role) within a project or user group are solely responsible for the conformity of the contents of the stored data with legal regulations, even if they originate from other users.
In particular, it must be ensured that no laws listed in §5 of the ISC's usage regulations are violated.
Users undertake not to make data available to unauthorized persons.
Users with ownership rights in a project or user group are recommended to check their data contents regularly.
The operators and the JLU do not assume any responsibility for any misuse.
Users oblige not to make data available to unauthorized persons.
Users with ownership rights within a project or a user group are recommended to check their data contents regularly.
The operators and JLU do not assume any responsibility for any misuse.
## Deletion of user account and data
Once the personal g- or s-account is no longer valid, the access authorization for JLU GitLab expires.
The data assigned to a user will be retained for a period of 6 months after expiry of the access authorization.
After this period, the user account and all projects in the user's own namespace will be deleted.
At the same time, the direct personal reference of further personal data in the form of contributions (e.g. issues, comments, merge requests) to external projects in other namespaces will be removed.
The data assigned to a user will be retained for a period of 6 months after the access authorization has expired.
After this period, the user account and all projects within the user's own namespace will be deleted.
At the same time, the direct personal reference of further personal data in the form of contributions (e.g. issues, comments, merge requests) to external projects within other namespaces will be removed.
Contributions to Git repositories remain unchanged.
## Reservation to change these terms of use
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment