Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release v4.0.0 #221

Merged
merged 34 commits into from
Apr 28, 2023
Merged

Release v4.0.0 #221

merged 34 commits into from
Apr 28, 2023

Conversation

martialblog
Copy link
Member

@martialblog martialblog commented Apr 12, 2023 •
edited
Loading

Major Refactor of the Training.

Day 1:

  • Smoother Start into Git core concepts
  • Add more GitLab Topics on day1
  • Add more GitLab Labs on day1
  • Reword a lot of slides to be clearer
  • Remove Create NMS GitLab Labs (as discussed)
  • Move git tag to end of day and finish the day with a git tag v0.5 -m "End of Day One Release"

Day 2:

  • Remove Integrations Chapter on day2, time will be used for more CI
  • Optimize CI Chapter and add new CI Labs
  • Streamline Git Workflow Examples
  • Optimize rebase and squashing Slides
  • Reword a lot of slides to be clearer
  • Reword Git Workflow Slides and revert GitFlow images
  • Add Release Pipeline Lab with Release v1.0 as "End of Training Release"

Fixes #209

Fixes #220

Fixes #200

Fixes #217

Fixes #214

Fixes #199

Fixes #216

martialblog and others added 29 commits April 12, 2023 15:23
@martialblog
Update gitignore
0ab3068
@martialblog
Refactor Day 1
6f74288 
 - Optimize wording on many slides
 - Move some more GitLab related things from day2 to day1
 - Move deleting remove branches to day1 when we talk about tracking branches
 - Better explanations for multiple concepts
 - Remove some empty sections just to keep things clean
@theFeu @martialblog
Additions for the refactor
549b5c9
@theFeu @martialblog
Add comment about reading direction in .gitignore
a58b80d
@theFeu @martialblog
Note that the checksum of previous commit is stored
d6803c2
@theFeu @martialblog
Simplify example for non techies and add issue reference
63d9a7f
@theFeu @martialblog
Fix inconsistencies with which branch to delete
337f5f8
@theFeu @martialblog
Switch out checksums with usable pointers
7ef7564 
I don't think we should use random checksums here in the examples.
People like to copy paste stuff, and this seems like the safer option to me :)
@theFeu @martialblog
Fix wording for connecting with web interfaces
5ea55de
@theFeu @martialblog
Add instructions for an empty repository
499a447
@theFeu @martialblog
Fix wording for previous fix
c86dea5
@theFeu @martialblog
Fix typo credentail -> credential
da7fdfc
@theFeu @martialblog
Switch out stash pop with apply and drop
fd3a527
@martialblog
Add a day1 Lab for adding GitLab Project members
c215b50
@martialblog
Add example analogies to git core concepts
792bda6
@martialblog
Remove Create NMS GitLab Labs and minor typo fixes
f6b06c8
@martialblog
Remove day2/02_Integrations
d72f5e7
@martialblog
Update Git Workflow Examples
78957a3
@martialblog
Optimize rebase and squashing slides
85f8ead
@martialblog
Optimize the day2 CI chapter
6b24061
@martialblog
Rephrase some Branch Workflow slides
6f6043e
@theFeu @martialblog
Add branch naming conventions
b698794
@theFeu @martialblog
Add to Icinga workflow example
879dcf9
@theFeu @martialblog
Add note for usage of rebase early on
f3a05a0
@martialblog
Add release keywork to CI Lab
0c85f2f
@martialblog
Add Lab for the 'matrix' keyword
07bf16d
@martialblog
Extend pipeline slide with triggers and rules
01ba87a
@martialblog
Refactor Git Workflow
6e766ce 
 - Reverts to old GitFlow images
@martialblog
Bump release in showoff.json
c4e99ec
@martialblog martialblog self-assigned this Apr 13, 2023
@mocdaniel
Fixes typos, changes wording in some places
b5bb877 
* Fixes multiple typos
* Standardizes slides to American English pronunciation
* Changes wording in a few places
* Adds Daniel Bodky to Authors
@martialblog martialblog added this to the v4.0.0 milestone Apr 14, 2023
@martialblog martialblog marked this pull request as ready for review April 24, 2023 07:57
mocdaniel
mocdaniel requested changes Apr 28, 2023
View reviewed changes
Copy link
Member

@mocdaniel mocdaniel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, marked some typos here and there, will update the PR.

day1/03_Basics/03_Changes.md Outdated Show resolved Hide resolved
day1/03_Basics/05_Gitignore.md Outdated Show resolved Hide resolved
day1/04_Commits/01_Intro.md Outdated Show resolved Hide resolved
day1/04_Commits/05_Amend.md Outdated Show resolved Hide resolved
day1/04_Commits/05_Amend.md Outdated Show resolved Hide resolved
day2/01_Workflows/04_Gitflow.md Outdated Show resolved Hide resolved
day2/03_CI/01_Intro.md Outdated Show resolved Hide resolved
day2/03_CI/03_Gitlab_CI.md Outdated Show resolved Hide resolved
day2/03_CI/04_Gitlab_Pipelines.md Outdated Show resolved Hide resolved
day2/05_Outlook/31_LFS.md Outdated Show resolved Hide resolved
@martialblog
Copy link
Member Author

Rebased/Squashed some commits. @theFeu also confirmed the PR.

Ship it :shipit:

@martialblog martialblog merged commit fad0820 into main Apr 28, 2023
@martialblog martialblog deleted the release/v4 branch April 28, 2023 12:29
@htriem
Copy link
Contributor

htriem commented Apr 28, 2023

Bit late, but I've checked it out as well and I like what I'm seeing 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mocdaniel mocdaniel mocdaniel approved these changes

Assignees

@martialblog martialblog

Labels
None yet
Projects
None yet
Milestone
v4.0.0
4 participants
@martialblog @htriem @mocdaniel @theFeu