GitBucket
|
Merge branch 'feature/#422-compare-link-near-branch-selector' of https://github.com/team-lab/gitbucket into team-lab-feature/#422-compare-link-near-branch-selector
Conflicts: src/main/twirl/gitbucket/core/repo/files.scala.html |
|---|
|
|
| src/main/scala/gitbucket/core/controller/PullRequestsController.scala |
|---|
| src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala |
|---|
| src/main/scala/gitbucket/core/service/PullRequestService.scala |
|---|
| src/main/twirl/gitbucket/core/repo/files.scala.html |
|---|
| src/main/webapp/assets/common/css/gitbucket.css |
|---|
| src/test/scala/gitbucket/core/service/PullRequestServiceSpec.scala 0 → 100644 |
|---|
| src/test/scala/gitbucket/core/service/ServiceSpecBase.scala |
|---|