Browse code Merge branch 'master' into slick-3.1-blocking Conflicts: src/main/scala/gitbucket/core/service/IssuesService.scala src/main/scala/gitbucket/core/service/RepositoryService.scala src/main/scala/gitbucket/core/util/DatabaseConfig.scala src/test/scala/gitbucket/core/service/ServiceSpecBase.scala master
commit 7fa921e7e58da325f02569323d397dbd52f10aba 2 parents 5a94125 + d619726 Naoki Takezoe authored on 11 Nov 2016

Showing 89 changed files

• README.md
• build.sbt
• doc/release.md
• project/build.properties
• release/deploy-assembly-jar.sh
• release/env.sh
• release/pom.xml
• sbt-launch-0.13.12.jar
• sbt-launch-0.13.9.jar
• sbt.bat
• sbt.sh
• src/main/java/JettyLauncher.java
• src/main/resources/update/gitbucket-core_4.6.xml
• src/main/resources/update/gitbucket-core_4.7.sql
• src/main/resources/update/gitbucket-core_4.7.xml
• src/main/scala/ScalatraBootstrap.scala
• src/main/scala/gitbucket/core/GitBucketCoreModule.scala
• src/main/scala/gitbucket/core/api/ApiContents.scala
• src/main/scala/gitbucket/core/api/ApiUser.scala
• src/main/scala/gitbucket/core/controller/AccountController.scala
• src/main/scala/gitbucket/core/controller/ApiController.scala
• src/main/scala/gitbucket/core/controller/ControllerBase.scala
• src/main/scala/gitbucket/core/controller/FileUploadController.scala
• src/main/scala/gitbucket/core/controller/IndexController.scala
• src/main/scala/gitbucket/core/controller/IssuesController.scala
• src/main/scala/gitbucket/core/controller/LabelsController.scala
• src/main/scala/gitbucket/core/controller/MilestonesController.scala
• src/main/scala/gitbucket/core/controller/PullRequestsController.scala
• src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
• src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
• src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
• src/main/scala/gitbucket/core/controller/WikiController.scala
• src/main/scala/gitbucket/core/model/Collaborator.scala
• src/main/scala/gitbucket/core/model/Repository.scala
• src/main/scala/gitbucket/core/service/AccountService.scala
• src/main/scala/gitbucket/core/service/HandleCommentService.scala
• src/main/scala/gitbucket/core/service/IssuesService.scala
• src/main/scala/gitbucket/core/service/RepositoryCreationService.scala
• src/main/scala/gitbucket/core/service/RepositoryService.scala
• src/main/scala/gitbucket/core/service/RequestCache.scala
• src/main/scala/gitbucket/core/service/SystemSettingsService.scala
• src/main/scala/gitbucket/core/servlet/GHCompatRepositoryAccessFilter.scala
• src/main/scala/gitbucket/core/servlet/TransactionFilter.scala
• src/main/scala/gitbucket/core/ssh/GitCommand.scala
• src/main/scala/gitbucket/core/util/Authenticator.scala
• src/main/scala/gitbucket/core/util/DatabaseConfig.scala
• src/main/scala/gitbucket/core/util/JGitUtil.scala
• src/main/scala/gitbucket/core/util/Notifier.scala
• src/main/scala/gitbucket/core/util/StringUtil.scala
• src/main/scala/gitbucket/core/view/LinkConverter.scala
• src/main/scala/gitbucket/core/view/Markdown.scala
• src/main/twirl/gitbucket/core/account/group.scala.html
• src/main/twirl/gitbucket/core/account/members.scala.html
• src/main/twirl/gitbucket/core/admin/usergroup.scala.html
• src/main/twirl/gitbucket/core/dashboard/issues.scala.html
• src/main/twirl/gitbucket/core/dashboard/issuesnavi.scala.html
• src/main/twirl/gitbucket/core/dashboard/pulls.scala.html
• src/main/twirl/gitbucket/core/helper/account.scala.html
• src/main/twirl/gitbucket/core/helper/branchcontrol.scala.html
• src/main/twirl/gitbucket/core/helper/commitcomment.scala.html
• src/main/twirl/gitbucket/core/helper/dropdown.scala.html
• src/main/twirl/gitbucket/core/issues/commentform.scala.html
• src/main/twirl/gitbucket/core/issues/commentlist.scala.html
• src/main/twirl/gitbucket/core/issues/create.scala.html
• src/main/twirl/gitbucket/core/issues/issue.scala.html
• src/main/twirl/gitbucket/core/issues/issueinfo.scala.html
• src/main/twirl/gitbucket/core/issues/list.scala.html
• src/main/twirl/gitbucket/core/issues/listparts.scala.html
• src/main/twirl/gitbucket/core/main.scala.html
• src/main/twirl/gitbucket/core/menu.scala.html
• src/main/twirl/gitbucket/core/pulls/conversation.scala.html
• src/main/twirl/gitbucket/core/pulls/pullreq.scala.html
• src/main/twirl/gitbucket/core/repo/blob.scala.html
• src/main/twirl/gitbucket/core/repo/files.scala.html
• src/main/twirl/gitbucket/core/settings/collaborators.scala.html
• src/main/twirl/gitbucket/core/settings/danger.scala.html
• src/main/twirl/gitbucket/core/settings/options.scala.html
• src/main/twirl/gitbucket/core/wiki/compare.scala.html
• src/main/twirl/gitbucket/core/wiki/edit.scala.html
• src/main/twirl/gitbucket/core/wiki/history.scala.html
• src/main/twirl/gitbucket/core/wiki/page.scala.html
• src/main/twirl/gitbucket/core/wiki/pages.scala.html
• src/main/webapp/WEB-INF/web.xml
• src/main/webapp/assets/common/css/gitbucket.css
• src/main/webapp/assets/common/images/gitbucket.png
• src/main/webapp/assets/common/js/gitbucket.js
• src/test/scala/gitbucket/core/service/ProtectedBranchServiceSpec.scala
• src/test/scala/gitbucket/core/service/PullRequestServiceSpec.scala
• src/test/scala/gitbucket/core/service/ServiceSpecBase.scala

Ignore Space Show notes View README.md

Ignore Space Show notes View build.sbt

Ignore Space Show notes View doc/release.md

Ignore Space Show notes View project/build.properties

Show notes View release/deploy-assembly-jar.sh 100755 → 0

Show notes View release/env.sh 100644 → 0

Show notes View release/pom.xml 100644 → 0

Ignore Space Show notes View sbt-launch-0.13.12.jar 0 → 100644
Not supported

Show notes View sbt-launch-0.13.9.jar 100644 → 0
Not supported

Ignore Space Show notes View sbt.bat

Ignore Space Show notes View sbt.sh

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

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

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

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

Ignore Space Show notes View src/main/scala/ScalatraBootstrap.scala

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

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

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

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/LabelsController.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/MilestonesController.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/controller/WikiController.scala

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

Ignore Space Show notes View src/main/scala/gitbucket/core/model/Repository.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/IssuesService.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/service/RepositoryCreationService.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/RequestCache.scala

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

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

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/util/Authenticator.scala

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

Ignore Space Show notes View src/main/scala/gitbucket/core/util/JGitUtil.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/LinkConverter.scala

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

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/members.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/dashboard/issues.scala.html

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

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

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

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

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

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

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

Ignore Space Show notes View src/main/twirl/gitbucket/core/issues/commentlist.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/issue.scala.html

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

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

Ignore Space Show notes View src/main/twirl/gitbucket/core/issues/listparts.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/menu.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/pulls/pullreq.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/settings/collaborators.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/settings/danger.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/wiki/compare.scala.html

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

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

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

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

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

Ignore Space Show notes View src/main/webapp/assets/common/css/gitbucket.css

Ignore Space Show notes View src/main/webapp/assets/common/images/gitbucket.png

Ignore Space Show notes View src/main/webapp/assets/common/js/gitbucket.js

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

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

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

Show line notes below