Merge branch 'feature/new-branches-ui' of https://github.com/team-lab/gitbucket into team-lab-feature/new-branches-ui

Fork: 0

johnpearcey / gitbucket_jkp

Browse code Merge branch 'feature/new-branches-ui' of https://github.com/team-lab/gitbucket into team-lab-feature/new-branches-ui Conflicts: src/main/scala/service/PullRequestService.scala master
commit 20217058fe747bd8f210c45c22073802ce279bb7 2 parents e67365a + a417c37 Naoki Takezoe authored on 26 Feb 2015

Patch

Unified Split

Showing 6 changed files

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

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

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

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

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

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

Show line notes below