(refs #1831) Add default merge strategy setting
|
---|
|
src/main/resources/update/gitbucket-core_4.22.xml |
---|
src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala |
---|
src/main/scala/gitbucket/core/model/Repository.scala |
---|
src/main/scala/gitbucket/core/service/RepositoryService.scala |
---|
src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html |
---|
src/main/twirl/gitbucket/core/settings/options.scala.html |
---|