1
0
mirror of https://github.com/go-gitea/gitea synced 2024-12-24 03:35:55 +01:00

Add 2 more gitignore

This commit is contained in:
Unknown 2014-04-18 12:17:28 -04:00
parent 8719c1b8c5
commit aa58320a1b
4 changed files with 21 additions and 2 deletions

@ -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 Normal file

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

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

@ -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
} }
} }