From ea29a9b84631b03ee2f60ffa85fd9e402ceaf8a4 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 21 Apr 2014 02:24:35 -0400 Subject: [PATCH] API fix --- conf/app.ini | 2 +- conf/gitignore/Android | 23 +++++++++++++++++++++++ gogs.go | 2 +- models/models.go | 2 +- 4 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 conf/gitignore/Android diff --git a/conf/app.ini b/conf/app.ini index 2aab7178e4..7dbbf60053 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -9,7 +9,7 @@ RUN_MODE = dev [repository] ROOT = SCRIPT_TYPE = bash -LANG_IGNS = Google Go|C|C++|Python|Ruby|C Sharp|Java|Objective-C +LANG_IGNS = Google Go|C|C++|Python|Ruby|C Sharp|Java|Objective-C|Android LICENSES = Apache v2 License|GPL v2|MIT License|Affero GPL|Artistic License 2.0|BSD (3-Clause) License [server] diff --git a/conf/gitignore/Android b/conf/gitignore/Android new file mode 100644 index 0000000000..37e8cf6cc2 --- /dev/null +++ b/conf/gitignore/Android @@ -0,0 +1,23 @@ +# Built application files +*.apk +*.ap_ + +# Files for the Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ + +# Gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ \ No newline at end of file diff --git a/gogs.go b/gogs.go index c9d78acb94..73555adab7 100644 --- a/gogs.go +++ b/gogs.go @@ -19,7 +19,7 @@ import ( // Test that go1.2 tag above is included in builds. main.go refers to this definition. const go12tag = true -const APP_VER = "0.3.0.0420 Alpha" +const APP_VER = "0.3.0.0421 Alpha" func init() { base.AppVer = APP_VER diff --git a/models/models.go b/models/models.go index 1eb418bac7..216084f1b8 100644 --- a/models/models.go +++ b/models/models.go @@ -120,7 +120,7 @@ func SetEngine() (err error) { if err != nil { return fmt.Errorf("models.init(fail to create xorm.log): %v", err) } - orm.Logger = f + orm.Logger = xorm.NewSimpleLogger(f) orm.ShowSQL = true orm.ShowDebug = true