Merge branch 'team-lab-feature/protected-branch'

Fork: 0

johnpearcey / gitbucket_jkp

Browse code Merge branch 'team-lab-feature/protected-branch' master
commit 5c12cca7f5877b64f271ce67a639ed7157308b33 2 parents c9f3ec1 + 206d597 Naoki Takezoe authored on 19 Jan 2016

Patch

Unified Split

Showing 36 changed files

Ignore Space Show notes View src/main/resources/update/3_11.sql 0 → 100644

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

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

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

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

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

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

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

Ignore Space Show notes View src/main/scala/gitbucket/core/service/CommitStatusService.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/ProtectedBranchService.scala 0 → 100644

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

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

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

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

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

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/mergeguide.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/branches.scala.html

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

Ignore Space Show notes View src/main/twirl/gitbucket/core/settings/branches.scala.html 0 → 100644

Ignore Space Show notes View src/main/twirl/gitbucket/core/settings/branchprotection.scala.html 0 → 100644

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

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

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

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

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

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

Show line notes below