Naoki Takezoe
|
23c146fc5d
|
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
|
2015-04-05 16:52:47 +09:00 |
|
nazoking
|
ab19d473c4
|
(refs #442)show compare/pull request link near branch link.
|
2015-03-30 21:16:42 +09:00 |
|
nazoking
|
27864a3a3c
|
Performance Improve for getFileList
|
2015-03-29 01:21:10 +09:00 |
|
nazoking
|
b39e863591
|
add test for getFileList
|
2015-03-29 01:12:33 +09:00 |
|
Tomofumi Tanaka
|
7e92f1abd5
|
Fix test code package name
|
2015-03-16 23:38:00 +09:00 |
|
Tomofumi Tanaka
|
6acbd5b2cf
|
Merge remote-tracking branch 'origin/master' into api-support
Conflicts:
src/main/scala/ScalatraBootstrap.scala
src/main/scala/gitbucket/core/controller/AccountController.scala
src/main/scala/gitbucket/core/controller/ControllerBase.scala
src/main/scala/gitbucket/core/controller/IssuesController.scala
src/main/scala/gitbucket/core/controller/PullRequestsController.scala
src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
src/main/scala/gitbucket/core/model/Profile.scala
src/main/scala/gitbucket/core/service/PullRequestService.scala
src/main/scala/gitbucket/core/service/WebHookService.scala
src/main/scala/gitbucket/core/servlet/InitializeListener.scala
src/main/scala/gitbucket/core/view/helpers.scala
src/main/twirl/gitbucket/core/pulls/conversation.scala.html
src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
src/main/twirl/issues/listparts.scala.html
|
2015-03-16 22:49:47 +09:00 |
|
takezoe
|
be75cef752
|
Fix testcase
|
2015-03-03 02:38:59 +09:00 |
|
Naoki Takezoe
|
d495b04d85
|
Change package name
|
2015-03-02 22:15:56 +09:00 |
|