TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-05 22:55:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #152 from scala-steward/update/scalafmt-core-2.6.1

Browse Source 
Update scalafmt-core to 2.6.1
This commit is contained in:
mergify[bot] 2020-06-20 21:12:37 +00:00 committed by GitHub
commit 3018fbc0b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.scalafmt.conf
View File

@ -1,4 +1,4 @@
version = "2.6.0" version = "2.6.1"
preset = defaultWithAlign preset = defaultWithAlign

3
modules/backend/src/main/scala/docspell/backend/ops/OUpload.scala
View File

@ -86,7 +86,8 @@ object OUpload {
def noSource: UploadResult = NoSource def noSource: UploadResult = NoSource
/** When adding files to an item, no item was found using the given /** When adding files to an item, no item was found using the given
* item-id. */ * item-id.
*/
case object NoItem extends UploadResult case object NoItem extends UploadResult
def noItem: UploadResult = NoItem def noItem: UploadResult = NoItem

6
modules/common/src/main/scala/docspell/common/CollectiveState.scala
View File

@ -11,14 +11,16 @@ object CollectiveState {
/** A collective may be readonly in cases it is implicitly closed /** A collective may be readonly in cases it is implicitly closed
* (e.g. no payment). Users can still see there data and * (e.g. no payment). Users can still see there data and
* download, but have no write access. */ * download, but have no write access.
*/
case object ReadOnly extends CollectiveState case object ReadOnly extends CollectiveState
/** A collective that has been explicitely closed. */ /** A collective that has been explicitely closed. */
case object Closed extends CollectiveState case object Closed extends CollectiveState
/** A collective blocked by a super user, usually some emergency /** A collective blocked by a super user, usually some emergency
* action. */ * action.
*/
case object Blocked extends CollectiveState case object Blocked extends CollectiveState
def fromString(s: String): Either[String, CollectiveState] = def fromString(s: String): Either[String, CollectiveState] =

3
modules/common/src/main/scala/docspell/common/JobState.scala
View File

@ -13,7 +13,8 @@ object JobState {
case object Waiting extends JobState {} case object Waiting extends JobState {}
/** A scheduler has picked up this job and will pass it to the next /** A scheduler has picked up this job and will pass it to the next
* free slot. */ * free slot.
*/
case object Scheduled extends JobState {} case object Scheduled extends JobState {}
/** Is currently executing */ /** Is currently executing */