New UI merge in progress

conf/app.ini

@@ -28,6 +28,8 @@ KEY_FILE = custom/https/key.pem
 ; Upper level of template and static file path
 ; default is the path where Gogs is executed
 STATIC_ROOT_PATH = 
+; Application level GZIP support
+ENABLE_GZIP = false
 
 [database]
 ; Either "mysql", "postgres" or "sqlite3", it's your choice
@@ -125,14 +127,6 @@ SCOPES = all
 AUTH_URL = https://open.t.qq.com/cgi-bin/oauth2/authorize
 TOKEN_URL = https://open.t.qq.com/cgi-bin/oauth2/access_token
 
-[oauth.twitter]
-ENABLED = false
-CLIENT_ID = 
-CLIENT_SECRET = 
-SCOPES = all
-AUTH_URL = https://api.twitter.com/oauth/authorize
-TOKEN_URL = https://api.twitter.com/oauth/access_token
-
 [oauth.weibo]
 ENABLED = false
 CLIENT_ID = 
@@ -147,8 +141,8 @@ ADAPTER = memory
 ; For "memory" only, GC interval in seconds, default is 60
 INTERVAL = 60
 ; For "redis" and "memcache", connection host address
-; redis: ":6039"
-; memcache: "127.0.0.1:11211"
+; redis: `:6039`
+; memcache: `127.0.0.1:11211`
 HOST =
 
 [session]
@@ -156,9 +150,9 @@ HOST =
 PROVIDER = file
 ; Provider config options
 ; memory: not have any config yet
-; file: session file path, e.g. "data/sessions"
-; redis: config like redis server addr, poolSize, password, e.g. "127.0.0.1:6379,100,astaxie"
-; mysql: go-sql-driver/mysql dsn config string, e.g. "root:password@/session_table"
+; file: session file path, e.g. `data/sessions`
+; redis: config like redis server addr, poolSize, password, e.g. `127.0.0.1:6379,100,gogs`
+; mysql: go-sql-driver/mysql dsn config string, e.g. `root:password@/session_table`
 PROVIDER_CONFIG = data/sessions
 ; Session cookie name
 COOKIE_NAME = i_like_gogits
@@ -182,15 +176,15 @@ DISABLE_GRAVATAR = false
 
 [attachment]
 ; Whether attachments are enabled. Defaults to `true`
-ENABLE =
-; Path for attachments. Defaults to files/attachments
-PATH = 
+ENABLE = true
+; Path for attachments. Defaults to `data/attachments`
+PATH = data/attachments
 ; One or more allowed types, e.g. image/jpeg|image/png
-ALLOWED_TYPES = 
+ALLOWED_TYPES = image/jpeg|image/png
 ; Max size of each file. Defaults to 32MB
-MAX_SIZE
+MAX_SIZE = 32
 ; Max number of files per upload. Defaults to 10
-MAX_FILES =
+MAX_FILES = 10
 
 [log]
 ROOT_PATH =
@@ -209,7 +203,6 @@ LEVEL =
 ; For "file" mode only
 [log.file]
 LEVEL = 
-FILE_NAME = log/gogs.log
 ; This enables automated log rotate(switch of following options), default is true
 LOG_ROTATE = true
 ; Max line number of single file, default is 1000000
@@ -253,3 +246,7 @@ LEVEL =
 DRIVER = 
 ; Based on xorm, e.g.: root:root@localhost/gogs?charset=utf8
 CONN = 
+
+[i18n]
+LANGS = en-US,zh-CN
+NAMES = English,简体中文