Merge branch 'master' into #33

Fork: 0

johnpearcey / gitbucket_jkp

Browse code Merge branch 'master' into #33_match-by-email Conflicts: src/main/scala/util/JGitUtil.scala src/main/scala/view/helpers.scala src/main/twirl/repo/blob.scala.html src/main/twirl/repo/commit.scala.html src/main/twirl/repo/commits.scala.html src/main/twirl/repo/files.scala.html master
commit 000afa1ed61e8ba8c706a1a3ee4d245b9206cebe 2 parents 828688d + 323e259 takezoe authored on 18 Jul 2013

Browse code

Merge branch 'master' into #33_match-by-email

Conflicts:
	src/main/scala/util/JGitUtil.scala
	src/main/scala/view/helpers.scala
	src/main/twirl/repo/blob.scala.html
	src/main/twirl/repo/commit.scala.html
	src/main/twirl/repo/commits.scala.html
	src/main/twirl/repo/files.scala.html

master

commit 000afa1ed61e8ba8c706a1a3ee4d245b9206cebe

2 parents 828688d + 323e259

takezoe authored on 18 Jul 2013

Patch

Unified Split

Showing 35 changed files

Ignore Space Show notes View LICENSE 0 → 100644

Ignore Space Show notes View README.md

Ignore Space Show notes View src/main/resources/noimage.png

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View src/main/scala/view/LinkConverter.scala 0 → 100644

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View src/main/webapp/assets/zclip/ZeroClipboard.min.js 0 → 100644

Ignore Space Show notes View src/main/webapp/assets/zclip/ZeroClipboard.swf 0 → 100644
Not supported

Show line notes below