aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2016-01-11 14:34:32 +0800
committerUnknwon <u@gogs.io>2016-01-11 14:34:32 +0800
commit91bab801aad337f2353cd4a46c896dfff6714cdf (patch)
tree8e5c5ab1e30507772e6b5feab149cad8275c28de
parent17c4400b1203db25d1458d0df3da1c17abe282c3 (diff)
#2349 try to handle []int8 case
-rw-r--r--README.md2
-rw-r--r--conf/locale/TRANSLATORS1
-rw-r--r--gogs.go2
-rw-r--r--models/login.go13
-rw-r--r--templates/.VERSION2
5 files changed, 16 insertions, 4 deletions
diff --git a/README.md b/README.md
index ba3ad35a..3c6aa419 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
-##### Current version: 0.8.18
+##### Current version: 0.8.19
| Web | UI | Preview |
|:-------------:|:-------:|:-------:|
diff --git a/conf/locale/TRANSLATORS b/conf/locale/TRANSLATORS
index 2ada4a61..27c1802d 100644
--- a/conf/locale/TRANSLATORS
+++ b/conf/locale/TRANSLATORS
@@ -9,6 +9,7 @@ Aleksey Tarakin <hukendo AT yandex DOT ru>
Alexander Steinhöfer <kontakt AT lx-s DOT de>
Alexandre Magno <alexandre DOT mbm AT gmail DOT com>
Andrey Nering <andrey AT nering DOT com DOT br>
+Andrey Solomatin <toadron AT yandex DOT ru>
Arthur Aslanyan <arthur DOT e DOT aslanyan AT gmail DOT com>
Barış Arda Yılmaz <ardayilmazgamer AT gmail DOT com>
Christoph Kisfeld <christoph DOT kisfeld AT gmail DOT com>
diff --git a/gogs.go b/gogs.go
index 006a272e..38f949d3 100644
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting"
)
-const APP_VER = "0.8.18.0109"
+const APP_VER = "0.8.19.0111"
func init() {
runtime.GOMAXPROCS(runtime.NumCPU())
diff --git a/models/login.go b/models/login.go
index e36171a3..dc620e1b 100644
--- a/models/login.go
+++ b/models/login.go
@@ -105,10 +105,21 @@ type LoginSource struct {
Updated time.Time `xorm:"UPDATED"`
}
+// Cell2Int64 converts a xorm.Cell type to int64,
+// and handles possible irregular cases.
+func Cell2Int64(val xorm.Cell) int64 {
+ switch (*val).(type) {
+ case []int8:
+ log.Trace("Cell2Int64 ([]int8): %v", *val)
+ return int64((*val).([]int8)[0])
+ }
+ return (*val).(int64)
+}
+
func (source *LoginSource) BeforeSet(colName string, val xorm.Cell) {
switch colName {
case "type":
- switch LoginType((*val).(int64)) {
+ switch LoginType(Cell2Int64(val)) {
case LOGIN_LDAP, LOGIN_DLDAP:
source.Cfg = new(LDAPConfig)
case LOGIN_SMTP:
diff --git a/templates/.VERSION b/templates/.VERSION
index 861f2d9a..f1eb383c 100644
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.8.18.0109 \ No newline at end of file
+0.8.19.0111 \ No newline at end of file