Browse Source

Add 2 more gitignore

pull/85/head
Unknown 11 years ago
parent
commit
aa58320a1b
  1. 2
      conf/app.ini
  2. 12
      conf/gitignore/Java
  3. 7
      conf/gitignore/Objective-C
  4. 2
      modules/middleware/auth.go

2
conf/app.ini

@ -8,7 +8,7 @@ RUN_MODE = dev
[repository] [repository]
ROOT = 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 LICENSES = Apache v2 License|GPL v2|MIT License|Affero GPL|Artistic License 2.0|BSD (3-Clause) License
[server] [server]

12
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*

7
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/

2
modules/middleware/auth.go

@ -47,7 +47,7 @@ func Toggle(options *ToggleOptions) martini.Handler {
return return
} else if !ctx.User.IsActive && base.Service.RegisterEmailConfirm { } else if !ctx.User.IsActive && base.Service.RegisterEmailConfirm {
ctx.Data["Title"] = "Activate Your Account" ctx.Data["Title"] = "Activate Your Account"
ctx.HTML(200, "user/active") ctx.HTML(200, "user/activate")
return return
} }
} }

Loading…
Cancel
Save