|
Merge branch 'master' into scala-plugin
Conflicts: project/build.scala |
|---|
| contrib/README.md 0 → 100644 |
|---|
| contrib/gitbucket.conf 0 → 100644 |
|---|
| contrib/gitbucket.init 0 → 100644 |
|---|
| contrib/install 0 → 100755 |
|---|
| contrib/linux/redhat/gitbucket.spec 0 → 100644 |
|---|
| contrib/macosx/gitbucket.plist 100644 → 0 |
|---|
| contrib/macosx/makePlist 0 → 100755 |
|---|
| contrib/redhat/gitbucket.conf 100644 → 0 |
|---|
| contrib/redhat/gitbucket.init 100644 → 0 |
|---|
| contrib/redhat/gitbucket.spec 100644 → 0 |
|---|
| src/main/java/JettyLauncher.java |
|---|
| src/main/scala/app/AccountController.scala |
|---|
| src/main/scala/app/RepositoryViewerController.scala |
|---|
| src/main/scala/service/WikiService.scala |
|---|
| src/main/scala/util/JGitUtil.scala |
|---|
| src/main/scala/view/helpers.scala |
|---|
| src/main/twirl/helper/copy.scala.html |
|---|
| src/main/twirl/repo/tags.scala.html |
|---|
| src/main/webapp/assets/common/css/gitbucket.css |
|---|