(refs #1859) Add options to manage merge strategies
1 parent d1f2a72 commit 737b0a9bdf546c50440909c90493dcf7fec0f454
@Naoki Takezoe Naoki Takezoe authored on 9 Feb 2018
Showing 8 changed files
View
src/main/resources/update/gitbucket-core_4.22.xml 0 → 100644
View
src/main/scala/gitbucket/core/GitBucketCoreModule.scala
View
src/main/scala/gitbucket/core/controller/PullRequestsController.scala
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