Merge branch 'master' into improve-pullreq-comments
commit a720c6bee4dcd9ae8334118170f1cde9f09eaa91
2 parents c0a7c35 + 2c201aa
@Naoki Takezoe Naoki Takezoe authored on 26 Apr 2018
Showing 12 changed files
View
src/main/resources/update/gitbucket-core_4.24.xml 0 → 100644
View
src/main/scala/gitbucket/core/GitBucketCoreModule.scala
View
src/main/scala/gitbucket/core/controller/AccountController.scala
View
src/main/scala/gitbucket/core/controller/ControllerBase.scala
View
src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
View
src/main/scala/gitbucket/core/model/AccountExtraMailAddress.scala 0 → 100644
View
src/main/scala/gitbucket/core/model/Profile.scala
View
src/main/scala/gitbucket/core/service/AccountService.scala
View
src/main/twirl/gitbucket/core/account/edit.scala.html
View
src/main/twirl/gitbucket/core/account/register.scala.html
View
src/main/twirl/gitbucket/core/admin/user.scala.html
View
src/main/webapp/assets/common/js/gitbucket.js