Mirror fix and fix #481

This commit is contained in:
Unknwon 2014-09-17 14:22:51 -04:00
parent c03f5a2c7c
commit 8a09256941
8 changed files with 17 additions and 15 deletions

View file

@ -44,7 +44,7 @@ The goal of this project is to make the easiest, fastest and most painless way t
- Slack webhook integration - Slack webhook integration
- Supports MySQL, PostgreSQL and SQLite3 - Supports MySQL, PostgreSQL and SQLite3
- Social account login(GitHub, Google, QQ, Weibo) - Social account login(GitHub, Google, QQ, Weibo)
- Multi-language support(English, Chinese, Germany etc.) - Multi-language support(English, Chinese, Germany, French etc.)
## System Requirements ## System Requirements

View file

@ -35,7 +35,7 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自
- Slack Web 钩子集成 - Slack Web 钩子集成
- 支持 MySQL、PostgreSQL 以及 SQLite3 数据库 - 支持 MySQL、PostgreSQL 以及 SQLite3 数据库
- 社交帐号登录GitHub、Google、QQ、微博 - 社交帐号登录GitHub、Google、QQ、微博
- 多语言支持(英文、简体中文、德语等等) - 多语言支持(英文、简体中文、德语、法语等等)
## 系统要求 ## 系统要求

View file

@ -252,9 +252,9 @@ DRIVER =
; Based on xorm, e.g.: root:root@localhost/gogs?charset=utf8 ; Based on xorm, e.g.: root:root@localhost/gogs?charset=utf8
CONN = CONN =
[git]
MAX_GITDIFF_LINES = 10000
[i18n] [i18n]
LANGS = en-US,zh-CN,de-DE,fr-CA LANGS = en-US,zh-CN,de-DE,fr-CA
NAMES = English,简体中文,Deutsch,Français NAMES = English,简体中文,Deutsch,Français
[git]
MAX_GITDIFF_LINES = 10000

View file

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.5.2.0916 Beta" const APP_VER = "0.5.2.0917 Beta"
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())

View file

@ -656,7 +656,7 @@ func TransferOwnership(u *User, newOwner string, repo *Repository) error {
} }
// Check if new owner has repository with same name. // Check if new owner has repository with same name.
has, err := IsRepositoryExist(u, repo.Name) has, err := IsRepositoryExist(newUser, repo.Name)
if err != nil { if err != nil {
return err return err
} else if has { } else if has {

View file

@ -14,8 +14,8 @@ import (
"runtime" "runtime"
"strings" "strings"
"time" "time"
"code.google.com/p/mahonia"
"github.com/gogits/gogs/modules/mahonia"
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
"github.com/saintfish/chardet" "github.com/saintfish/chardet"
) )

View file

@ -65,7 +65,6 @@ var (
// Picture settings. // Picture settings.
PictureService string PictureService string
DisableGravatar bool DisableGravatar bool
MaxGitDiffLines int
// Log settings. // Log settings.
LogRootPath string LogRootPath string
@ -94,6 +93,12 @@ var (
SessionProvider string SessionProvider string
SessionConfig *session.Config SessionConfig *session.Config
// Git settings.
MaxGitDiffLines int
// I18n settings.
Langs, Names []string
// Global setting objects. // Global setting objects.
Cfg *goconfig.ConfigFile Cfg *goconfig.ConfigFile
ConfRootPath string ConfRootPath string
@ -101,9 +106,6 @@ var (
ProdMode bool ProdMode bool
RunUser string RunUser string
IsWindows bool IsWindows bool
// I18n settings.
Langs, Names []string
) )
func init() { func init() {
@ -245,7 +247,7 @@ func NewConfigContext() {
[]string{"server"}) []string{"server"})
DisableGravatar = Cfg.MustBool("picture", "DISABLE_GRAVATAR") DisableGravatar = Cfg.MustBool("picture", "DISABLE_GRAVATAR")
MaxGitDiffLines = Cfg.MustInt("git", "MAX_GITDIFF_LINES", 5000) MaxGitDiffLines = Cfg.MustInt("git", "MAX_GITDIFF_LINES", 10000)
Langs = Cfg.MustValueArray("i18n", "LANGS", ",") Langs = Cfg.MustValueArray("i18n", "LANGS", ",")
Names = Cfg.MustValueArray("i18n", "NAMES", ",") Names = Cfg.MustValueArray("i18n", "NAMES", ",")

View file

@ -1 +1 @@
0.5.2.0916 Beta 0.5.2.0917 Beta