(refs #1831) Add default merge strategy setting
1 parent 88427b8 commit 3c847bf9575c7f63a7ce13b59346a5f05320db33
@Naoki Takezoe Naoki Takezoe authored on 11 Feb 2018
Showing 6 changed files
View
src/main/resources/update/gitbucket-core_4.22.xml
View
src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
View
src/main/scala/gitbucket/core/model/Repository.scala
View
src/main/scala/gitbucket/core/service/RepositoryService.scala
View
src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
View
src/main/twirl/gitbucket/core/settings/options.scala.html