Merge branch 'webhook-content-type' of https://github.com/McFoggy/gitbucket into McFoggy-webhook-content-type

Fork: 0

johnpearcey / gitbucket_jkp

Browse code Merge branch 'webhook-content-type' of https://github.com/McFoggy/gitbucket into McFoggy-webhook-content-type # Conflicts: # src/main/scala/gitbucket/core/service/WebHookService.scala # src/main/twirl/gitbucket/core/settings/edithooks.scala.html master
commit 1d9fe5770efa6c5c5ace318fbffab7070a352e9b 2 parents ec307b8 + 6431d25 Naoki Takezoe authored on 15 Apr 2016

Patch

Unified Split

Showing 7 changed files

Ignore Space Show notes View src/main/resources/update/3_13.sql

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

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

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

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

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

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

Show line notes below