Version 0.9.97

5 files changed, 88 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0c280bb4f220..d765aeb01f19 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Aug 10 21:36:23 UTC 2016
+# Thu Sep  1 18:23:54 UTC 2016
 pkgbase = gogs
 	pkgdesc = Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language.
-	pkgver = 0.9.71
+	pkgver = 0.9.97
 	pkgrel = 2
 	epoch = 1
 	url = http://gogs.io/
@@ -32,10 +32,10 @@ pkgbase = gogs
 	backup = srv/gogs/conf/app.ini
 	source = gogs.service.patch
 	source = app.ini.patch
-	source = gogs::https://github.com/gogits/gogs/archive/v0.9.71.tar.gz
+	source = gogs::https://github.com/gogits/gogs/archive/v0.9.97.tar.gz
 	sha512sums = 834e95fe9bcfa291a573ad1fa43f41bbed844658a918ff4fcf53ab8a44a296206ee4003eab1d9a2785c9126be077022f4907846d2eb6c5d64050b5e81ce47f44
-	sha512sums = b0891aaa5bb4d220fc84469e21b867d7432a269e50c44920b178b099b04b11509bdfd5500506faf3baa9ac8030f3fa845824c21e66ff26ac343d3113ae0b6396
-	sha512sums = d9f77dccb86a8e49868047aa6e162cb04c1e2f80891d1378a225c8abf47b03335c3dea64a11971f2d5df4a36bb4e37219e2e4591782a8d2142fe21554959325b
+	sha512sums = 800bba8c0d01bacb43846572f5ade2d1a04b0093f70c991b3cc80bd39b14eb02bb3534890666ff1bbbd9a23e97453f2f136648f7f23d5f829239ab7b4258f6ca
+	sha512sums = 4ea51d7dc3f70a352765c9e736ebbf290b652253309f44ab08c6c95a96b033356db954d0da22cea754c346537af2c24f3239fcbb7c1babf9161f710d75b4e9e5
 
 pkgname = gogs
 
diff --git a/PKGBUILD b/PKGBUILD
index fd3bce7facf0..43702a028905 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=gogs
 _pkgname=${pkgname}
-pkgver=0.9.71
+pkgver=0.9.97
 pkgrel=2
 epoch=1
 pkgdesc="Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language."
@@ -31,8 +31,8 @@ source=('gogs.service.patch'
         "$_pkgname::https://${_gourl}/archive/v${pkgver}.tar.gz")
 
 sha512sums=(834e95fe9bcfa291a573ad1fa43f41bbed844658a918ff4fcf53ab8a44a296206ee4003eab1d9a2785c9126be077022f4907846d2eb6c5d64050b5e81ce47f44
-            b0891aaa5bb4d220fc84469e21b867d7432a269e50c44920b178b099b04b11509bdfd5500506faf3baa9ac8030f3fa845824c21e66ff26ac343d3113ae0b6396
-            d9f77dccb86a8e49868047aa6e162cb04c1e2f80891d1378a225c8abf47b03335c3dea64a11971f2d5df4a36bb4e37219e2e4591782a8d2142fe21554959325b)
+            800bba8c0d01bacb43846572f5ade2d1a04b0093f70c991b3cc80bd39b14eb02bb3534890666ff1bbbd9a23e97453f2f136648f7f23d5f829239ab7b4258f6ca
+            4ea51d7dc3f70a352765c9e736ebbf290b652253309f44ab08c6c95a96b033356db954d0da22cea754c346537af2c24f3239fcbb7c1babf9161f710d75b4e9e5)
 
 _goroot="/usr/lib/go"
 
diff --git a/app.ini.patch b/app.ini.patch
index e5db9399c772..08887c0d7cbc 100644
--- a/app.ini.patch
+++ b/app.ini.patch
@@ -6,35 +6,19 @@
 < ROOT =
 ---
 > ROOT = /srv/gogs/repo
-15c15
-< ANSI_CHARSET =
----
-> ANSI_CHARSET = 
-101c101
+131c131
 < STATIC_ROOT_PATH =
 ---
 > STATIC_ROOT_PATH = /usr/share/themes/gogs/default
-103c103
+133c133
 < APP_DATA_PATH = data
 ---
 > APP_DATA_PATH = /srv/gogs/data
-126c126
+156c156
 < PATH = data/gogs.db
 ---
 > PATH = /srv/gogs/sqlite/gogs.db
-215c215
-< PROVIDER_CONFIG = data/sessions
----
-> PROVIDER_CONFIG = /srv/gogs/data/sessions
-228c228
-< AVATAR_UPLOAD_PATH = data/avatars
----
-> AVATAR_UPLOAD_PATH = /srv/gogs/data/avatars
-243c243
-< PATH = data/attachments
----
-> PATH = /srv/gogs/data/attachments
-258c258
+288c288
 < ROOT_PATH =
 ---
 > ROOT_PATH = /var/log/gogs
diff --git a/app_new.ini b/app_new.ini
index 99bbc0db4c4f..8217e6346c78 100644
--- a/app_new.ini
+++ b/app_new.ini
@@ -12,13 +12,38 @@ RUN_MODE = dev
 ROOT = /srv/gogs/repo
 SCRIPT_TYPE = bash
 ; Default ANSI charset
-ANSI_CHARSET = 
+ANSI_CHARSET =
 ; Force every new repository to be private
 FORCE_PRIVATE = false
 ; Global maximum creation limit of repository per user, -1 means no limit
 MAX_CREATION_LIMIT = -1
-; Patch test queue length, make it as large as possible
-PULL_REQUEST_QUEUE_LENGTH = 10000
+; Mirror sync queue length, increase if mirror syncing starts hanging
+MIRROR_QUEUE_LENGTH = 1000
+; Patch test queue length, increase if pull request patch testing starts hanging
+PULL_REQUEST_QUEUE_LENGTH = 1000
+; Preferred Licenses to place at the top of the List
+; Name must match file name in conf/license or custom/conf/license
+PREFERRED_LICENSES = Apache License 2.0,MIT License
+
+[repository.editor]
+; List of file extensions that should have line wraps in the CodeMirror editor
+; Separate extensions with a comma. To line wrap files w/o extension, just put a comma
+LINE_WRAP_EXTENSIONS = .txt,.md,.markdown,.mdown,.mkd,
+; Valid file modes that have a preview API associated with them, such as api/v1/markdown
+; Separate values by commas. Preview tab in edit mode won't show if the file extension doesn't match
+PREVIEWABLE_FILE_MODES = markdown
+
+[repository.upload]
+; Whether repository file uploads are enabled. Defaults to `true`
+ENABLED = true
+; Path for uploads. Defaults to `data/tmp/uploads` (tmp gets deleted on gogs restart)
+TEMP_PATH = data/tmp/uploads
+; One or more allowed types, e.g. image/jpeg|image/png. Nothing means any file type
+ALLOWED_TYPES =
+; Max size of each file in MB. Defaults to 3MB
+FILE_MAX_SIZE = 3
+; Max number of files per upload. Defaults to 5
+MAX_FILES = 5
 
 [ui]
 ; Number of repositories that are showed in one explore page
@@ -54,6 +79,9 @@ ENABLE_HARD_LINE_BREAK = false
 ; List of custom URL-Schemes that are allowed as links when rendering Markdown
 ; for example git,magnet
 CUSTOM_URL_SCHEMES =
+; List of file extensions that should be rendered/edited as Markdown
+; Separate extensions with a comma. To render files w/o extension as markdown, just put a comma
+FILE_EXTENSIONS = .md,.markdown,.mdown,.mkd
 
 [server]
 PROTOCOL = http
@@ -61,6 +89,8 @@ DOMAIN = localhost
 ROOT_URL = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s/
 HTTP_ADDR = 0.0.0.0
 HTTP_PORT = 3000
+; Permission for unix socket
+UNIX_SOCKET_PERMISSION = 666
 ; Local (DMZ) URL for Gogs workers (such as SSH update) accessing web service.
 ; In most cases you do not need to change the default value.
 ; Alter it only if your SSH server node is not the same as HTTP node.
@@ -156,7 +186,7 @@ ENABLE_REVERSE_PROXY_AUTO_REGISTRATION = false
 ENABLE_CAPTCHA = true
 
 [webhook]
-; Hook task queue length
+; Hook task queue length, increase if webhook shooting starts hanging
 QUEUE_LENGTH = 1000
 ; Deliver timeout in seconds
 DELIVER_TIMEOUT = 5
@@ -212,7 +242,7 @@ PROVIDER = memory
 ; file: session file path, e.g. `data/sessions`
 ; redis: network=tcp,addr=:6379,password=macaron,db=0,pool_size=100,idle_timeout=180
 ; mysql: go-sql-driver/mysql dsn config string, e.g. `root:password@/session_table`
-PROVIDER_CONFIG = /srv/gogs/data/sessions
+PROVIDER_CONFIG = data/sessions
 ; Session cookie name
 COOKIE_NAME = i_like_gogits
 ; If you use session in https only, default is false
@@ -225,14 +255,14 @@ GC_INTERVAL_TIME = 86400
 SESSION_LIFE_TIME = 86400
 
 [picture]
-AVATAR_UPLOAD_PATH = /srv/gogs/data/avatars
+AVATAR_UPLOAD_PATH = data/avatars
 ; Chinese users can choose "duoshuo"
 ; or a custom avatar source, like: http://cn.gravatar.com/avatar/
 GRAVATAR_SOURCE = gravatar
 ; This value will be forced to be true in offline mode.
 DISABLE_GRAVATAR = false
 ; Federated avatar lookup uses DNS to discover avatar associated
-; with emails, see http://www.libravatar.org
+; with emails, see https://www.libravatar.org
 ; This value will be forced to be false in offline mode or Gravatar is disbaled.
 ENABLE_FEDERATED_AVATAR = false
 
@@ -240,7 +270,7 @@ ENABLE_FEDERATED_AVATAR = false
 ; Whether attachments are enabled. Defaults to `true`
 ENABLE = true
 ; Path for attachments. Defaults to `data/attachments`
-PATH = /srv/gogs/data/attachments
+PATH = data/attachments
 ; One or more allowed types, e.g. image/jpeg|image/png
 ALLOWED_TYPES = image/jpeg|image/png
 ; Max size of each file. Defaults to 32MB
@@ -361,7 +391,7 @@ GC = 60
 
 [mirror]
 ; Default interval in hours between each check
-DEFAULT_INTERVAL = 24
+DEFAULT_INTERVAL = 8
 
 [api]
 ; Max number of items will response in a page
@@ -399,4 +429,4 @@ cs-CZ = cs-CZ
 [other]
 SHOW_FOOTER_BRANDING = false
 ; Show version information about gogs and go in the footer
-SHOW_FOOTER_VERSION = true
\ No newline at end of file
+SHOW_FOOTER_VERSION = true
diff --git a/app_old.ini b/app_old.ini
index e656aa79ead2..ce5c270553d7 100644
--- a/app_old.ini
+++ b/app_old.ini
@@ -17,8 +17,33 @@ ANSI_CHARSET =
 FORCE_PRIVATE = false
 ; Global maximum creation limit of repository per user, -1 means no limit
 MAX_CREATION_LIMIT = -1
-; Patch test queue length, make it as large as possible
-PULL_REQUEST_QUEUE_LENGTH = 10000
+; Mirror sync queue length, increase if mirror syncing starts hanging
+MIRROR_QUEUE_LENGTH = 1000
+; Patch test queue length, increase if pull request patch testing starts hanging
+PULL_REQUEST_QUEUE_LENGTH = 1000
+; Preferred Licenses to place at the top of the List
+; Name must match file name in conf/license or custom/conf/license
+PREFERRED_LICENSES = Apache License 2.0,MIT License
+
+[repository.editor]
+; List of file extensions that should have line wraps in the CodeMirror editor
+; Separate extensions with a comma. To line wrap files w/o extension, just put a comma
+LINE_WRAP_EXTENSIONS = .txt,.md,.markdown,.mdown,.mkd,
+; Valid file modes that have a preview API associated with them, such as api/v1/markdown
+; Separate values by commas. Preview tab in edit mode won't show if the file extension doesn't match
+PREVIEWABLE_FILE_MODES = markdown
+
+[repository.upload]
+; Whether repository file uploads are enabled. Defaults to `true`
+ENABLED = true
+; Path for uploads. Defaults to `data/tmp/uploads` (tmp gets deleted on gogs restart)
+TEMP_PATH = data/tmp/uploads
+; One or more allowed types, e.g. image/jpeg|image/png. Nothing means any file type
+ALLOWED_TYPES =
+; Max size of each file in MB. Defaults to 3MB
+FILE_MAX_SIZE = 3
+; Max number of files per upload. Defaults to 5
+MAX_FILES = 5
 
 [ui]
 ; Number of repositories that are showed in one explore page
@@ -54,6 +79,9 @@ ENABLE_HARD_LINE_BREAK = false
 ; List of custom URL-Schemes that are allowed as links when rendering Markdown
 ; for example git,magnet
 CUSTOM_URL_SCHEMES =
+; List of file extensions that should be rendered/edited as Markdown
+; Separate extensions with a comma. To render files w/o extension as markdown, just put a comma
+FILE_EXTENSIONS = .md,.markdown,.mdown,.mkd
 
 [server]
 PROTOCOL = http
@@ -61,6 +89,8 @@ DOMAIN = localhost
 ROOT_URL = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s/
 HTTP_ADDR = 0.0.0.0
 HTTP_PORT = 3000
+; Permission for unix socket
+UNIX_SOCKET_PERMISSION = 666
 ; Local (DMZ) URL for Gogs workers (such as SSH update) accessing web service.
 ; In most cases you do not need to change the default value.
 ; Alter it only if your SSH server node is not the same as HTTP node.
@@ -156,7 +186,7 @@ ENABLE_REVERSE_PROXY_AUTO_REGISTRATION = false
 ENABLE_CAPTCHA = true
 
 [webhook]
-; Hook task queue length
+; Hook task queue length, increase if webhook shooting starts hanging
 QUEUE_LENGTH = 1000
 ; Deliver timeout in seconds
 DELIVER_TIMEOUT = 5
@@ -232,7 +262,7 @@ GRAVATAR_SOURCE = gravatar
 ; This value will be forced to be true in offline mode.
 DISABLE_GRAVATAR = false
 ; Federated avatar lookup uses DNS to discover avatar associated
-; with emails, see http://www.libravatar.org
+; with emails, see https://www.libravatar.org
 ; This value will be forced to be false in offline mode or Gravatar is disbaled.
 ENABLE_FEDERATED_AVATAR = false
 
@@ -361,7 +391,7 @@ GC = 60
 
 [mirror]
 ; Default interval in hours between each check
-DEFAULT_INTERVAL = 24
+DEFAULT_INTERVAL = 8
 
 [api]
 ; Max number of items will response in a page
@@ -399,4 +429,4 @@ cs-CZ = cs-CZ
 [other]
 SHOW_FOOTER_BRANDING = false
 ; Show version information about gogs and go in the footer
-SHOW_FOOTER_VERSION = true
\ No newline at end of file
+SHOW_FOOTER_VERSION = true