Merge branch 'master'

Fork: 0

johnpearcey / gitbucket_jkp

Browse code Merge branch 'master' Conflicts: build.sbt src/main/scala/gitbucket/core/model/CommitStatus.scala src/main/scala/gitbucket/core/service/CommitStatusService.scala src/main/scala/gitbucket/core/service/CommitsService.scala src/main/scala/gitbucket/core/service/IssuesService.scala src/main/scala/gitbucket/core/service/RepositoryService.scala src/main/scala/gitbucket/core/util/Notifier.scala master
commit e72a192e4a62e7c27ad2bbcd9ce8f282398ce076 2 parents cad4d76 + d3afb35 Naoki Takezoe authored on 6 Feb 2017

Browse code

Conflicts:
	build.sbt
	src/main/scala/gitbucket/core/model/CommitStatus.scala
	src/main/scala/gitbucket/core/service/CommitStatusService.scala
	src/main/scala/gitbucket/core/service/CommitsService.scala
	src/main/scala/gitbucket/core/service/IssuesService.scala
	src/main/scala/gitbucket/core/service/RepositoryService.scala
	src/main/scala/gitbucket/core/util/Notifier.scala

master

commit e72a192e4a62e7c27ad2bbcd9ce8f282398ce076

2 parents cad4d76 + d3afb35

Naoki Takezoe authored on 6 Feb 2017

Patch

Unified Split

Showing 83 changed files

Ignore Space Show notes View .github/CONTRIBUTING.md

Ignore Space Show notes View .github/PULL_REQUEST_TEMPLATE.md

Ignore Space Show notes View .travis.yml

Ignore Space Show notes View README.md

Ignore Space Show notes View build.sbt

Ignore Space Show notes View contrib/linux/redhat/README.md

Ignore Space Show notes View project/plugins.sbt

Ignore Space Show notes View project/project/plugins.sbt 0 → 100644

Ignore Space Show notes View src/main/java/JettyLauncher.java

Ignore Space Show notes View src/main/resources/update/gitbucket-core_4.9.xml 0 → 100644

Ignore Space Show notes View src/main/scala/gitbucket/core/GitBucketCoreModule.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/api/CreateAnIssue.scala 0 → 100644

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/AccountController.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/ApiController.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/ControllerBase.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/FileUploadController.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/IndexController.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/IssuesController.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/PullRequestsController.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/SystemSettingsController.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/model/Account.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/model/CommitStatus.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/service/AccountService.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/service/HandleCommentService.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/service/IssueCreationService.scala 0 → 100644

Ignore Space Show notes View src/main/scala/gitbucket/core/service/IssuesService.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/service/MergeService.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/service/RepositoryService.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/service/SystemSettingsService.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/service/WebHookService.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/servlet/ApiAuthenticationFilter.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/servlet/GitAuthenticationFilter.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/servlet/GitLfsTransferServlet.scala 0 → 100644

Ignore Space Show notes View src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/servlet/TransactionFilter.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/ssh/GitCommand.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/ssh/NoShell.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/util/ControlUtil.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/util/Directory.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/util/FileUtil.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/util/Implicits.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/util/JDBCUtil.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/util/Notifier.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/util/StringUtil.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/view/helpers.scala

Ignore Space Show notes View src/main/twirl/gitbucket/core/account/application.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/account/edit.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/account/group.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/account/main.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/account/newrepo.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/account/register.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/admin/system.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/admin/user.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/admin/usergroup.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/issues/create.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/issues/labels/edit.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/main.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/pulls/compare.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/pulls/conversation.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/repo/blob.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/repo/files.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/repo/guide.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/search/code.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/search/repositories.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/search/wiki.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/settings/edithooks.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/settings/options.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/signin.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/signinform.scala.html

Ignore Space Show notes View src/main/webapp/WEB-INF/web.xml

Ignore Space Show notes View src/main/webapp/assets/vendors/bootstrap-datetimepicker-4.17.44/css/bootstrap-datetimepicker.min.css 0 → 100644

Ignore Space Show notes View src/main/webapp/assets/vendors/bootstrap-datetimepicker-4.17.44/js/bootstrap-datetimepicker.min.js 0 → 100644

Ignore Space Show notes View src/main/webapp/assets/vendors/bootstrap-datetimepicker-4.17.44/js/moment.min.js 0 → 100644

Show notes View src/main/webapp/assets/vendors/datepicker/css/bootstrap-datetimepicker.min.css 100644 → 0

Show notes View src/main/webapp/assets/vendors/datepicker/js/bootstrap-datetimepicker.min.js 100644 → 0

Show notes View src/main/webapp/assets/vendors/datepicker/js/moment.js 100644 → 0
Too large (Show diff)

Ignore Space Show notes View src/test/scala/gitbucket/core/GitBucketCoreModuleSpec.scala

Ignore Space Show notes View src/test/scala/gitbucket/core/service/AccountServiceSpec.scala

Ignore Space Show notes View src/test/scala/gitbucket/core/service/ProtectedBranchServiceSpec.scala

Ignore Space Show notes View src/test/scala/gitbucket/core/service/ServiceSpecBase.scala

Ignore Space Show notes View src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala

Show line notes below