GitBucket
|
Merge pull request #1802 from gitbucket/merge-strategy
Add a pulldown menu to choose the merge strategy |
|---|
|
GitHub
committed
on 12 Dec 2017
|
| src/main/scala/gitbucket/core/controller/PullRequestsController.scala |
|---|
| src/main/scala/gitbucket/core/service/MergeService.scala |
|---|
| src/main/scala/gitbucket/core/util/JGitUtil.scala |
|---|
| src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html |
|---|