new pkg version

7 files changed, 48 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a67da831cf5c..c5db4d817a71 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gogs-git
 	pkgdesc = Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language. This is the current git version from branch master.
-	pkgver = 2846.42a38df
+	pkgver = 2952.e0aab4a
 	pkgrel = 1
 	epoch = 1
 	url = http://gogs.io/
@@ -20,6 +20,7 @@ pkgbase = gogs-git
 	optdepends = redis: Redis support
 	optdepends = memcached: MemCached support
 	optdepends = openssh: GIT over SSH support
+	optdepends = tidb-git: TiDB support
 	conflicts = gogs-bin
 	conflicts = gogs
 	conflicts = gogs-git
@@ -30,8 +31,8 @@ pkgbase = gogs-git
 	source = app.ini.patch
 	source = helper.sh
 	source = gogs::git+https://github.com/gogits/gogs.git#branch=master
-	sha512sums = 2b4303f850e3b13b2fc3c9f0bc5820dae431d228002b35f01be0d4bfbcf05de8dcec2a559a85e318b609e4a4d492d44306eadf5f6508fd72333b198661bb0bb7
-	sha512sums = f80b4115ce39e6158beb7e6a68b7f0825e5c1320ba7c16f999986f2dfad0be08c238d220f556673f531080ddf540bd8e8eb6ea2559128109b0405baac163f013
+	sha512sums = c7abbe4af438a8a1db44537a16dbd40b82d50c921d53002c083071c4cd16644769e9d5dabbccedc1bd4ba563324186da4b4378365e098cc45df76402a657be90
+	sha512sums = ea000611134a2a794d75ec71bb18991e5b51117042522cdcfee17827ccd71c33003231ff19bff33e36d52cdff4799df88ca0a98937e3e1834a831a8d8744b739
 	sha512sums = e746dbdafc4c8d0b15a224dba95ae3151611ba9ff468ee6f0b1789e489955e4d7eaac0dbdf28a22e5b8211559af5950726f4a37d699a2490fd349f034401028c
 	sha512sums = SKIP
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..2ace2812281c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,11 @@
+*
+!.gitignore
+!app_ini.patch
+!app_old.ini
+!gogs.changelog
+!gogs.install
+!gogs.service
+!helper.sh
+!PKGBUILD
+!README.md
+!.SRCINFO
diff --git a/PKGBUILD b/PKGBUILD
index e54002a2f92d..2360c9d7df2b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=gogs-git
 _pkgname=gogs
 _branch=master
-pkgver=2846.42a38df
+pkgver=2952.e0aab4a
 pkgrel=1
 epoch=1
 pkgdesc="Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language. This is the current git version from branch ${_branch}."
@@ -17,7 +17,8 @@ optdepends=('sqlite: SQLite support'
             'postgresql: PostgreSQL support'
             'redis: Redis support'
             'memcached: MemCached support'
-            'openssh: GIT over SSH support')
+            'openssh: GIT over SSH support'
+            'tidb-git: TiDB support')
 makedepends=('go>=1.2' 'git>=1.7.1' 'patch')
 conflicts=('gogs-bin' 'gogs' 'gogs-git')
 options=('!strip' '!emptydirs')
@@ -31,8 +32,8 @@ source=('gogs.service'
         'helper.sh'
         "$_pkgname::git+https://${_gourl}.git#branch=${_branch}")
 
-sha512sums=(2b4303f850e3b13b2fc3c9f0bc5820dae431d228002b35f01be0d4bfbcf05de8dcec2a559a85e318b609e4a4d492d44306eadf5f6508fd72333b198661bb0bb7
-            f80b4115ce39e6158beb7e6a68b7f0825e5c1320ba7c16f999986f2dfad0be08c238d220f556673f531080ddf540bd8e8eb6ea2559128109b0405baac163f013
+sha512sums=(c7abbe4af438a8a1db44537a16dbd40b82d50c921d53002c083071c4cd16644769e9d5dabbccedc1bd4ba563324186da4b4378365e098cc45df76402a657be90
+            ea000611134a2a794d75ec71bb18991e5b51117042522cdcfee17827ccd71c33003231ff19bff33e36d52cdff4799df88ca0a98937e3e1834a831a8d8744b739
             e746dbdafc4c8d0b15a224dba95ae3151611ba9ff468ee6f0b1789e489955e4d7eaac0dbdf28a22e5b8211559af5950726f4a37d699a2490fd349f034401028c
             'SKIP')
 
diff --git a/app.ini.patch b/app.ini.patch
index f6cc8d1ee618..8fbcdc140d03 100644
--- a/app.ini.patch
+++ b/app.ini.patch
@@ -6,27 +6,31 @@
 < ROOT =
 ---
 > ROOT = /srv/gogs/repo
-53c53
+24c24
+< ; Number of users that are showed in one page
+---
+> ; Numer of users that are showed in one page
+61c61
 < STATIC_ROOT_PATH =
 ---
 > STATIC_ROOT_PATH = /usr/share/themes/gogs/default
-69c69
+77c77
 < PATH = data/gogs.db
 ---
 > PATH = /srv/gogs/sqlite/gogs.db
-160c160
+168c168
 < PROVIDER_CONFIG = data/sessions
 ---
 > PROVIDER_CONFIG = /srv/gogs/sessions
-175c175
+183c183
 < AVATAR_UPLOAD_PATH = data/avatars
 ---
 > AVATAR_UPLOAD_PATH = /srv/gogs/data/avatars
-185c185
+193c193
 < PATH = data/attachments
 ---
 > PATH = /srv/gogs/data/attachments
-200c200
+208c208
 < ROOT_PATH =
 ---
 > ROOT_PATH = /var/log/gogs
diff --git a/app_new.ini b/app_new.ini
index 9c75fc65b0d4..ef40eab7b0f6 100644
--- a/app_new.ini
+++ b/app_new.ini
@@ -17,10 +17,18 @@ SCRIPT_TYPE = bash
 EXPLORE_PAGING_NUM = 20
 ; Number of issues that are showed in one page
 ISSUE_PAGING_NUM = 10
+; Number of maximum commits showed in one activity feed
+FEED_MAX_COMMIT_NUM = 5
 
 [ui.admin]
 ; Numer of users that are showed in one page
 USER_PAGING_NUM = 50
+; Number of repos that are showed in one page
+REPO_PAGING_NUM = 50
+; Number of notices that are showed in one page
+NOTICE_PAGING_NUM = 50
+; Number of organization that are showed in one page
+ORG_PAGING_NUM = 50
 
 [markdown]
 ; Enable hard line break extension
diff --git a/app_old.ini b/app_old.ini
index 9d956fa816d8..615154193279 100644
--- a/app_old.ini
+++ b/app_old.ini
@@ -17,10 +17,18 @@ SCRIPT_TYPE = bash
 EXPLORE_PAGING_NUM = 20
 ; Number of issues that are showed in one page
 ISSUE_PAGING_NUM = 10
+; Number of maximum commits showed in one activity feed
+FEED_MAX_COMMIT_NUM = 5
 
 [ui.admin]
-; Numer of users that are showed in one page
+; Number of users that are showed in one page
 USER_PAGING_NUM = 50
+; Number of repos that are showed in one page
+REPO_PAGING_NUM = 50
+; Number of notices that are showed in one page
+NOTICE_PAGING_NUM = 50
+; Number of organization that are showed in one page
+ORG_PAGING_NUM = 50
 
 [markdown]
 ; Enable hard line break extension
diff --git a/gogs.service b/gogs.service
index f6cac7d2ac70..6c6e846e04f3 100644
--- a/gogs.service
+++ b/gogs.service
@@ -8,7 +8,7 @@ Type=simple
 User=gogs
 Group=gogs
 ExecStart=/usr/share/gogs/gogs web --config /srv/gogs/conf/app.ini
-WorkingDirectory=/usr/share/gogs/
+WorkingDirectory=/srv/gogs/
 
 [Install]
 WantedBy=multi-user.target