aboutsummaryrefslogtreecommitdiffstats
path: root/templates/user/active.tmpl
diff options
context:
space:
mode:
authorFuXiaoHei <fuxiaohei@hexiaz.com>2014-03-21 23:28:44 +0800
committerFuXiaoHei <fuxiaohei@hexiaz.com>2014-03-21 23:28:44 +0800
commit9218f76c8e4a6fafbe6bed1d61eb66ba73bf70f2 (patch)
tree881531e41b0a51a853845740e6728ddb4e5d5277 /templates/user/active.tmpl
parent011134e0aff5d16501b60a6feaaa8c2ccf0d269d (diff)
parentd40499e7fa3d62655431f160b6909d9751dabe11 (diff)
downloadgitea-9218f76c8e4a6fafbe6bed1d61eb66ba73bf70f2.tar.gz
gitea-9218f76c8e4a6fafbe6bed1d61eb66ba73bf70f2.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'templates/user/active.tmpl')
-rw-r--r--templates/user/active.tmpl2
1 files changed, 2 insertions, 0 deletions
diff --git a/templates/user/active.tmpl b/templates/user/active.tmpl
index fefd7d3aed..47c87a591c 100644
--- a/templates/user/active.tmpl
+++ b/templates/user/active.tmpl
@@ -6,6 +6,8 @@
{{if .IsActivatePage}}
{{if .ServiceNotEnabled}}
<p>Sorry, Register Mail Confirmation has been disabled.</p>
+ {{else if .ResendLimited}}
+ <p>Sorry, you are sending activation e-mail too frequently, please wait 3 minutes.</p>
{{else}}
<p>New confirmation e-mail has been sent to <b>{{.SignedUser.Email}}</b>, please check your inbox within {{.Hours}} hours to complete your registeration.</p>
<hr/>