Browse code Merge branch 'master' into feature/blame Conflicts: src/main/scala/gitbucket/core/util/JGitUtil.scala master
commit d8d18ed25c5996d24866639bd237813136deb3e8 2 parents 83fd264 + 73766f1 nazoking authored on 28 Mar 2015

Showing 116 changed files

• .travis.yml
• build.xml
• doc/activity.md
• doc/auto_update.md
• doc/comment_action.md
• doc/directory.md
• doc/how_to_run.md
• doc/notification.md
• doc/readme.md
• doc/validation.md
• embed-jetty/jetty-continuation-8.1.16.v20140903.jar
• embed-jetty/jetty-continuation-8.1.8.v20121106.jar
• embed-jetty/jetty-http-8.1.16.v20140903.jar
• embed-jetty/jetty-http-8.1.8.v20121106.jar
• embed-jetty/jetty-io-8.1.16.v20140903.jar
• embed-jetty/jetty-io-8.1.8.v20121106.jar
• embed-jetty/jetty-security-8.1.16.v20140903.jar
• embed-jetty/jetty-security-8.1.8.v20121106.jar
• embed-jetty/jetty-server-8.1.16.v20140903.jar
• embed-jetty/jetty-server-8.1.8.v20121106.jar
• embed-jetty/jetty-servlet-8.1.16.v20140903.jar
• embed-jetty/jetty-servlet-8.1.8.v20121106.jar
• embed-jetty/jetty-util-8.1.16.v20140903.jar
• embed-jetty/jetty-util-8.1.8.v20121106.jar
• embed-jetty/jetty-webapp-8.1.16.v20140903.jar
• embed-jetty/jetty-webapp-8.1.8.v20121106.jar
• embed-jetty/jetty-xml-8.1.16.v20140903.jar
• embed-jetty/jetty-xml-8.1.8.v20121106.jar
• embed-jetty/update.sh
• project/build.properties
• project/build.scala
• project/plugins.sbt
• sbt-launch-0.13.5.jar
• sbt-launch-0.13.8.jar
• sbt.bat
• sbt.sh
• src/main/resources/update/3_1.sql
• src/main/scala/ScalatraBootstrap.scala
• src/main/scala/gitbucket/core/api/ApiCombinedCommitStatus.scala
• src/main/scala/gitbucket/core/api/ApiComment.scala
• src/main/scala/gitbucket/core/api/ApiCommit.scala
• src/main/scala/gitbucket/core/api/ApiCommitListItem.scala
• src/main/scala/gitbucket/core/api/ApiCommitStatus.scala
• src/main/scala/gitbucket/core/api/ApiError.scala
• src/main/scala/gitbucket/core/api/ApiIssue.scala
• src/main/scala/gitbucket/core/api/ApiPath.scala
• src/main/scala/gitbucket/core/api/ApiPersonIdent.scala
• src/main/scala/gitbucket/core/api/ApiPullRequest.scala
• src/main/scala/gitbucket/core/api/ApiRepository.scala
• src/main/scala/gitbucket/core/api/ApiUser.scala
• src/main/scala/gitbucket/core/api/CreateAComment.scala
• src/main/scala/gitbucket/core/api/CreateAStatus.scala
• src/main/scala/gitbucket/core/api/JsonFormat.scala
• src/main/scala/gitbucket/core/controller/AccountController.scala
• src/main/scala/gitbucket/core/controller/ControllerBase.scala
• src/main/scala/gitbucket/core/controller/IndexController.scala
• src/main/scala/gitbucket/core/controller/IssuesController.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/UserManagementController.scala
• src/main/scala/gitbucket/core/controller/WikiController.scala
• src/main/scala/gitbucket/core/model/AccessToken.scala
• src/main/scala/gitbucket/core/model/BasicTemplate.scala
• src/main/scala/gitbucket/core/model/CommitStatus.scala
• src/main/scala/gitbucket/core/model/Profile.scala
• src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
• src/main/scala/gitbucket/core/service/AccesTokenService.scala
• src/main/scala/gitbucket/core/service/AccountService.scala
• src/main/scala/gitbucket/core/service/CommitStatusService.scala
• src/main/scala/gitbucket/core/service/IssuesService.scala
• src/main/scala/gitbucket/core/service/MergeService.scala
• src/main/scala/gitbucket/core/service/PullRequestService.scala
• src/main/scala/gitbucket/core/service/RepositoryService.scala
• src/main/scala/gitbucket/core/service/WebHookService.scala
• src/main/scala/gitbucket/core/service/WikiService.scala
• src/main/scala/gitbucket/core/servlet/AccessTokenAuthenticationFilter.scala
• src/main/scala/gitbucket/core/servlet/BasicAuthenticationFilter.scala
• src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
• src/main/scala/gitbucket/core/servlet/InitializeListener.scala
• src/main/scala/gitbucket/core/servlet/TransactionFilter.scala
• src/main/scala/gitbucket/core/util/Implicits.scala
• src/main/scala/gitbucket/core/util/JGitUtil.scala
• src/main/scala/gitbucket/core/util/Keys.scala
• src/main/scala/gitbucket/core/util/RepoitoryName.scala
• src/main/scala/gitbucket/core/util/StringUtil.scala
• src/main/scala/gitbucket/core/view/helpers.scala
• src/main/twirl/gitbucket/core/account/application.scala.html
• src/main/twirl/gitbucket/core/account/edit.scala.html
• src/main/twirl/gitbucket/core/account/menu.scala.html
• src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html
• src/main/twirl/gitbucket/core/helper/commitcomment.scala.html
• src/main/twirl/gitbucket/core/helper/diff.scala.html
• src/main/twirl/gitbucket/core/issues/commentlist.scala.html
• src/main/twirl/gitbucket/core/issues/commitstatus.scala.html
• src/main/twirl/gitbucket/core/issues/listparts.scala.html
• src/main/twirl/gitbucket/core/issues/milestones/list.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/mergeguide.scala.html
• src/main/twirl/gitbucket/core/repo/delete.scala.html
• src/main/twirl/gitbucket/core/repo/editor.scala.html
• src/main/twirl/gitbucket/core/repo/forked.scala.html
• src/main/webapp/assets/common/css/gitbucket.css
• src/main/webapp/assets/common/js/gitbucket.js
• src/main/webapp/assets/vendors/jsdifflib/diffview.css
• src/test/scala/gitbucket/core/api/JsonFormatSpec.scala
• src/test/scala/gitbucket/core/model/CommitStateSpec.scala
• src/test/scala/gitbucket/core/service/AccessTokenServiceSpec.scala
• src/test/scala/gitbucket/core/service/CommitStateServiceSpec.scala
• src/test/scala/gitbucket/core/service/IssuesServiceSpec.scala
• src/test/scala/gitbucket/core/service/MergeServiceSpec.scala
• src/test/scala/gitbucket/core/service/RepositoryServiceSpec.scala
• src/test/scala/gitbucket/core/service/ServiceSpecBase.scala
• src/test/scala/gitbucket/core/service/WebHookServiceSpec.scala
• src/test/scala/gitbucket/core/util/DirectorySpec.scala

Ignore Space Show notes View .travis.yml
Too large (Show diff)

Ignore Space Show notes View build.xml
Too large (Show diff)

Ignore Space Show notes View doc/activity.md 0 → 100644
Too large (Show diff)

Ignore Space Show notes View doc/auto_update.md 0 → 100644
Too large (Show diff)

Ignore Space Show notes View doc/comment_action.md 0 → 100644
Too large (Show diff)

Ignore Space Show notes View doc/directory.md 0 → 100644
Too large (Show diff)

Ignore Space Show notes View doc/how_to_run.md 0 → 100644
Too large (Show diff)

Ignore Space Show notes View doc/notification.md 0 → 100644
Too large (Show diff)

Ignore Space Show notes View doc/readme.md 0 → 100644
Too large (Show diff)

Ignore Space Show notes View doc/validation.md 0 → 100644
Too large (Show diff)

Ignore Space Show notes View embed-jetty/jetty-continuation-8.1.16.v20140903.jar 0 → 100644
Too large (Show diff)

Show notes View embed-jetty/jetty-continuation-8.1.8.v20121106.jar 100644 → 0
Too large (Show diff)

Ignore Space Show notes View embed-jetty/jetty-http-8.1.16.v20140903.jar 0 → 100644
Too large (Show diff)

Show notes View embed-jetty/jetty-http-8.1.8.v20121106.jar 100644 → 0
Too large (Show diff)

Ignore Space Show notes View embed-jetty/jetty-io-8.1.16.v20140903.jar 0 → 100644
Too large (Show diff)

Show notes View embed-jetty/jetty-io-8.1.8.v20121106.jar 100644 → 0
Too large (Show diff)

Ignore Space Show notes View embed-jetty/jetty-security-8.1.16.v20140903.jar 0 → 100644
Too large (Show diff)

Show notes View embed-jetty/jetty-security-8.1.8.v20121106.jar 100644 → 0
Too large (Show diff)

Ignore Space Show notes View embed-jetty/jetty-server-8.1.16.v20140903.jar 0 → 100644
Too large (Show diff)

Show notes View embed-jetty/jetty-server-8.1.8.v20121106.jar 100644 → 0
Too large (Show diff)

Ignore Space Show notes View embed-jetty/jetty-servlet-8.1.16.v20140903.jar 0 → 100644
Too large (Show diff)

Show notes View embed-jetty/jetty-servlet-8.1.8.v20121106.jar 100644 → 0
Too large (Show diff)

Ignore Space Show notes View embed-jetty/jetty-util-8.1.16.v20140903.jar 0 → 100644
Too large (Show diff)

Show notes View embed-jetty/jetty-util-8.1.8.v20121106.jar 100644 → 0
Too large (Show diff)

Ignore Space Show notes View embed-jetty/jetty-webapp-8.1.16.v20140903.jar 0 → 100644
Too large (Show diff)

Show notes View embed-jetty/jetty-webapp-8.1.8.v20121106.jar 100644 → 0
Too large (Show diff)

Ignore Space Show notes View embed-jetty/jetty-xml-8.1.16.v20140903.jar 0 → 100644
Too large (Show diff)

Show notes View embed-jetty/jetty-xml-8.1.8.v20121106.jar 100644 → 0
Too large (Show diff)

Ignore Space Show notes View embed-jetty/update.sh 0 → 100755
Too large (Show diff)

Ignore Space Show notes View project/build.properties
Too large (Show diff)

Ignore Space Show notes View project/build.scala
Too large (Show diff)

Ignore Space Show notes View project/plugins.sbt
Too large (Show diff)

Show notes View sbt-launch-0.13.5.jar 100644 → 0
Too large (Show diff)

Ignore Space Show notes View sbt-launch-0.13.8.jar 0 → 100644
Too large (Show diff)

Ignore Space Show notes View sbt.bat
Too large (Show diff)

Ignore Space Show notes View sbt.sh
Too large (Show diff)

Ignore Space Show notes View src/main/resources/update/3_1.sql 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/main/scala/ScalatraBootstrap.scala
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/api/ApiCombinedCommitStatus.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/api/ApiComment.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/api/ApiCommit.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/api/ApiCommitListItem.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/api/ApiCommitStatus.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/api/ApiError.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/api/ApiIssue.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/api/ApiPath.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/api/ApiPersonIdent.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/api/ApiPullRequest.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/api/ApiRepository.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/api/ApiUser.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/api/CreateAComment.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/api/CreateAStatus.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/api/JsonFormat.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/AccountController.scala
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/ControllerBase.scala
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/IndexController.scala
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/IssuesController.scala
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/PullRequestsController.scala
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/UserManagementController.scala
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/WikiController.scala
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/model/AccessToken.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/model/BasicTemplate.scala
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/model/CommitStatus.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/model/Profile.scala
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/service/AccesTokenService.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/service/AccountService.scala
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/service/CommitStatusService.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/service/IssuesService.scala
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/service/MergeService.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/service/PullRequestService.scala
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/service/RepositoryService.scala
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/service/WebHookService.scala
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/service/WikiService.scala
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/servlet/AccessTokenAuthenticationFilter.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/servlet/BasicAuthenticationFilter.scala
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/servlet/InitializeListener.scala
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/servlet/TransactionFilter.scala
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/util/Implicits.scala
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/util/JGitUtil.scala
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/util/Keys.scala
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/util/RepoitoryName.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/util/StringUtil.scala
Too large (Show diff)

Ignore Space Show notes View src/main/scala/gitbucket/core/view/helpers.scala
Too large (Show diff)

Ignore Space Show notes View src/main/twirl/gitbucket/core/account/application.scala.html 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/main/twirl/gitbucket/core/account/edit.scala.html
Too large (Show diff)

Ignore Space Show notes View src/main/twirl/gitbucket/core/account/menu.scala.html
Too large (Show diff)

Ignore Space Show notes View src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html
Too large (Show diff)

Ignore Space Show notes View src/main/twirl/gitbucket/core/helper/commitcomment.scala.html
Too large (Show diff)

Ignore Space Show notes View src/main/twirl/gitbucket/core/helper/diff.scala.html
Too large (Show diff)

Ignore Space Show notes View src/main/twirl/gitbucket/core/issues/commentlist.scala.html
Too large (Show diff)

Ignore Space Show notes View src/main/twirl/gitbucket/core/issues/commitstatus.scala.html 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/main/twirl/gitbucket/core/issues/listparts.scala.html
Too large (Show diff)

Ignore Space Show notes View src/main/twirl/gitbucket/core/issues/milestones/list.scala.html
Too large (Show diff)

Ignore Space Show notes View src/main/twirl/gitbucket/core/menu.scala.html
Too large (Show diff)

Ignore Space Show notes View src/main/twirl/gitbucket/core/pulls/conversation.scala.html
Too large (Show diff)

Ignore Space Show notes View src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
Too large (Show diff)

Ignore Space Show notes View src/main/twirl/gitbucket/core/repo/delete.scala.html
Too large (Show diff)

Ignore Space Show notes View src/main/twirl/gitbucket/core/repo/editor.scala.html
Too large (Show diff)

Ignore Space Show notes View src/main/twirl/gitbucket/core/repo/forked.scala.html
Too large (Show diff)

Ignore Space Show notes View src/main/webapp/assets/common/css/gitbucket.css
Too large (Show diff)

Ignore Space Show notes View src/main/webapp/assets/common/js/gitbucket.js
Too large (Show diff)

Ignore Space Show notes View src/main/webapp/assets/vendors/jsdifflib/diffview.css
Too large (Show diff)

Ignore Space Show notes View src/test/scala/gitbucket/core/api/JsonFormatSpec.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/test/scala/gitbucket/core/model/CommitStateSpec.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/test/scala/gitbucket/core/service/AccessTokenServiceSpec.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/test/scala/gitbucket/core/service/CommitStateServiceSpec.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/test/scala/gitbucket/core/service/IssuesServiceSpec.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/test/scala/gitbucket/core/service/MergeServiceSpec.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/test/scala/gitbucket/core/service/RepositoryServiceSpec.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/test/scala/gitbucket/core/service/ServiceSpecBase.scala
Too large (Show diff)

Ignore Space Show notes View src/test/scala/gitbucket/core/service/WebHookServiceSpec.scala 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/test/scala/gitbucket/core/util/DirectorySpec.scala 0 → 100644
Too large (Show diff)

Show line notes below