Update version 0.9.13

6 files changed, 36 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 51d2882585fb..8f3886609813 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 # Generated by mksrcinfo v8
-# Mon Mar  7 06:12:58 UTC 2016
+# Sat Mar 19 21:05:14 UTC 2016
 pkgbase = gogs
 	pkgdesc = Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language.
-	pkgver = 0.9.0
-	pkgrel = 3
-	epoch = 2
+	pkgver = 0.9.13
+	pkgrel = 1
+	epoch = 1
 	url = http://gogs.io/
 	install = gogs.install
 	arch = i686
@@ -32,9 +32,9 @@ pkgbase = gogs
 	source = gogs.service.patch
 	source = app.ini.patch
 	source = helper.sh
-	source = gogs::git+https://github.com/gogits/gogs.git#tag=v0.9.0
+	source = gogs::git+https://github.com/gogits/gogs.git#tag=v0.9.13
 	sha512sums = 834e95fe9bcfa291a573ad1fa43f41bbed844658a918ff4fcf53ab8a44a296206ee4003eab1d9a2785c9126be077022f4907846d2eb6c5d64050b5e81ce47f44
-	sha512sums = a7964ccdec7738fff0fce36644cb7144641536b9a43638e9dfe2fce75f17c8ec586dd844a804d742df8be66d7209d83fd67e73f4085c70cb1b84bb6b596fda23
+	sha512sums = 77589148ac4afe09bb1b3f70491fa3b1838299f02216b2a24598f0f468356b2cfbaae397cc693e93f406e1c537d5ae24bc51530d9826879d201b72b19bee376c
 	sha512sums = e45775adafeecad5deaf24a98cd85b25a8383cb0e89905b2927c13fe7f0ec9918a42071ce43eabc429d8a826db93bb75ffb1927dce9c431ed88b0b5c619fd60d
 	sha512sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index cde3a659ded0..531fb0fc1c71 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=gogs
 _pkgname=${pkgname}
-pkgver=0.9.0
-pkgrel=3
-epoch=2
+pkgver=0.9.13
+pkgrel=1
+epoch=1
 pkgdesc="Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language."
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url="http://gogs.io/"
@@ -32,7 +32,7 @@ source=('gogs.service.patch'
         "$_pkgname::git+https://${_gourl}.git#tag=v${pkgver}")
 
 sha512sums=(834e95fe9bcfa291a573ad1fa43f41bbed844658a918ff4fcf53ab8a44a296206ee4003eab1d9a2785c9126be077022f4907846d2eb6c5d64050b5e81ce47f44
-            a7964ccdec7738fff0fce36644cb7144641536b9a43638e9dfe2fce75f17c8ec586dd844a804d742df8be66d7209d83fd67e73f4085c70cb1b84bb6b596fda23
+            77589148ac4afe09bb1b3f70491fa3b1838299f02216b2a24598f0f468356b2cfbaae397cc693e93f406e1c537d5ae24bc51530d9826879d201b72b19bee376c
             e45775adafeecad5deaf24a98cd85b25a8383cb0e89905b2927c13fe7f0ec9918a42071ce43eabc429d8a826db93bb75ffb1927dce9c431ed88b0b5c619fd60d
             'SKIP')
 
diff --git a/app.ini.patch b/app.ini.patch
index 8ed660120dcf..b1185b4d5c67 100644
--- a/app.ini.patch
+++ b/app.ini.patch
@@ -10,23 +10,27 @@
 < STATIC_ROOT_PATH =
 ---
 > STATIC_ROOT_PATH = /usr/share/themes/gogs/default
-118c118
+97c97
+< APP_DATA_PATH = data
+---
+> APP_DATA_PATH = /srv/gogs/data
+120c120
 < PATH = data/gogs.db
 ---
 > PATH = /srv/gogs/sqlite/gogs.db
-205c205
+207c207
 < PROVIDER_CONFIG = data/sessions
 ---
-> PROVIDER_CONFIG = /srv/gogs/sessions
-218c218
+> PROVIDER_CONFIG = /srv/gogs/data/sessions
+220c220
 < AVATAR_UPLOAD_PATH = data/avatars
 ---
 > AVATAR_UPLOAD_PATH = /srv/gogs/data/avatars
-228c228
+230c230
 < PATH = data/attachments
 ---
 > PATH = /srv/gogs/data/attachments
-243c243
+245c245
 < ROOT_PATH =
 ---
 > ROOT_PATH = /var/log/gogs
diff --git a/app_new.ini b/app_new.ini
index 964ca0b78ea0..3299b385fc5e 100644
--- a/app_new.ini
+++ b/app_new.ini
@@ -93,6 +93,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 = /usr/share/themes/gogs/default
+; Default path for App data
+APP_DATA_PATH = /srv/gogs/data
 ; Application level GZIP support
 ENABLE_GZIP = false
 ; Landing page for non-logged users, can be "home" or "explore"
@@ -202,7 +204,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/sessions
+PROVIDER_CONFIG = /srv/gogs/data/sessions
 ; Session cookie name
 COOKIE_NAME = i_like_gogits
 ; If you use session in https only, default is false
diff --git a/app_old.ini b/app_old.ini
index ebe9c32fb05e..3d5ef38e85a3 100644
--- a/app_old.ini
+++ b/app_old.ini
@@ -93,6 +93,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 =
+; Default path for App data
+APP_DATA_PATH = data
 ; Application level GZIP support
 ENABLE_GZIP = false
 ; Landing page for non-logged users, can be "home" or "explore"
diff --git a/gogs.changelog b/gogs.changelog
index 13e5a57d5007..75c4e7f1ae52 100644
--- a/gogs.changelog
+++ b/gogs.changelog
@@ -1,3 +1,14 @@
+2016-03-19
+
+	* V0.9.13
+	Bug fix: Site admin cannot see private repositories on organization home page #2372
+	Bug fix: Non-local users can reset their password #2811
+	Bug fix: 500 when compare branches with name contains '#' #2822
+	Bug fix: Potential concurrency issue with builtin SSH server #2850
+	Improvement: Set HTML meta values for repository #2670
+	Improvement: Able to search user with username and full name #2792
+	Features: Support search user and repository on both explore page and admin panel #13
+
 2016-03-07
 
 	* V0.9.0