summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2016-03-03 15:09:43 -0500
committerUnknwon <u@gogs.io>2016-03-03 15:09:43 -0500
commitf946040fa94a3acb3b1f54873e6f95766595829c (patch)
tree4f7105c0554bc65763b411c1c032e9196272673e /conf
parent434614506e7edee8d75d747dfe2ac59458f669fe (diff)
downloadgitea-f946040fa94a3acb3b1f54873e6f95766595829c.tar.gz
gitea-f946040fa94a3acb3b1f54873e6f95766595829c.zip
#1891 attempt to fix expected invalid CSRF token
- Remove unused config settings `[picture] service`
Diffstat (limited to 'conf')
-rw-r--r--conf/app.ini2
-rw-r--r--conf/locale/TRANSLATORS1
2 files changed, 1 insertions, 2 deletions
diff --git a/conf/app.ini b/conf/app.ini
index 73f9a0ba28..d3d3d9259d 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -215,8 +215,6 @@ GC_INTERVAL_TIME = 86400
SESSION_LIFE_TIME = 86400
[picture]
-; The place to picture data, either "server" or "qiniu", default is "server"
-SERVICE = server
AVATAR_UPLOAD_PATH = data/avatars
; Chinese users can choose "duoshuo"
; or a custom avatar source, like: http://cn.gravatar.com/avatar/
diff --git a/conf/locale/TRANSLATORS b/conf/locale/TRANSLATORS
index cae620dbde..91baaeefc4 100644
--- a/conf/locale/TRANSLATORS
+++ b/conf/locale/TRANSLATORS
@@ -27,6 +27,7 @@ Huimin Wang <wanghm2009 AT hotmail DOT co DOT jp>
ilko <kontact-mr.k AT outlook DOT com">
Ilya Makarov
Robin Hübner <profan AT prfn DOT se>
+Jamie Mansfield <dev AT jamierocks DOT uk>
Jean THOMAS <contact AT tibounise DOT com>
Juraj Bubniak <contact AT jbub DOT eu>
Lafriks <lafriks AT gmail DOT com>