(refs #1859) Add options to manage merge strategies
|
---|
|
src/main/resources/update/gitbucket-core_4.22.xml 0 → 100644 |
---|
src/main/scala/gitbucket/core/GitBucketCoreModule.scala |
---|
src/main/scala/gitbucket/core/controller/PullRequestsController.scala |
---|
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 |
---|