From 81adbe17caf4ff8d7fc920dfe661640ab248ad12 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Tue, 14 Jul 2015 19:47:20 +0800 Subject: [PATCH] use pam and update TRANSLATORS --- .travis.yml | 2 +- conf/locale/TRANSLATORS | 1 + gogs.go | 2 +- modules/auth/pam/pam.go | 2 +- modules/auth/pam/pam_stub.go | 2 +- templates/.VERSION | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 113773d697..b6b815c9bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: - sudo apt-get update -qq - sudo apt-get install -y libpam-dev -script: go build -v +script: go build -v -tags "pam" notifications: email: diff --git a/conf/locale/TRANSLATORS b/conf/locale/TRANSLATORS index 6680539e08..c94b622666 100644 --- a/conf/locale/TRANSLATORS +++ b/conf/locale/TRANSLATORS @@ -2,6 +2,7 @@ # Order of name is meaningless. Akihiro YAGASAKI +Alexander Steinhöfer Christoph Kisfeld Huimin Wang Thomas Fanninger diff --git a/gogs.go b/gogs.go index ecd93275de..958792e0d6 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.6.1.0710 Beta" +const APP_VER = "0.6.1.0714 Beta" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/modules/auth/pam/pam.go b/modules/auth/pam/pam.go index 7d150b1c0b..7f326d42f5 100644 --- a/modules/auth/pam/pam.go +++ b/modules/auth/pam/pam.go @@ -1,4 +1,4 @@ -// +build !windows +// +build pam // Copyright 2014 The Gogs Authors. All rights reserved. // Use of this source code is governed by a MIT-style diff --git a/modules/auth/pam/pam_stub.go b/modules/auth/pam/pam_stub.go index 2f210bf6e7..33ac751a34 100644 --- a/modules/auth/pam/pam_stub.go +++ b/modules/auth/pam/pam_stub.go @@ -1,4 +1,4 @@ -// +build windows +// +build !pam // Copyright 2014 The Gogs Authors. All rights reserved. // Use of this source code is governed by a MIT-style diff --git a/templates/.VERSION b/templates/.VERSION index 0249535505..627dda90e4 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.6.1.0710 Beta \ No newline at end of file +0.6.1.0714 Beta \ No newline at end of file