Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
D
dorie
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 31
    • Issues 31
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 9
    • Merge Requests 9
  • Operations
    • Operations
    • Incidents
    • Environments
  • Analytics
    • Analytics
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
  • dorie
  • dorie
  • Merge Requests
  • !166

Merged
Opened Sep 10, 2019 by Lukas Riedel@lriedelOwner6 of 6 tasks completed6/6 tasks

Update gitlab templates

  • Overview 4
  • Commits 9
  • Pipelines 8
  • Changes 7

What does this MR do?

Update existing GitLab Description Templates. Changes:

  • MR-from-task:
    • Suggest "Squash commits" option

      Rationale: After merging, commits from the previous branch are rarely ever reverted. Squashing before merging helps keeping the master log cleaner. Additionally, the number of commits is no real indication of time/effort spend on code.

      Downside: The default squash commit message is the message of the first commit that deviates from the target branch. This message usually has to be updated/changed right before merging (changes are not stored). The squash commit author is the author/creator of the merge request, whereas the author of the merge commit is the person performing the merge.

    • Suggest "Delete branch after merge" option

  • bug-report:
    • Reduce headline level
    • Add table for reporting input files, suggested in #79 (comment 13019)

Add new Templates:

  • version-rollout: Release of a new minor or major version.
  • patch-release: Release of a bugfix/patch update (Issue and MR templates).

Is there something that needs to be double checked?

  • Templates looking good when parsed by GitLab

Can this MR be accepted?

  • Added/Updated templates
  • Pipeline passing
  • Added entry to CHANGELOG.md
  • Squash commits option set
  • Delete branch option set

Related issues

Closes #79 (closed)

Edited Sep 10, 2019 by Lukas Riedel
Assignee
Assign to
Reviewer
Request review from
None
Milestone
None
Assign milestone
Time tracking
Reference: dorie/dorie!166
Source branch: update-gitlab-templates

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.