From aa58320a1bc0f90387a936ad2d61a7fa1e6ac92b Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Fri, 18 Apr 2014 12:17:28 -0400
Subject: [PATCH] Add 2 more gitignore

---
 conf/app.ini               |  2 +-
 conf/gitignore/Java        | 12 ++++++++++++
 conf/gitignore/Objective-C |  7 +++++++
 modules/middleware/auth.go |  2 +-
 4 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 conf/gitignore/Java
 create mode 100644 conf/gitignore/Objective-C

diff --git a/conf/app.ini b/conf/app.ini
index 38b556506..d805f822d 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -8,7 +8,7 @@ RUN_MODE = dev
 
 [repository]
 ROOT = 
-LANG_IGNS = Google Go|C|C++|Python|Ruby|C Sharp
+LANG_IGNS = Google Go|C|C++|Python|Ruby|C Sharp|Java|Objective-C
 LICENSES = Apache v2 License|GPL v2|MIT License|Affero GPL|Artistic License 2.0|BSD (3-Clause) License
 
 [server]
diff --git a/conf/gitignore/Java b/conf/gitignore/Java
new file mode 100644
index 000000000..b7d7dc6d4
--- /dev/null
+++ b/conf/gitignore/Java
@@ -0,0 +1,12 @@
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
\ No newline at end of file
diff --git a/conf/gitignore/Objective-C b/conf/gitignore/Objective-C
new file mode 100644
index 000000000..ce8845863
--- /dev/null
+++ b/conf/gitignore/Objective-C
@@ -0,0 +1,7 @@
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control?
+#
+# Pods/
\ No newline at end of file
diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go
index bde3be726..39b7796d9 100644
--- a/modules/middleware/auth.go
+++ b/modules/middleware/auth.go
@@ -47,7 +47,7 @@ func Toggle(options *ToggleOptions) martini.Handler {
 				return
 			} else if !ctx.User.IsActive && base.Service.RegisterEmailConfirm {
 				ctx.Data["Title"] = "Activate Your Account"
-				ctx.HTML(200, "user/active")
+				ctx.HTML(200, "user/activate")
 				return
 			}
 		}