Merge remote-tracking branch 'upstream/develop'

.gitlab-ci.yml

@@ -109,7 +109,7 @@ build:pages:
     - |
       echo "Configuration: " && cat ".ci/_config_$CI_COMMIT_REF_NAME.yml"
     # Run Jekyll with custom configuration
-    - LOGFILE=/dev/stdout ./add-timestamp-to-howtocard.sh external
+    - LOGFILE=/dev/stdout .ci/add-timestamp-to-howtocard.sh external
     - bundle exec jekyll build -d build --config "_config.yml,.ci/_config_$CI_COMMIT_REF_NAME.yml"
 
 # check

external/contribute/supersede/supersede.md

+---
+layout: page
+permalink: /external/contribute/supersede/
+shortcut: contribute:supersede
+redirect_from:
+  - /cards/contribute:supersede
+  - /external/cards/contribute:supersede
+  - /contribute/supersede
+  - /external/external/contribute/supersede/
+---
+
+# Take over a stale merge request
+
+In some cases, it might be useful to move the Merge Request of a branch opened by someone else to your own fork.
+
+1. Open *Visual Studio Code*.
+2. Select the ***develop*** branch and synchronize it.
+3. In ***Terminal***, click on ***New Terminal***.
+
+<div align="center">
+<img src="img/img1.png" width="700">
+</div>
+
+**Steps 4 and 5 needs to be performed only the first time.**
+
+4. If not done yet, configure the git mr command by following those [instructions](https://docs.gitlab.com/ee/user/project/merge_requests/reviews/#checkout-locally-by-adding-a-git-alias).
+
+   4.1 Open *Git Bash*
+
+    4.2 Type *vim ~/.gitconfig* - *Enter*
+
+    4.3 Type *i*
+
+    4.4 Type 
+
+    [alias]
+
+    mr = !sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -
+
+    <div align="center">
+    <img src="img/img5.png" width="700">
+    </div>
+
+    4.5 Type *:wq*
+
+
+5. In the *Terminal window*, type *git remote add upstream [paste the SSH Key]*.
+You can copy the SSH key of the repository by clicking on Clone - copy on the repository page.
+
+<div align="center">
+<img src="img/img3.png" width="700" >
+</div>
+<div align="center">
+<img src="img/img2.png" width="300" >
+</div>
+
+6. In the *Terminal window*, type *git mr upstream [number of the merge request]*.
+
+    You are now on the branch of the merge request.
+
+7. Push it to your fork by clicking on the cloud icone on the bottom left of your screen.
+
+<div align="center">
+<img src="img/img4.png"  width="100"  >
+</div>
+
+8. On GitLab, open a new Merge Request with the newly created branch.
+    
+    In description, write ***Supersedes ![number of the original MR]***.
+
+9. In the original MR, write in the description ***Superseded by ![number of the newly created MR]*** and close the MR.
\ No newline at end of file

external/general/glossary/glossary.md

@@ -20,14 +20,18 @@ Are you sometimes confused with all the abbreviations and names in and around th
 |Atlas|-|Server of the LCSB|
 |BT1 & BT2|House of Biomedicine/Biotech 1&2|Indication of the different buildings of the LCSB|
 |BTL|House of Biomedicine/Biotech L |Indication of a building of the LCSB ("Roudeneck", the same building as Aldi)|
+|CA|Consortium Agreement|
 |CFL|Chemins de Fer Luxembourgeois|Operator for public transport (train, bus) in Luxembourg|
 |CHL|Centre Hospitalier de Luxembourg|Central Hospital in Luxembourg city – also collaborating with the LCSB|
 |CNER|Comité National d’Ethique de Recherche|National committee for ethical approval or research projects|
 |CNS|Caissee Nationale de Santé|National health insurance company in Luxembourg|
 |DAISY|DAta Information SYstem  |Comprehensive tool to manage your research data in a GDPR-compliant manner. For access, [login with you UNI.LU-account at DAISY](https://daisy.lcsb.uni.lu).|
 |DLSM|Department of Life Science and Medicine|Department of the FSTM, formerly called LSRU|
-|DTU|Doctoral Training Unit|Umbrella for organization of PhD students from different groups working on a common project|
 |Docebo|-|Internal learning platform of the LCSB. [Visit Docebo](https://unisupport.docebosaas.com/learn/signin)|
+|DSA|Data Sharing Agreement|
+|DTA|Data Transfer Agreement|
+|DTU|Doctoral Training Unit|Umbrella for organization of PhD students from different groups working on a common project|
+|DUA|Data Use Agreement|
 |ESS|Employee Self-Service|Platform to change your personal data and view your employee profile. Accessible via the intranet |
 |Fiori|-|View your payslips and request holidays. Only accessible when logged into the internal network: [click here](https://fiori.uni.lu/fiori/)|
 |FNR|Fonds National de la Recherche|Main funder of research activities in Luxembourg investing both public funds and private donations|
@@ -39,6 +43,7 @@ Are you sometimes confused with all the abbreviations and names in and around th
 |LIST|Luxembourg Institute of Science and Technology|Research Institute at Belval Campus developing market-oriented services and prototypes|
 |LSRU|Life Science Research Unit|Former name for a department of the FSTM. Now called DLSM|
 |LUMS|LCSB User Management System|Provides you access to most LCSB internal software. **Requires an additional account besides your UNI.LU-login!**|
+|M(D)TA|Material (and Data) Transfer Agreemnent|
 |MSA|Maison du Savoir|Central building of the University of Luxembourg also hosting administration|
 |OWA|Outlook Web Access|To check your emails from anywhere via a web-browser. Login with you UNI.LU-credentials at [owa.uni.lu](https://owa.uni.lu)|
 |R3|Responsible and Reproducible Research|Initiative of the Bioinformatics Core group to raise research quality|
@@ -47,6 +52,7 @@ Are you sometimes confused with all the abbreviations and names in and around th
 |SIU|Service Informatique de l’Université|Unit that organizes, administrates and develops IT platforms & systems at the University of Luxembourg|
 |Slack|-|Online-based instant messaging platform to organize and work on projects together|
 |SOP|Standard Operation Procedure|Internal guideline how common tasks should be executed|
+|ToS|Terms of Service|
 |VM|Virtual Machine|Entire operating system running inside another operating system.|
 |VPN|Virtual Private Network|Allows you to connect to the internal university pages, services and servers via a program (client) upon login with your university credentials|