Skip to main content

Public

Project privacy set to public. By default, its content is available to everyone (authenticated or not). Please note that more restrictive permissions might exist on some items.

  •  
     
    story #11661 define a merge strategy for my repositories
Actions
Summary
git admin
define a merge strategy for my repositories

I can have a linera git history

At git repository level

In Settings, there is a new "Pull requests" tab where git admin can define merge strategies.

There are 2 strategies available

  • Default (will fast forward when possible, fallback to merge when not possible). It's the current situation
  • Fast forward only

When Fast forward is selected, PR that would result to a merge will not be mergeable from the web UI.

The screen is close to what you already have today (merge zone is in "warning mode" but instead of letting the reviewer merge anyway, the merge button is completly disabled).

Change of merge strategy is recorded in project history.

At git project admin level

In "Git settings template", the merge strategie can be selected for all new repositories.

Setting is inherited on project duplication

On fork

Setting is inherited

Empty
Empty
Status
Empty
Done
Development
  • [ ] Does it involves User Interface? 
  • [ ] Are there any mockups?
  • [ ] Are permissions checked?
  • [ ] Does it need Javascript development?
  • [ ] Does it need a forge upgrade bucket?
  • [ ] Does it need to execute things in system events?
  • [ ] Does it impact project creation (templates)?
  • [ ] Is it exploratory?
Empty
Details
#11661
Manuel Vacelet (vaceletm)
2018-08-20 13:51
2018-06-22 10:09
4359

References
Artifact links
Empty
Referencing story #11661

Artifact Tracker v5

epic #11662 Pull requests
rel #11518 10.4

Git commit

tuleap/tuleap/stable

Setting to only merge PR in fast-forward can be set in database 1d2bea6c6d
User avatar Thomas Gerbet (tgerbet) , 2018-07-30 15:35
The pullrequest plugin is PSR-2 compliant 9f9186e5d6
User avatar Thomas Gerbet (tgerbet) , 2018-07-30 17:10
Forked repositories inherit base repository merge settings dae2ab4c54
User avatar Yannis ROSSETTO (rossettoy) , 2018-07-31 11:10
Rename events folder into Events folder (PSR complient) bf1e632562
User avatar Yannis ROSSETTO (rossettoy) , 2018-07-31 14:38
Merge commit allowed option is added for template 7561a3fcd1
User avatar Yannis ROSSETTO (rossettoy) , 2018-07-31 18:03
Setting inheritance project creation 7a6e9af577
User avatar Yannis ROSSETTO (rossettoy) , 2018-08-01 10:43
Introduce Pull requests section in repo management f53cf9caea
User avatar Nicolas Terray (nterray) , 2018-08-02 09:26
User can now change the PR settings for repository 1f7dbae81d
User avatar Nicolas Terray (nterray) , 2018-08-03 09:10
Refactoring: move display of default settings 7818f6a23b
User avatar Nicolas Terray (nterray) , 2018-08-03 18:19
Refactoring: decrease responsibility of IndexController b2ac889c57
User avatar Nicolas Terray (nterray) , 2018-08-03 18:19
Information is taken into account in the PR view 8ee4144cd2
User avatar Thomas Gorka (tgorka) , 2018-08-06 13:49
UI for default settings 7715b4fafe
User avatar Nicolas Terray (nterray) , 2018-08-07 10:14
Display settings

Follow-ups

User avatar
Manuel Vacelet (vaceletm)2018-07-23 10:19
  • So that
    Something went wrong, the follow up content couldn't be loaded
    Only formatting have been changed, you should switch to markup to see the changes
  • Acceptance criteria
    Something went wrong, the follow up content couldn't be loaded
    Only formatting have been changed, you should switch to markup to see the changes