Merge branch 'master' into mysql_support
# Conflicts:
#	src/main/resources/update/3_13.sql
#	src/main/scala/gitbucket/core/servlet/AutoUpdate.scala
commit ad47ad42694a973c3737bbe73a37046373f17471
2 parents 0c50545 + 90b6309
@Naoki Takezoe Naoki Takezoe authored on 16 Apr 2016
Showing 6 changed files
View
src/main/resources/update/gitbucket-core_4.0.xml
View
src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
View
src/main/scala/gitbucket/core/model/WebHook.scala
View
src/main/scala/gitbucket/core/service/WebHookService.scala
View
src/main/twirl/gitbucket/core/settings/edithooks.scala.html
View
src/test/scala/gitbucket/core/service/WebHookServiceSpec.scala