gitbucket_jkp/src/main/resources/update/gitbucket-core_4.22.xml at 3c847bf9575c7f63a7ce13b59346a5f05320db33

Fork: 0

johnpearcey / gitbucket_jkp

Find file

Newer

Older

gitbucket_jkp / src / main / resources / update / gitbucket-core_4.22.xml

Naoki Takezoe on 11 Feb 2018 337 bytes (refs #1831) Add default merge strategy setting

Raw Blame History

<?xml version="1.0" encoding="UTF-8"?>
<changeSet>
  <addColumn tableName="REPOSITORY">
    <column name="MERGE_OPTIONS" type="varchar(200)" nullable="false" defaultValue="merge-commit,squash,rebase"/>
    <column name="DEFAULT_MERGE_OPTION" type="varchar(100)" nullable="false" defaultValue="merge-commit"/>
  </addColumn>
</changeSet>