Fork: 0
johnpearcey / gitbucket_jkp
Browse code
Merge branch 'master' into solidbase-integration
# Conflicts:
#	build.sbt
#	src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
#	src/main/scala/gitbucket/core/servlet/AutoUpdate.scala
master
commit 539751a1d997ba78a141301039ef05e8613c23f0
2 parents 40e36e3 + 70e2079
@Naoki Takezoe Naoki Takezoe authored on 6 Mar 2016
Patch
Unified Split
Showing 116 changed files
View
.github/CONTRIBUTING.md 0 → 100644
Too large (Show diff)
View
.github/ISSUE_TEMPLATE.md 0 → 100644
Too large (Show diff)
View
.github/PULL_REQUEST_TEMPLATE.md 0 → 100644
Too large (Show diff)
View
CONTRIBUTING.md 100644 → 0
Too large (Show diff)
View
README.md
Too large (Show diff)
View
build.sbt
Too large (Show diff)
View
doc/how_to_run.md
Too large (Show diff)
View
doc/release.md
Too large (Show diff)
View
project/Checksums.scala 0 → 100644
Too large (Show diff)
View
project/build.properties
Too large (Show diff)
View
release/env.sh
Too large (Show diff)
View
sbt-launch-0.13.8.jar 100644 → 0
Too large (Show diff)
View
sbt-launch-0.13.9.jar 0 → 100644
Too large (Show diff)
View
sbt.bat
Too large (Show diff)
View
sbt.sh
Too large (Show diff)
View
src/main/resources/update/3_13.sql 0 → 100644
Too large (Show diff)
View
src/main/scala/ScalatraBootstrap.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/controller/AccountController.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/controller/ControllerBase.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/controller/DashboardController.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/controller/IndexController.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/controller/PluginsController.scala 100644 → 0
Too large (Show diff)
View
src/main/scala/gitbucket/core/controller/PullRequestsController.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/controller/SearchController.scala 100644 → 0
Too large (Show diff)
View
src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/controller/UserManagementController.scala 100644 → 0
Too large (Show diff)
View
src/main/scala/gitbucket/core/model/BasicTemplate.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/model/WebHook.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/service/AccesTokenService.scala 100644 → 0
Too large (Show diff)
View
src/main/scala/gitbucket/core/service/AccessTokenService.scala 0 → 100644
Too large (Show diff)
View
src/main/scala/gitbucket/core/service/IssuesService.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/service/RepositoryService.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/service/SystemSettingsService.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/service/WebHookService.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/service/WikiService.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/servlet/BasicAuthenticationFilter.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/ssh/GitCommand.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/ssh/NoShell.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/ssh/SshServerListener.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/util/Authenticator.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/util/Implicits.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/util/JGitUtil.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/view/helpers.scala
Too large (Show diff)
View
src/main/twirl/gitbucket/core/account/application.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/account/edit.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/account/group.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/account/main.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/account/newrepo.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/account/register.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/account/ssh.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/admin/menu.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/admin/plugins.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/gitbucket/core/admin/plugins/plugins.scala.html 100644 → 0
Too large (Show diff)
View
src/main/twirl/gitbucket/core/admin/system.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/admin/user.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/gitbucket/core/admin/usergroup.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/gitbucket/core/admin/userlist.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/gitbucket/core/admin/users/group.scala.html 100644 → 0
Too large (Show diff)
View
src/main/twirl/gitbucket/core/admin/users/list.scala.html 100644 → 0
Too large (Show diff)
View
src/main/twirl/gitbucket/core/admin/users/user.scala.html 100644 → 0
Too large (Show diff)
View
src/main/twirl/gitbucket/core/dashboard/issues.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/dashboard/pulls.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/helper/attached.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/helper/commitcomment.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/helper/copy.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/index.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/issues/commentform.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/issues/commentlist.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/issues/create.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/issues/issueinfo.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/issues/labels/edit.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/issues/milestones/list.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/menu.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/pulls/commits.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/pulls/compare.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/pulls/pullreq.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/repo/blob.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/repo/commentform.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/repo/commits.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/repo/delete.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/repo/editcomment.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/repo/editor.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/repo/files.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/repo/forked.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/repo/guide.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/search/issues.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/settings/edithooks.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/wiki/edit.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/wiki/page.scala.html
Too large (Show diff)
View
src/main/webapp/assets/common/css/gitbucket.css
Too large (Show diff)
View
src/test/scala/gitbucket/core/api/JsonFormatSpec.scala
Too large (Show diff)
View
src/test/scala/gitbucket/core/model/CommitStateSpec.scala
Too large (Show diff)
View
src/test/scala/gitbucket/core/service/AccessTokenServiceSpec.scala
Too large (Show diff)
View
src/test/scala/gitbucket/core/service/AccountServiceSpec.scala
Too large (Show diff)
View
src/test/scala/gitbucket/core/service/CommitStateServiceSpec.scala 100644 → 0
Too large (Show diff)
View
src/test/scala/gitbucket/core/service/CommitStatusServiceSpec.scala 0 → 100644
Too large (Show diff)
View
src/test/scala/gitbucket/core/service/IssuesServiceSpec.scala
Too large (Show diff)
View
src/test/scala/gitbucket/core/service/LabelsServiceSpec.scala
Too large (Show diff)
View
src/test/scala/gitbucket/core/service/MergeServiceSpec.scala
Too large (Show diff)
View
src/test/scala/gitbucket/core/service/ProtectedBranchServiceSpec.scala
Too large (Show diff)
View
src/test/scala/gitbucket/core/service/PullRequestServiceSpec.scala
Too large (Show diff)
View
src/test/scala/gitbucket/core/service/RepositoryServiceSpec.scala
Too large (Show diff)
View
src/test/scala/gitbucket/core/service/WebHookServiceSpec.scala
Too large (Show diff)
View
src/test/scala/gitbucket/core/ssh/GitCommandSpec.scala
Too large (Show diff)
View
src/test/scala/gitbucket/core/util/DirectorySpec.scala
Too large (Show diff)
View
src/test/scala/gitbucket/core/util/JGitUtilSpec.scala
Too large (Show diff)
View
src/test/scala/gitbucket/core/util/StringUtilSpec.scala
Too large (Show diff)
View
src/test/scala/gitbucket/core/util/ValidationsSpec.scala
Too large (Show diff)
View
src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala
Too large (Show diff)
View
src/test/scala/gitbucket/core/view/HelpersSpec.scala
Too large (Show diff)
View
src/test/scala/gitbucket/core/view/MarkdownSpec.scala
Too large (Show diff)
View
src/test/scala/gitbucket/core/view/PaginationSpec.scala
Too large (Show diff)