|
Merge branch 'master' into fork-and-pullreq
Conflicts: src/main/scala/app/RepositoryViewerController.scala src/main/scala/service/RepositoryService.scala |
|---|
| README.md |
|---|
| gitbucket.erd |
|---|
| project/plugins.sbt |
|---|
| src/main/scala/app/AccountController.scala |
|---|
| src/main/scala/app/DashboardController.scala |
|---|
| src/main/scala/app/IndexController.scala |
|---|
| src/main/scala/app/IssuesController.scala |
|---|
| src/main/scala/app/RepositoryViewerController.scala |
|---|
| src/main/scala/app/SearchController.scala |
|---|
| src/main/scala/service/IssuesService.scala |
|---|
| src/main/scala/service/RepositoryService.scala |
|---|
| src/main/scala/util/JGitUtil.scala |
|---|
| src/main/scala/view/AvatarImageProvider.scala |
|---|
| src/main/twirl/dashboard/issues.scala.html |
|---|
| src/main/twirl/dashboard/tab.scala.html |
|---|
| src/main/twirl/index.scala.html |
|---|
| src/main/twirl/issues/listparts.scala.html |
|---|
| src/main/twirl/repo/tab.scala.html |
|---|
| src/main/twirl/settings/options.scala.html |
|---|
| src/main/webapp/WEB-INF/web.xml |
|---|