Merge branch 'master'

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

src/test/scala/gitbucket/core/GitBucketCoreModuleSpec.scala

@@ -33,6 +33,8 @@ class GitBucketCoreModuleSpec extends FunSuite {
       .withPort(3306)
       .withUser("sa", "sa")
       .withCharset(Charset.UTF8)
+      .withServerVariable("log_syslog", 0)
+      .withServerVariable("bind-address", "127.0.0.1")
       .build()
 
     val mysqld = anEmbeddedMysql(config)
@@ -41,7 +43,7 @@ class GitBucketCoreModuleSpec extends FunSuite {
 
     try {
       new Solidbase().migrate(
-        DriverManager.getConnection("jdbc:mysql://localhost:3306/gitbucket", "sa", "sa"),
+        DriverManager.getConnection("jdbc:mysql://localhost:3306/gitbucket?useSSL=false", "sa", "sa"),
         Thread.currentThread().getContextClassLoader(),
         new MySQLDatabase(),
         new Module(GitBucketCoreModule.getModuleId, GitBucketCoreModule.getVersions)

src/test/scala/gitbucket/core/service/AccountServiceSpec.scala

@@ -10,7 +10,7 @@ class AccountServiceSpec extends FunSuite with ServiceSpecBase {
 
   test("getAllUsers") { withTestDB { implicit session =>
     assert(AccountService.getAllUsers() match {
-      case List(Account("root", "root", RootMailAddress, _, true, _, _, _, None, None, false, false)) => true
+      case List(Account("root", "root", RootMailAddress, _, true, _, _, _, None, None, false, false, None)) => true
       case _ => false
     })
   }}
@@ -47,12 +47,20 @@ class AccountServiceSpec extends FunSuite with ServiceSpecBase {
     val newAddress = "new mail address"
     AccountService.updateAccount(user().copy(mailAddress = newAddress))
     assert(user().mailAddress == newAddress)
+
+    val newUrl = Some("http://new.url.example/path")
+    AccountService.updateAccount(user().copy(url = newUrl))
+    assert(user().url == newUrl)
+
+    val newDescription = Some("http://new.url.example/path")
+    AccountService.updateAccount(user().copy(description = newDescription))
+    assert(user().description == newDescription)
   }}
 
   test("group") { withTestDB { implicit session =>
     val group1 = "group1"
     val user1 = "root"
-    AccountService.createGroup(group1, None)
+    AccountService.createGroup(group1, None, None)
 
     assert(AccountService.getGroupMembers(group1) == Nil)
     assert(AccountService.getGroupsByUserName(user1) == Nil)
@@ -67,5 +75,20 @@ class AccountServiceSpec extends FunSuite with ServiceSpecBase {
     assert(AccountService.getGroupMembers(group1) == Nil)
     assert(AccountService.getGroupsByUserName(user1) == Nil)
   }}
-}
 
+  test("createGroup save description") { withTestDB { implicit session =>
+    AccountService.createGroup("some-group", Some("some clever description"), None)
+    val maybeGroup = AccountService.getAccountByUserName("some-group")
+
+    assert(maybeGroup.flatMap(_.description) == Some("some clever description"))
+  }}
+
+  test("updateGroup save description") { withTestDB { implicit session =>
+    AccountService.createGroup("a-group", None, None)
+
+    AccountService.updateGroup("a-group", Some("new description"), None, false)
+
+    val group = AccountService.getAccountByUserName("a-group")
+    assert(group.flatMap(_.description) == Some("new description"))
+  }}
+}

src/test/scala/gitbucket/core/service/ProtectedBranchServiceSpec.scala

@@ -134,7 +134,7 @@ class ProtectedBranchServiceSpec extends FunSpec with ServiceSpecBase with Prote
     it("administrator is manager") {
       withTestDB { implicit session =>
         val x = ProtectedBranchInfo("grp1", "repo1", true, Nil, false)
-        x.createGroup("grp1", None)
+        x.createGroup("grp1", None, None)
         generateNewAccount("user1")
         generateNewAccount("user2")
         generateNewAccount("user3")

src/test/scala/gitbucket/core/service/ServiceSpecBase.scala

@@ -38,7 +38,7 @@ trait ServiceSpecBase {
   }
 
   def generateNewAccount(name:String)(implicit s:Session):Account = {
-    AccountService.createAccount(name, name, name, s"${name}@example.com", false, None)
+    AccountService.createAccount(name, name, name, s"${name}@example.com", false, None, None)
     user(name)
   }
 
@@ -54,7 +54,7 @@ trait ServiceSpecBase {
   }
 
   def generateNewIssue(userName:String, repositoryName:String, loginUser:String="root")(implicit s:Session): Int = {
-    dummyService.createIssue(
+    dummyService.insertIssue(
       owner            = userName,
       repository       = repositoryName,
       loginUser        = loginUser,

src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala

@@ -94,7 +94,8 @@ class AvatarImageProviderSpec extends FunSpec with MockitoSugar {
       lastLoginDate  = None,
       image          = image,
       isGroupAccount = false,
-      isRemoved      = false)
+      isRemoved      = false,
+      description    = None)
 
   private def createSystemSettings(useGravatar: Boolean) =
     SystemSettings(