Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in / Register
Website
Website
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 70
    • Issues 70
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
    • Iterations
  • Merge Requests 1
    • Merge Requests 1
  • Requirements
    • Requirements
    • List
  • Operations
    • Operations
    • Incidents
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • Code Review
    • Insights
    • Issue
    • Repository
    • Value Stream
  • Members
    • Members
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
Collapse sidebar
  • Chakra
  • WebsiteWebsite
  • Issues
  • #35

Closed
Open
Opened Feb 06, 2019 by totte@totteOwner26 of 31 tasks completed26/31 tasks

Set default merge request method

These are the current settings for all projects (as far as I know):

Merge method

  • Merge commit - A merge commit is created for every merge, and merging is allowed as long as there are no conflicts.
  • Merge commit with semi-linear history - A merge commit is created for every merge, but merging is only allowed if fast-forward merge is possible. This way you could make sure that if this merge request would build, after merging to target branch it would also build. When fast-forward merge is not possible, the user is given the option to rebase.
  • Fast-forward merge - No merge commits are created and all merges are fast-forwarded, which means that merging is only allowed if the branch could be fast-forwarded. When fast-forward merge is not possible, the user is given the option to rebase.

Default description template for merge requests

(Text field)

  • Only allow merge requests to be merged if the pipeline succeeds - Pipelines need to be configured to enable this feature.
  • Only allow merge requests to be merged if all discussions are resolved
  • Automatically resolve merge request diff discussions when they become outdated
  • Show link to create/view merge request when pushing from the command line

Set the default merge method to Fast-forward merge for all projects.

  • Chakra / Akabei / Akabei frontend
  • Chakra / Akabei / Akabei client library
  • Chakra / Akabei / Akabei core library
  • Chakra / Packages / core
  • Chakra / Packages / desktop
  • Chakra / Packages / lib32
  • Chakra / Packages / gtk
  • Chakra / Websites / www.chakralinux.org
  • Chakra / Websites / ccr.chakralinux.org
  • Chakra / Continuous integration scripts
  • Chakra / Dockerfiles
  • Chakra / Docker container bootstrap
  • Chakra / Live media creator
  • Chakra / Welcome plasmoid
  • Chakra / Quick USB formatter
  • Chakra / Posterior
  • Chakra / KCM Pacman repository editor
  • Chakra / Kapudan
  • Chakra / Heritage
  • Chakra / GFXBoot theme
  • Chakra / Hardware detection scripts
  • Chakra / CCR plasmoid
  • Chakra / Calamares modules
  • Chakra / Build system
Edited Feb 17, 2019 by totte
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
None
Due date
None
Reference: chakra/melange#35