Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-02 03:26:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master'

Browse Source 
Conflicts:
	build.sbt
	src/main/scala/gitbucket/core/model/CommitStatus.scala
	src/main/scala/gitbucket/core/service/CommitStatusService.scala
	src/main/scala/gitbucket/core/service/CommitsService.scala
	src/main/scala/gitbucket/core/service/IssuesService.scala
	src/main/scala/gitbucket/core/service/RepositoryService.scala
	src/main/scala/gitbucket/core/util/Notifier.scala
This commit is contained in:
Naoki Takezoe
2017-02-06 10:32:29 +09:00
parent cad4d76138 d3afb35fb0
commit e72a192e4a
82 changed files with 1710 additions and 3733 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
project/plugins.sbt
View File

@@ -5,3 +5,4 @@ addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3")
addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "2.1.1")
addSbtPlugin("fi.gekkio.sbtplugins" % "sbt-jrebel-plugin" % "0.10.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3")
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M15")