Browse code Merge branch 'master' into toggle_gravatar Conflicts: src/main/scala/view/AvatarImageProvider.scala master
commit b31b7e1e86a786a814e5861dba9566e543d6eb26 2 parents b61836a + cfb2f5b takezoe authored on 5 Aug 2013

Showing 60 changed files

• README.md
• etc/gitbucket.erd
• etc/icons.svg
• gitbucket.erd
• lib/scalatra-forms_2.10-0.0.1.jar
• project/build.scala
• project/plugins.sbt
• src/main/resources/update/1_4.sql
• src/main/resources/update/1_5.sql
• src/main/scala/ScalatraBootstrap.scala
• src/main/scala/app/AccountController.scala
• src/main/scala/app/ControllerBase.scala
• src/main/scala/app/CreateRepositoryController.scala
• src/main/scala/app/DashboardController.scala
• src/main/scala/app/IndexController.scala
• src/main/scala/app/IssuesController.scala
• src/main/scala/app/PullRequestsController.scala
• src/main/scala/app/RepositorySettingsController.scala
• src/main/scala/app/RepositoryViewerController.scala
• src/main/scala/app/SearchController.scala
• src/main/scala/app/WikiController.scala
• src/main/scala/model/Issue.scala
• src/main/scala/model/PullRequest.scala
• src/main/scala/model/Repository.scala
• src/main/scala/service/ActivityService.scala
• src/main/scala/service/IssuesService.scala
• src/main/scala/service/PullRequestService.scala
• src/main/scala/service/RepositoryService.scala
• src/main/scala/service/WikiService.scala
• src/main/scala/servlet/AutoUpdateListener.scala
• src/main/scala/util/JGitUtil.scala
• src/main/scala/util/LockUtil.scala
• src/main/scala/view/AvatarImageProvider.scala
• src/main/scala/view/helpers.scala
• src/main/twirl/account/repositories.scala.html
• src/main/twirl/dashboard/issues.scala.html
• src/main/twirl/dashboard/tab.scala.html
• src/main/twirl/header.scala.html
• src/main/twirl/helper/dropdown.scala.html
• src/main/twirl/index.scala.html
• src/main/twirl/issues/commentform.scala.html
• src/main/twirl/issues/commentlist.scala.html
• src/main/twirl/issues/issue.scala.html
• src/main/twirl/issues/issuedetail.scala.html
• src/main/twirl/issues/listparts.scala.html
• src/main/twirl/pulls/commits.scala.html
• src/main/twirl/pulls/compare.scala.html
• src/main/twirl/pulls/discussion.scala.html
• src/main/twirl/pulls/files.scala.html
• src/main/twirl/pulls/list.scala.html
• src/main/twirl/pulls/pullreq.scala.html
• src/main/twirl/repo/forked.scala.html
• src/main/twirl/repo/tab.scala.html
• src/main/twirl/settings/options.scala.html
• src/main/webapp/WEB-INF/web.xml
• src/main/webapp/assets/common/css/gitbucket.css
• src/main/webapp/assets/common/images/issue-closed.png
• src/main/webapp/assets/common/images/issue-open.png
• src/main/webapp/assets/common/images/pullreq-closed.png
• src/main/webapp/assets/common/images/pullreq-open.png

Ignore Space Show notes View README.md

Ignore Space Show notes View etc/gitbucket.erd 0 → 100644
Too large (Show diff)

Ignore Space Show notes View etc/icons.svg 0 → 100644

Show notes View gitbucket.erd 100644 → 0
Too large (Show diff)

Show notes View lib/scalatra-forms_2.10-0.0.1.jar 100644 → 0
Not supported

Ignore Space Show notes View project/build.scala

Ignore Space Show notes View project/plugins.sbt

Ignore Space Show notes View src/main/resources/update/1_4.sql

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

Ignore Space Show notes View src/main/scala/ScalatraBootstrap.scala

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View src/main/scala/model/PullRequest.scala 0 → 100644

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

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

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

Ignore Space Show notes View src/main/scala/service/PullRequestService.scala 0 → 100644

Ignore Space Show notes View src/main/scala/service/RepositoryService.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/scala/util/JGitUtil.scala

Ignore Space Show notes View src/main/scala/util/LockUtil.scala 0 → 100644

Ignore Space Show notes View src/main/scala/view/AvatarImageProvider.scala

Ignore Space Show notes View src/main/scala/view/helpers.scala

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

Ignore Space Show notes View src/main/twirl/dashboard/issues.scala.html

Ignore Space Show notes View src/main/twirl/dashboard/tab.scala.html

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

Ignore Space Show notes View src/main/twirl/helper/dropdown.scala.html

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

Ignore Space Show notes View src/main/twirl/issues/commentform.scala.html 0 → 100644

Ignore Space Show notes View src/main/twirl/issues/commentlist.scala.html 0 → 100644

Ignore Space Show notes View src/main/twirl/issues/issue.scala.html

Ignore Space Show notes View src/main/twirl/issues/issuedetail.scala.html 0 → 100644

Ignore Space Show notes View src/main/twirl/issues/listparts.scala.html

Ignore Space Show notes View src/main/twirl/pulls/commits.scala.html 0 → 100644

Ignore Space Show notes View src/main/twirl/pulls/compare.scala.html 0 → 100644

Ignore Space Show notes View src/main/twirl/pulls/discussion.scala.html 0 → 100644

Ignore Space Show notes View src/main/twirl/pulls/files.scala.html 0 → 100644

Ignore Space Show notes View src/main/twirl/pulls/list.scala.html 0 → 100644

Ignore Space Show notes View src/main/twirl/pulls/pullreq.scala.html 0 → 100644

Ignore Space Show notes View src/main/twirl/repo/forked.scala.html 0 → 100644

Ignore Space Show notes View src/main/twirl/repo/tab.scala.html

Ignore Space Show notes View src/main/twirl/settings/options.scala.html

Ignore Space Show notes View src/main/webapp/WEB-INF/web.xml

Ignore Space Show notes View src/main/webapp/assets/common/css/gitbucket.css

Ignore Space Show notes View src/main/webapp/assets/common/images/issue-closed.png 0 → 100644

Ignore Space Show notes View src/main/webapp/assets/common/images/issue-open.png 0 → 100644

Ignore Space Show notes View src/main/webapp/assets/common/images/pullreq-closed.png 0 → 100644

Ignore Space Show notes View src/main/webapp/assets/common/images/pullreq-open.png 0 → 100644

Show line notes below