Merge branch 'master' of https://github.com/takezoe/gitbucket into css_bootstrap3

Fork: 0

johnpearcey / gitbucket_jkp

Browse code Merge branch 'master' of https://github.com/takezoe/gitbucket into css_bootstrap3 master
commit b7a9236283844af45143d0d123256a5afe09c623 2 parents ea37a34 + dc5cb74 Naoki Takezoe authored on 30 Nov 2015

Patch

Unified Split

Showing 13 changed files

Ignore Space Show notes View README.md

Ignore Space Show notes View project/build.scala

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

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

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/editor.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/danger.scala.html

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

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

Ignore Space Show notes View src/main/twirl/gitbucket/core/settings/hooks.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

Show line notes below