Merge branch 'master' of github.com:gogits/gogs

Conflicts:
	templates/user/signup.tmpl

diff --cc routers/user/user.go
Simple merge

diff --cc templates/user/signup.tmpl
index 76064bf7600f0ed2f4b0249db8cc088327de2819,c74b805934fdfd29d80aa40cc5310a26828fc887..482cdc008065e68d9af60cbff317f3d247658882
--- 1/templates/user/signup.tmpl
--- 2/templates/user/signup.tmpl
+++ b/templates/user/signup.tmpl
@@@ -22,16 -20,15 +20,15 @@@
                <div class="form-group {{if .Err_Password}}has-error has-feedback{{end}}">
                        <label class="col-md-4 control-label">Password: </label>
                        <div class="col-md-6">
-                               <input name="passwd" type="password" class="form-control" placeholder="Type your password">
+                               <input name="passwd" type="password" class="form-control" placeholder="Type your password" required="required" title="Password must contain at least has 6 characters">
                        </div>
                </div>
 -              <div class="form-group">
 +              <div class="form-group {{if .Err_RetypePasswd}}has-error has-feedback{{end}}">
                        <label class="col-md-4 control-label">Re-type: </label>
                        <div class="col-md-6">
-                               <input type="password" class="form-control" placeholder="Re-type your password">
+                               <input name="re-passwd" type="password" class="form-control" placeholder="Re-type your password" required="required" title="Re-type Password must be same to Password">
                        </div>
                </div>
- 
                <div class="form-group">
                    <div class="col-md-offset-4 col-md-6">
                        <button type="submit" class="btn btn-lg btn-primary">Create an account</button>