diff options
| author | Unknwon <u@gogs.io> | 2015-07-25 00:49:40 +0800 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-07-25 00:49:40 +0800 |
| commit | 54b58e988d4fac4a3f67feef39d62134352fb07c (patch) | |
| tree | db32c6c6860f6b6bacb0c90c32a25b5a3b7c8002 /modules | |
| parent | dc4aab9925b46f8ad4b18f7926e2904163c1c5b5 (diff) | |
| parent | 70d44e9565e372c73d4f0f42273d4899e8e07f75 (diff) | |
| download | gitea-54b58e988d4fac4a3f67feef39d62134352fb07c.tar.gz gitea-54b58e988d4fac4a3f67feef39d62134352fb07c.zip | |
Merge branch 'develop' of github.com:gogits/gogs into feature/page_issues
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/auth/admin.go | 1 | ||||
| -rw-r--r-- | modules/auth/user_form.go | 2 | ||||
| -rw-r--r-- | modules/base/markdown.go | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/modules/auth/admin.go b/modules/auth/admin.go index e6cc82cd34..a95b83de6a 100644 --- a/modules/auth/admin.go +++ b/modules/auth/admin.go @@ -11,6 +11,7 @@ import ( ) type AdminEditUserForm struct { + FullName string `form:"fullname" binding:"MaxSize(100)"` Email string `binding:"Required;Email;MaxSize(50)"` Password string `binding:"OmitEmpty;MinSize(6);MaxSize(255)"` Website string `binding:"MaxSize(50)"` diff --git a/modules/auth/user_form.go b/modules/auth/user_form.go index fa5583ffc6..c2dc85413b 100644 --- a/modules/auth/user_form.go +++ b/modules/auth/user_form.go @@ -116,7 +116,7 @@ func (f *AddEmailForm) Validate(ctx *macaron.Context, errs binding.Errors) bindi } type ChangePasswordForm struct { - OldPassword string `form:"old_password" binding:"Required;MinSize(6);MaxSize(255)"` + OldPassword string `form:"old_password" binding:"Required;MinSize(1);MaxSize(255)"` Password string `form:"password" binding:"Required;MinSize(6);MaxSize(255)"` Retype string `form:"retype"` } diff --git a/modules/base/markdown.go b/modules/base/markdown.go index d06e1338e7..e860f9705c 100644 --- a/modules/base/markdown.go +++ b/modules/base/markdown.go @@ -198,7 +198,7 @@ func RenderRawMarkdown(body []byte, urlPrefix string) []byte { extensions |= blackfriday.EXTENSION_FENCED_CODE extensions |= blackfriday.EXTENSION_AUTOLINK extensions |= blackfriday.EXTENSION_STRIKETHROUGH - extensions |= blackfriday.EXTENSION_HARD_LINE_BREAK + //extensions |= blackfriday.EXTENSION_HARD_LINE_BREAK extensions |= blackfriday.EXTENSION_SPACE_HEADERS extensions |= blackfriday.EXTENSION_NO_EMPTY_LINE_BEFORE_BLOCK |