Merge branch 'master' into pr-new-hooks

takezoe · web-flow · commit 6de44b14f633 · 2018-06-30T01:49:46.000+09:00
diff --git a/build.sbt b/build.sbt
@@ -1,5 +1,5 @@
 name := "gitbucket-notifications-plugin"
 organization := "io.github.gitbucket"
-version := "1.5.0"
-scalaVersion := "2.12.4"
+version := "1.5.1"
+scalaVersion := "2.12.6"
 gitbucketVersion := "4.25.0"
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.1.1
+sbt.version=1.1.6
diff --git a/src/main/scala/Plugin.scala b/src/main/scala/Plugin.scala
@@ -28,7 +28,8 @@ class Plugin extends gitbucket.core.plugin.Plugin {
       new LiquibaseMigration("update/gitbucket-notifications_1.3.xml")
     ),
     new Version("1.4.0"),
-    new Version("1.5.0")
+    new Version("1.5.0"),
+    new Version("1.5.1")
   )
 
   override val controllers = Seq(

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,8 @@ class Plugin extends gitbucket.core.plugin.Plugin {`
`28`	`28`	`new LiquibaseMigration("update/gitbucket-notifications_1.3.xml")`
`29`	`29`	`),`
`30`	`30`	`new Version("1.4.0"),`
`31`		`- new Version("1.5.0")`
	`31`	`+ new Version("1.5.0"),`
	`32`	`+ new Version("1.5.1")`
`32`	`33`	`)`
`33`	`34`
`34`	`35`	`override val controllers = Seq(`