Merge branch 'master' into null-request-field

1 files changed, 42 insertions, 42 deletions

diff --git a/Timeline/Entities/DatabaseContext.cs b/Timeline/Entities/DatabaseContext.cs
index 9fe046ac..c5a84342 100644
--- a/Timeline/Entities/DatabaseContext.cs
+++ b/Timeline/Entities/DatabaseContext.cs
@@ -1,42 +1,42 @@
-using Microsoft.EntityFrameworkCore;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Timeline.Entities
-{
-    public static class UserRoles
-    {
-        public const string Admin = "admin";
-        public const string User = "user";
-    }
-
-    [Table("user")]
-    public class User
-    {
-        [Column("id"), Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        public long Id { get; set; }
-
-        [Column("name"), Required]
-        public string Name { get; set; }
-
-        [Column("password"), Required]
-        public string EncryptedPassword { get; set; }
-
-        [Column("roles"), Required]
-        public string RoleString { get; set; }
-
-        [Column("version"), Required]
-        public long Version { get; set; }
-    }
-
-    public class DatabaseContext : DbContext
-    {
-        public DatabaseContext(DbContextOptions<DatabaseContext> options)
-            : base(options)
-        {
-
-        }
-
-        public DbSet<User> Users { get; set; }
-    }
-}
+using Microsoft.EntityFrameworkCore;

+using System.ComponentModel.DataAnnotations;

+using System.ComponentModel.DataAnnotations.Schema;

+

+namespace Timeline.Entities

+{

+    public static class UserRoles

+    {

+        public const string Admin = "admin";

+        public const string User = "user";

+    }

+

+    [Table("user")]

+    public class User

+    {

+        [Column("id"), Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]

+        public long Id { get; set; }

+

+        [Column("name"), Required]

+        public string Name { get; set; }

+

+        [Column("password"), Required]

+        public string EncryptedPassword { get; set; }

+

+        [Column("roles"), Required]

+        public string RoleString { get; set; }

+

+        [Column("version"), Required]

+        public long Version { get; set; }

+    }

+

+    public class DatabaseContext : DbContext

+    {

+        public DatabaseContext(DbContextOptions<DatabaseContext> options)

+            : base(options)

+        {

+

+        }

+

+        public DbSet<User> Users { get; set; }

+    }

+}