diff --git a/src/main/resources/update/3_5.sql b/src/main/resources/update/3_5.sql new file mode 100644 index 0000000..99f2594 --- /dev/null +++ b/src/main/resources/update/3_5.sql @@ -0,0 +1 @@ +ALTER TABLE ACCOUNT ADD COLUMN GROUP_DESCRIPTION TEXT; diff --git a/src/main/scala/gitbucket/core/model/Account.scala b/src/main/scala/gitbucket/core/model/Account.scala index cd2190a..b45e508 100644 --- a/src/main/scala/gitbucket/core/model/Account.scala +++ b/src/main/scala/gitbucket/core/model/Account.scala @@ -19,7 +19,8 @@ val image = column[String]("IMAGE") val groupAccount = column[Boolean]("GROUP_ACCOUNT") val removed = column[Boolean]("REMOVED") - def * = (userName, fullName, mailAddress, password, isAdmin, url.?, registeredDate, updatedDate, lastLoginDate.?, image.?, groupAccount, removed) <> (Account.tupled, Account.unapply) + val groupDescription = column[String]("GROUP_DESCRIPTION") + def * = (userName, fullName, mailAddress, password, isAdmin, url.?, registeredDate, updatedDate, lastLoginDate.?, image.?, groupAccount, removed, groupDescription.?) <> (Account.tupled, Account.unapply) } } @@ -35,5 +36,6 @@ lastLoginDate: Option[java.util.Date], image: Option[String], isGroupAccount: Boolean, - isRemoved: Boolean + isRemoved: Boolean, + groupDescription: Option[String] ) diff --git a/src/main/scala/gitbucket/core/service/AccountService.scala b/src/main/scala/gitbucket/core/service/AccountService.scala index dbdc3d9..07f77e9 100644 --- a/src/main/scala/gitbucket/core/service/AccountService.scala +++ b/src/main/scala/gitbucket/core/service/AccountService.scala @@ -111,7 +111,8 @@ lastLoginDate = None, image = None, isGroupAccount = false, - isRemoved = false) + isRemoved = false, + groupDescription = None) def updateAccount(account: Account)(implicit s: Session): Unit = Accounts @@ -147,7 +148,8 @@ lastLoginDate = None, image = None, isGroupAccount = true, - isRemoved = false) + isRemoved = false, + groupDescription = None) def updateGroup(groupName: String, url: Option[String], removed: Boolean)(implicit s: Session): Unit = Accounts.filter(_.userName === groupName.bind).map(t => t.url.? -> t.removed).update(url, removed) diff --git a/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala b/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala index 4ff5425..377b219 100644 --- a/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala +++ b/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala @@ -21,6 +21,7 @@ * The history of versions. A head of this sequence is the current BitBucket version. */ val versions = Seq( + new Version(3, 5), new Version(3, 4), new Version(3, 3), new Version(3, 2), @@ -166,4 +167,4 @@ } else Version(0, 0) } -} \ No newline at end of file +} diff --git a/src/test/scala/gitbucket/core/service/AccountServiceSpec.scala b/src/test/scala/gitbucket/core/service/AccountServiceSpec.scala index 2e83d41..ed95f8d 100644 --- a/src/test/scala/gitbucket/core/service/AccountServiceSpec.scala +++ b/src/test/scala/gitbucket/core/service/AccountServiceSpec.scala @@ -11,7 +11,7 @@ "getAllUsers" in { withTestDB { implicit session => AccountService.getAllUsers() must be like{ - case List(Account("root", "root", RootMailAddress, _, true, _, _, _, None, None, false, false)) => ok + case List(Account("root", "root", RootMailAddress, _, true, _, _, _, None, None, false, false, None)) => ok } }} diff --git a/src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala b/src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala index 85d60b9..64a9b90 100644 --- a/src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala +++ b/src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala @@ -89,7 +89,8 @@ lastLoginDate = None, image = image, isGroupAccount = false, - isRemoved = false) + isRemoved = false, + groupDescription = None) private def createSystemSettings(useGravatar: Boolean) = SystemSettings(