Browse code Merge branch 'account-full-name' of https://github.com/robinst/gitbucket into robinst-account-full-name Conflicts: src/main/scala/app/PullRequestsController.scala master
commit ebf4e5f2e9778be1b0c8a7c11ef6e1ca30ec2da6 2 parents 21c3058 + 13bff29 takezoe authored on 14 Oct 2013

Showing 12 changed files

• src/main/resources/update/1_7.sql
• src/main/scala/app/AccountController.scala
• src/main/scala/app/CreateRepositoryController.scala
• src/main/scala/app/PullRequestsController.scala
• src/main/scala/app/UserManagementController.scala
• src/main/scala/app/WikiController.scala
• src/main/scala/model/Account.scala
• src/main/scala/service/AccountService.scala
• src/main/scala/service/WikiService.scala
• src/main/scala/servlet/AutoUpdateListener.scala
• src/main/twirl/account/edit.scala.html
• src/main/twirl/admin/users/user.scala.html

Ignore Space Show notes View src/main/resources/update/1_7.sql 0 → 100644

Ignore Space Show notes View src/main/scala/app/AccountController.scala

Ignore Space Show notes View src/main/scala/app/CreateRepositoryController.scala

Ignore Space Show notes View src/main/scala/app/PullRequestsController.scala

Ignore Space Show notes View src/main/scala/app/UserManagementController.scala

Ignore Space Show notes View src/main/scala/app/WikiController.scala

Ignore Space Show notes View src/main/scala/model/Account.scala

Ignore Space Show notes View src/main/scala/service/AccountService.scala

Ignore Space Show notes View src/main/scala/service/WikiService.scala

Ignore Space Show notes View src/main/scala/servlet/AutoUpdateListener.scala

Ignore Space Show notes View src/main/twirl/account/edit.scala.html

Ignore Space Show notes View src/main/twirl/admin/users/user.scala.html

Show line notes below