Merge branch 'master' into solidbase-integration
# Conflicts:
#	build.sbt
#	src/main/twirl/gitbucket/core/main.scala.html
commit 2da2b426a170041cb94a2f6eef9072ae0cff0381
2 parents c8686f4 + 4434984
@Naoki Takezoe Naoki Takezoe authored on 11 Apr 2016
Showing 119 changed files
View
README.md
Too large (Show diff)
View
build.sbt
Too large (Show diff)
View
release/pom.xml
Too large (Show diff)
View
src/main/scala/ScalatraBootstrap.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/api/ApiIssue.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/ApiController.scala 0 → 100644
Too large (Show diff)
View
src/main/scala/gitbucket/core/controller/DashboardController.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/controller/FileUploadController.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/IssuesController.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/controller/LabelsController.scala
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/WikiController.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/plugin/Plugin.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/service/HandleCommentService.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/RepositoryCreationService.scala 0 → 100644
Too large (Show diff)
View
src/main/scala/gitbucket/core/service/RepositorySearchService.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/service/RepositoryService.scala
Too large (Show diff)
View
src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.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/menu.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/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/dashboard/header.scala.html
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/issueslist.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/dashboard/issuesnavi.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/dashboard/sidebar.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/gitbucket/core/dashboard/tab.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/helper/activities.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/helper/diff.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/helper/dropdown.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/helper/preview.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/create.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/issues/editcomment.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/issues/editissue.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/issues/issue.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/labellist.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/issues/labels/list.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/issues/list.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/issues/listparts.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/issues/milestones/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/issues/navigation.scala.html 100644 → 0
Too large (Show diff)
View
src/main/twirl/gitbucket/core/main.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/conversation.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/branches.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/repo/commit.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/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/find.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/repo/tags.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/search/code.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/search/menu.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/search/wiki.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/gitbucket/core/settings/branchprotection.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/settings/hooks.scala.html
Too large (Show diff)
View
src/main/twirl/gitbucket/core/settings/menu.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/history.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/main/webapp/assets/vendors/bootstrap-3.3.6/css/bootstrap-theme.css 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/vendors/bootstrap-3.3.6/css/bootstrap-theme.css.map 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/vendors/bootstrap-3.3.6/css/bootstrap-theme.min.css 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/vendors/bootstrap-3.3.6/css/bootstrap-theme.min.css.map 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/vendors/bootstrap-3.3.6/css/bootstrap.css 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/vendors/bootstrap-3.3.6/css/bootstrap.css.map 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/vendors/bootstrap-3.3.6/css/bootstrap.min.css 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/vendors/bootstrap-3.3.6/css/bootstrap.min.css.map 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/vendors/bootstrap-3.3.6/fonts/glyphicons-halflings-regular.eot 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/vendors/bootstrap-3.3.6/fonts/glyphicons-halflings-regular.svg 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/vendors/bootstrap-3.3.6/fonts/glyphicons-halflings-regular.ttf 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/vendors/bootstrap-3.3.6/fonts/glyphicons-halflings-regular.woff 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/vendors/bootstrap-3.3.6/fonts/glyphicons-halflings-regular.woff2 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/vendors/bootstrap-3.3.6/js/bootstrap.js 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/vendors/bootstrap-3.3.6/js/bootstrap.min.js 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/vendors/bootstrap-3.3.6/js/npm.js 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/vendors/bootstrap-theme-github-3.1.1/css/bootstrap-3.0.3.css 100644 → 0
Too large (Show diff)
View
src/main/webapp/assets/vendors/bootstrap-theme-github-3.1.1/css/bootstrap-3.min.css 100644 → 0
Too large (Show diff)
View
src/main/webapp/assets/vendors/bootstrap-theme-github-3.1.1/css/bootstrap.css 100644 → 0
Too large (Show diff)
View
src/main/webapp/assets/vendors/bootstrap-theme-github-3.1.1/css/bootstrap.min.css 100644 → 0
Too large (Show diff)
View
src/main/webapp/assets/vendors/bootstrap-theme-github-3.1.1/fonts/glyphicons-halflings-regular.eot 100644 → 0
Too large (Show diff)
View
src/main/webapp/assets/vendors/bootstrap-theme-github-3.1.1/fonts/glyphicons-halflings-regular.svg 100644 → 0
Too large (Show diff)
View
src/main/webapp/assets/vendors/bootstrap-theme-github-3.1.1/fonts/glyphicons-halflings-regular.ttf 100644 → 0
Too large (Show diff)
View
src/main/webapp/assets/vendors/bootstrap-theme-github-3.1.1/fonts/glyphicons-halflings-regular.woff 100644 → 0
Too large (Show diff)
View
src/main/webapp/assets/vendors/bootstrap-theme-github-3.1.1/js/bootstrap-3.0.3.js 100644 → 0
Too large (Show diff)
View
src/main/webapp/assets/vendors/bootstrap-theme-github-3.1.1/js/bootstrap.js 100644 → 0
Too large (Show diff)
View
src/main/webapp/assets/vendors/bootstrap-theme-github-3.1.1/js/bootstrap.min.js 100644 → 0
Too large (Show diff)
View
src/test/scala/gitbucket/core/api/JsonFormatSpec.scala
Too large (Show diff)
View
src/test/scala/gitbucket/core/service/CommitStatusServiceSpec.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/ServiceSpecBase.scala
Too large (Show diff)