Browse code Merge branch 'master' into closing-issues-via-commit-messages Conflicts: src/main/scala/app/PullRequestsController.scala src/main/scala/servlet/GitRepositoryServlet.scala master
commit 8b5414c8f75b78765ae29e8db1f8afa0e7b9127a 2 parents dc78dc9 + 1f71619 odz authored on 24 Feb 2014

Showing 71 changed files

• .gitignore
• README.md
• contrib/macosx/gitbucket.plist
• etc/icons.svg
• project/build.scala
• src/main/java/JettyLauncher.java
• 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/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/SignInController.scala
• src/main/scala/app/SystemSettingsController.scala
• src/main/scala/app/WikiController.scala
• src/main/scala/service/AccountService.scala
• src/main/scala/service/IssuesService.scala
• src/main/scala/service/RepositoryService.scala
• src/main/scala/service/SystemSettingsService.scala
• src/main/scala/service/WikiService.scala
• src/main/scala/servlet/AutoUpdateListener.scala
• src/main/scala/servlet/GitRepositoryServlet.scala
• src/main/scala/util/ControlUtil.scala
• src/main/scala/util/Directory.scala
• src/main/scala/util/FileUtil.scala
• src/main/scala/util/JGitUtil.scala
• src/main/scala/util/LDAPUtil.scala
• src/main/scala/util/StringUtil.scala
• src/main/scala/view/Markdown.scala
• src/main/twirl/admin/system.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/commentlist.scala.html
• src/main/twirl/issues/editcomment.scala.html
• src/main/twirl/issues/editissue.scala.html
• src/main/twirl/issues/issue.scala.html
• src/main/twirl/issues/labels.scala.html
• src/main/twirl/main.scala.html
• src/main/twirl/newrepo.scala.html
• src/main/twirl/pulls/compare.scala.html
• src/main/twirl/pulls/discussion.scala.html
• src/main/twirl/pulls/pullreq.scala.html
• src/main/twirl/repo/blob.scala.html
• src/main/twirl/repo/branches.scala.html
• src/main/twirl/repo/files.scala.html
• src/main/twirl/repo/forked.scala.html
• src/main/twirl/settings/collaborators.scala.html
• src/main/twirl/settings/danger.scala.html
• src/main/twirl/settings/delete.scala.html
• src/main/twirl/settings/menu.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/link.png
• src/main/webapp/assets/common/images/repo_fork.png
• src/main/webapp/assets/common/images/repo_fork_lg.png
• src/main/webapp/assets/common/images/repo_private.png
• src/main/webapp/assets/common/images/repo_private_lg.png
• src/main/webapp/assets/common/images/repo_public.png
• src/main/webapp/assets/common/images/repo_public_lg.png
• src/main/webapp/assets/common/js/gitbucket.js
• src/main/webapp/assets/common/js/jquery.ba-hashchange.js
• src/main/webapp/assets/google-code-prettify/prettify.js
• src/main/webapp/assets/jsdifflib/diffview.css
• src/test/scala/view/AvatarImageProviderSpec.scala
• src/test/scala/view/GitBucketHtmlSerializerSpec.scala

Ignore Space Show notes View .gitignore

Ignore Space Show notes View README.md

Ignore Space Show notes View contrib/macosx/gitbucket.plist 0 → 100644

Ignore Space Show notes View etc/icons.svg

Ignore Space Show notes View project/build.scala

Ignore Space Show notes View src/main/java/JettyLauncher.java

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/IndexController.scala

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

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

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

Show notes View src/main/scala/app/SignInController.scala 100644 → 0

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

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

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

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

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

Ignore Space Show notes View src/main/scala/service/SystemSettingsService.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/servlet/GitRepositoryServlet.scala

Ignore Space Show notes View src/main/scala/util/ControlUtil.scala

Ignore Space Show notes View src/main/scala/util/Directory.scala

Ignore Space Show notes View src/main/scala/util/FileUtil.scala

Ignore Space Show notes View src/main/scala/util/JGitUtil.scala

Ignore Space Show notes View src/main/scala/util/LDAPUtil.scala

Ignore Space Show notes View src/main/scala/util/StringUtil.scala

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

Ignore Space Show notes View src/main/twirl/admin/system.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/commentlist.scala.html

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View src/main/twirl/settings/danger.scala.html 0 → 100644

Show notes View src/main/twirl/settings/delete.scala.html 100644 → 0

Ignore Space Show notes View src/main/twirl/settings/menu.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/link.png 0 → 100644

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

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

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

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

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

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

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

Ignore Space Show notes View src/main/webapp/assets/common/js/jquery.ba-hashchange.js 0 → 100644

Ignore Space Show notes View src/main/webapp/assets/google-code-prettify/prettify.js

Ignore Space Show notes View src/main/webapp/assets/jsdifflib/diffview.css

Ignore Space Show notes View src/test/scala/view/AvatarImageProviderSpec.scala

Ignore Space Show notes View src/test/scala/view/GitBucketHtmlSerializerSpec.scala 0 → 100644

Show line notes below