Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7

# Conflicts: # src/Umbraco.Web/Security/Identity/FormsAuthenticationSecureDataFormat.cs
2017-08-02 11:55:15 +10:00
parent 5fab5102d9 136b3db098
commit 241d486e97
3 changed files with 13 additions and 10 deletions
--- a/src/Umbraco.Web/Models/LoginModel.cs
+++ b/src/Umbraco.Web/Models/LoginModel.cs
@@ -10,7 +10,8 @@ namespace Umbraco.Web.Models
        public string Username { get; set; }

        [Required]
-        [DataMember(Name = "password", IsRequired = true)]
+        [DataMember(Name = "password", IsRequired = true)]
+        [StringLength(maximumLength:256)]
        public string Password { get; set; }

    }