Browse code Merge branch 'slick-3.1-blocking' Conflicts: build.sbt master
commit 5698692b26c51bcbcd5c85c4626360a533007bee 2 parents 47a5535 + 7fa921e Naoki Takezoe authored on 14 Dec 2016

Showing 50 changed files

• build.sbt
• src/main/scala/gitbucket/core/model/AccessToken.scala
• src/main/scala/gitbucket/core/model/Account.scala
• src/main/scala/gitbucket/core/model/Activity.scala
• src/main/scala/gitbucket/core/model/BasicTemplate.scala
• src/main/scala/gitbucket/core/model/Collaborator.scala
• src/main/scala/gitbucket/core/model/Comment.scala
• src/main/scala/gitbucket/core/model/CommitStatus.scala
• src/main/scala/gitbucket/core/model/GroupMembers.scala
• src/main/scala/gitbucket/core/model/Issue.scala
• src/main/scala/gitbucket/core/model/IssueLabels.scala
• src/main/scala/gitbucket/core/model/Labels.scala
• src/main/scala/gitbucket/core/model/Milestone.scala
• src/main/scala/gitbucket/core/model/Profile.scala
• src/main/scala/gitbucket/core/model/ProtectedBranch.scala
• src/main/scala/gitbucket/core/model/PullRequest.scala
• src/main/scala/gitbucket/core/model/Repository.scala
• src/main/scala/gitbucket/core/model/SshKey.scala
• src/main/scala/gitbucket/core/model/WebHook.scala
• src/main/scala/gitbucket/core/model/WebHookEvent.scala
• src/main/scala/gitbucket/core/plugin/ReceiveHook.scala
• src/main/scala/gitbucket/core/plugin/Sessions.scala
• src/main/scala/gitbucket/core/service/AccessTokenService.scala
• src/main/scala/gitbucket/core/service/AccountService.scala
• src/main/scala/gitbucket/core/service/ActivityService.scala
• src/main/scala/gitbucket/core/service/CommitStatusService.scala
• src/main/scala/gitbucket/core/service/CommitsService.scala
• src/main/scala/gitbucket/core/service/HandleCommentService.scala
• src/main/scala/gitbucket/core/service/IssuesService.scala
• src/main/scala/gitbucket/core/service/LabelsService.scala
• src/main/scala/gitbucket/core/service/MergeService.scala
• src/main/scala/gitbucket/core/service/MilestonesService.scala
• src/main/scala/gitbucket/core/service/ProtectedBranchService.scala
• src/main/scala/gitbucket/core/service/PullRequestService.scala
• src/main/scala/gitbucket/core/service/RepositoryCreationService.scala
• src/main/scala/gitbucket/core/service/RepositorySearchService.scala
• src/main/scala/gitbucket/core/service/RepositoryService.scala
• src/main/scala/gitbucket/core/service/SshKeyService.scala
• src/main/scala/gitbucket/core/service/WebHookService.scala
• src/main/scala/gitbucket/core/servlet/InitializeListener.scala
• src/main/scala/gitbucket/core/servlet/TransactionFilter.scala
• src/main/scala/gitbucket/core/ssh/GitCommand.scala
• src/main/scala/gitbucket/core/ssh/PublicKeyAuthenticator.scala
• src/main/scala/gitbucket/core/util/DatabaseConfig.scala
• src/main/scala/gitbucket/core/util/Notifier.scala
• src/main/scala/gitbucket/core/util/StringUtil.scala
• src/test/scala/gitbucket/core/service/AccessTokenServiceSpec.scala
• src/test/scala/gitbucket/core/service/CommitStatusServiceSpec.scala
• src/test/scala/gitbucket/core/service/IssuesServiceSpec.scala
• src/test/scala/gitbucket/core/service/ServiceSpecBase.scala

Ignore Space Show notes View build.sbt

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View src/main/scala/gitbucket/core/service/PullRequestService.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/RepositorySearchService.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/SshKeyService.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/InitializeListener.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/PublicKeyAuthenticator.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/Notifier.scala

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

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

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

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

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

Show line notes below