Repository navigation
Add Gitlab as an alternative to GitHub (ref #535) - #540
Conversation
There was a problem hiding this comment.
Hi! It looks really good. The only thing I notice from a first read through is on merging we have: "We offer four different paths of how to do this exercise. For the CodeRefinery workshop day 1, we use and demonstrate the GitHub path only and recommend you do that. The exercise text below has some GitHub-specific notes, but most is possibly with any path." I think there are currently 3 paths so this must be a bit old. It would be good to update this too now anyway.
I hope you don't mind, but I'm going to request a Copilot review since it helped me catch some language problems in my PR. I'll go through them to look for false positives so I hope it's not too annoying.
There was a problem hiding this comment.
Copilot review overview
🟡 Changes recommended
Unresolved moderate and nit findings affect GitLab configuration, sharing, and merge request instructions.
Get a fresh assessment by requesting another Copilot review.
Review effort: Lite
Findings: 3
Open (10)
What changed in this PR
This PR adds GitLab alternatives to the introductory Git instructions.
Changes:
- Adds GitLab configuration, repository creation, uploads, and merge request workflows.
- Adds annotated screenshots and a merge request glossary entry.
- Ignores the local
.venvenvironment.
| File | Changes and final findings |
|---|---|
content/sharing.md |
Adds GitLab repository and upload guidance. Findings: line 102 has an unclosed quote around project URL (nit, 3 votes); the RStudio path lacks GitLab setup and remote URLs (moderate, 2 votes); the upload procedure lacks textual upload/commit instructions (nit, 1 vote). |
content/reference.md |
Adds the “merge request” reference entry. |
content/merging.md |
Adds GitLab merge request workflows and screenshots. Findings: the overview count should reflect five paths (nit, 1 vote); objectives and final instructions should mention merge requests (nit, 3 and 2 votes); fork, target project, and target branch terminology needs correction (moderate, 3 votes; nit, 3 and 2 votes); Gitlab alt text should use GitLab on lines 167 and 437 (nit, 3 votes). |
content/configuration.md |
Extends authentication guidance to GitLab. Findings: the cross-link should use the #clone-method anchor (nit, 3 votes); the RStudio remote URL should be conditional on SSH versus HTTPS selection (moderate, 3 votes). |
.gitignore |
Ignores the local .venv environment. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
| After the configuration, you should **select HTTPS as the clone URL from | ||
| GitHub, or translate the URL to start with the right thing | ||
| yourself:** `https://github.com/` | ||
| GitHub or GitLab, or translate the URL to start with the right thing | ||
| yourself:** `https://github.com/` or `https://gitlab.com/` |
| * **RStudio**: initialize Git for your project, connect it to an empty | ||
| repository on GitHub or GitLab, and use RStudio's Push and Pull buttons. |
There was a problem hiding this comment.
Probably easier to just keep this GitHub only in that case
| ::::{group-tab} GitLab | ||
| On GitLab make sure you are on the branch you want to merge **from**: | ||
| :::{figure} img/gitlab/merging-navigate-branch-annotated.png | ||
| :alt: Screenshot on Gitlab where we navigate to the branch we wish to merge. |
| - On GitHub and GitLab, you can resolve conflicts by clicking on the "Resolve conflicts" | ||
| button. This will open a text editor where you can choose which changes to | ||
| keep. |
|
Okay I've read through the Copilot review and it most of the points seem good to me too apart from the spurious misunderstanding of MyST and for "(3) Fill out and verify the pull request" you could ignore Copilot and make a larger change so that "what to check" follows the natural flow of what's in the two screenshots as well as the text in the labels. But overall things look in great shape -- thanks so much for you help! Almost there! |
…s the target branch' Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
…requests' Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
…t GitHub terminology' Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
…ly refer to a base repository' Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
… URL' Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
|
Thank you for the improvements. |
|
📖 Preview of this branch: https://coderefinery.github.io/git-intro/branch/gitlab-tabs/ Built at 2026-09-22T07:09:10Z (artifact timestamp). |
This PR adds GitLab alternatives to the introductory Git instructions, following issue #535.
Changes