Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • vilem.ded/howto-cards
  • yjarosz/labCards
  • sarah.diehl/howto-cards
  • jacek.lebioda/howto-cards
  • pinar.alper/howto-cards
  • maharshi.vyas/howto-cards
  • manuel.maidorn/howto-cards
  • roland.krause/howto-cards
  • miriam.fougeras/howto-cards
  • soraya.hezzaz/howto-cards
  • fasavanh.sanichanh/howto-cards
  • marie.fossepre/howto-cards
  • jennifer.behm/howto-cards
  • annegrat.daujeumont/howto-cards
  • jon.gales/howto-cards-jpg
  • sandy.thill/howto-cards
  • jenny.tran/howto-cards
17 results
Show changes
Showing
with 158 additions and 2 deletions
...@@ -64,12 +64,14 @@ To have a more readable view, with the pictures integrated, click on the 3 dots ...@@ -64,12 +64,14 @@ To have a more readable view, with the pictures integrated, click on the 3 dots
- Make your comment on the comment section and click on **Start a review** or on **Add comment now**. Clicking on *"Start a review"* will allow you to compile several comments before an email is sent to the assignee when you will click on **Finish review**. Clicking on *"Add comment now"* will send an email to the assignee for every comment. - Make your comment on the comment section and click on **Start a review** or on **Add comment now**. Clicking on *"Start a review"* will allow you to compile several comments before an email is sent to the assignee when you will click on **Finish review**. Clicking on *"Add comment now"* will send an email to the assignee for every comment.
Clicking on the first icon will allows you to directly suggest a change that the assignee will be able to accept or not.
<div align="center"> <div align="center">
<img src="img/img7.png"> <img src="img/img9.png">
</div> </div>
<div align="center"> <div align="center">
<img src="img/img8.png"> <img src="img/img8.png">
</div> </div>
When all the threads are resolved, you will be able to **Approve** the merge request and the repository maintenair can proceed with the merge. When all the threads are resolved, you will be able to **Approve** the merge request and the repository maintainer will be able to proceed with the merge.
\ No newline at end of file
external/contribute/ssh-key-generation/img/key-details.png

182 KiB

external/contribute/ssh-key-generation/img/new-key.png

88.8 KiB

external/contribute/ssh-key-generation/img/preferences.png

17.1 KiB

external/contribute/ssh-key-generation/img/ssh-menu.png

32.4 KiB

---
layout: page
permalink: /external/contribute/ssh-key-generation/
shortcut: contribute:ssh-key-generation
redirect_from:
- /cards/contribute:ssh-key-generation
- /external/cards/contribute:ssh-key-generation
- /contribute/ssh-key-generation
- /external/external/contribute/ssh-key-generation/
---
# Key-based Authentication on GitLab
Key-based authentication allows GitLab users to identify their device once on their account and avoid having to log in via their credentials every time. GitLab uses SSH protocol to communicate with Git.
SSH uses a public and a private key:
- The public key must be registered in GitLab, where it "identifies" your device.
- The private key must stay secret and preferably you should only keep it on a single device. The private key is the only key that can be used to authenticate your identity against the public key uploaded to GitLab -- if it becomes public, anyone can impersonate your identity and thus use your GitLab account. **Make sure you do NOT upload the private key anywhere by accident, not even to GitLab.**
# Prerequisites
To use SSH, one of the following must be installed on your device:
- The OpenSSH client, which comes pre-installed on GNU/Linux, macOS, and [Windows 10 via Powershell or WSL](https://docs.gitlab.com/ee/user/ssh.html#use-ssh-on-microsoft-windows).
- SSH version 6.5 or later. Earlier versions used an MD5 signature, which is not secure.
To view the version of SSH installed on your system, run the following command in your terminal (on Linux or macOS) or Git Bash (on Windows):
```
ssh -V
```
# Key Generation
> :warning: Please note that the steps below describe SSH key generation. If you already have one, **your existing key may be overwritten.**
1. Start a terminal
2. Type the following command at the command prompt and run it after replacing your firstname and lastname:
```
ssh-keygen -t ed25519 -C firstname.lastname@uni.lu
```
3. Accept the suggested filename and directory
4. Press `Enter` to continue. Defining a password is not necessary and can be skipped.
5. To copy the contents of your public key file into the clipboard, run the following command:
- For macOS:
```
tr -d '\n' < ~/.ssh/id_ed25519.pub | pbcopy
```
- For Windows:
```
cat ~/.ssh/id_ed25519.pub | clip
```
# Saving the SSH Key on GitLab
Once the content of the public key is copied in the clipboard, you need to register it with your GitLab account.
To save your key to your account:
1. Log in to GitLab using your LUMS account
2. Navigate to the `Preferences` menu
![preferences](img/preferences.png)
3. User settings will be displayed on the left-hand side menu. Click on the `SSH Keys` option
![ssh-menu](img/ssh-menu.png)
4. On the `SSH Keys` page, click on `Add new key` button to add your public key
![new-key](img/new-key.png)
5. Paste your new key into the `Key` box, name the key and save it by clicking the `Add key` button
![key-details](img/key-details.png)
# Troubleshooting
Please refer to the [GitLab Docs](https://docs.gitlab.com/ee/user/ssh.html#troubleshooting) or [create a ticket](https://service.uni.lu/sp?id=sc_cat_item&table=sc_cat_item&sys_id=c1d98bacdb9cf810ca53454039961917) for further assistance regarding the key-based authentication.
external/contribute/supersede/img/img1.png

132 KiB

external/contribute/supersede/img/img2.png

48.4 KiB

external/contribute/supersede/img/img3.png

115 KiB

external/contribute/supersede/img/img4.png

15.6 KiB

external/contribute/supersede/img/img5.png

2.83 KiB

---
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/contribute/web-ide/img/ChangeBranchesInMR.png

38.8 KiB

external/contribute/web-ide/img/CommitToNewBranch.png

24.6 KiB

external/contribute/web-ide/img/CommitWindow.png

16.6 KiB

external/contribute/web-ide/img/CompareChanges.png

410 KiB

external/contribute/web-ide/img/CreateMR.png

11.8 KiB

external/contribute/web-ide/img/CreateNewBranch.png

11.3 KiB