Dear all,
Please see the update for gitea-1.5.0 attached.
Changes: https://github.com/go-gitea/gitea/blob/master/CHANGELOG.md
--
With best regards,
Pavel Korovin
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/gitea/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile 14 Apr 2018 22:53:55 -0000 1.10
+++ Makefile 18 Aug 2018 18:57:59 -0000
@@ -2,11 +2,10 @@
COMMENT = compact self-hosted Git service
-VERSION = 1.4.0
+VERSION = 1.5.0
GH_ACCOUNT = go-gitea
GH_PROJECT = gitea
GH_TAGNAME = v${VERSION}
-REVISION = 0
CATEGORIES = www devel
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/gitea/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 8 Apr 2018 11:08:58 -0000 1.4
+++ distinfo 18 Aug 2018 18:57:59 -0000
@@ -1,2 +1,2 @@
-SHA256 (gitea-1.4.0.tar.gz) = gkSktjhRVidf/XCSHSViZhwa2W5YC0yi71LnOVuBDxM=
-SIZE (gitea-1.4.0.tar.gz) = 14983167
+SHA256 (gitea-1.5.0.tar.gz) = Onb/h4I2MB0jJPsM4nBRyeEb7r6hckgTNVwZ0QiUTm8=
+SIZE (gitea-1.5.0.tar.gz) = 18847969
Index: patches/patch-custom_conf_app_ini_sample
===================================================================
RCS file: /cvs/ports/www/gitea/patches/patch-custom_conf_app_ini_sample,v
retrieving revision 1.1
diff -u -p -r1.1 patch-custom_conf_app_ini_sample
--- patches/patch-custom_conf_app_ini_sample 8 Apr 2018 11:08:58 -0000
1.1
+++ patches/patch-custom_conf_app_ini_sample 18 Aug 2018 18:57:59 -0000
@@ -3,8 +3,8 @@ $OpenBSD: patch-custom_conf_app_ini_samp
Index: custom/conf/app.ini.sample
--- custom/conf/app.ini.sample.orig
+++ custom/conf/app.ini.sample
-@@ -5,12 +5,12 @@
- ; App name that shows on every page title
+@@ -7,12 +7,12 @@
+ ; App name that shows in every page title
APP_NAME = Gitea: Git with a cup of tea
; Change it if you run locally
-RUN_USER = git
@@ -19,7 +19,7 @@ Index: custom/conf/app.ini.sample
SCRIPT_TYPE = bash
; Default ANSI charset
ANSI_CHARSET =
-@@ -50,7 +50,7 @@ LOCAL_WIKI_PATH = tmp/local-wiki
+@@ -52,7 +52,7 @@ LOCAL_WIKI_PATH = tmp/local-wiki
; Whether repository file uploads are enabled. Defaults to `true`
ENABLED = true
; Path for uploads. Defaults to `data/tmp/uploads` (tmp gets deleted on gitea
restart)
@@ -27,17 +27,17 @@ Index: custom/conf/app.ini.sample
+TEMP_PATH = ${LOCALSTATEDIR}/gitea/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
-@@ -134,7 +134,7 @@ SSH_DOMAIN = %(DOMAIN)s
- ; Network interface builtin SSH server listens on
+ ; Max size of each file in megabytes. Defaults to 3MB
+@@ -137,7 +137,7 @@ SSH_DOMAIN = %(DOMAIN)s
+ ; THe network interface the builtin SSH server should listen on
SSH_LISTEN_HOST =
; Port number to be exposed in clone URL
-SSH_PORT = 22
+SSH_PORT = 2222
- ; Port number builtin SSH server listens on
+ ; The port number the builtin SSH server should listen on
SSH_LISTEN_PORT = %(SSH_PORT)s
; Root path of SSH directory, default is '~/.ssh', but you have to use
'/home/git/.ssh'.
-@@ -169,13 +169,13 @@ DISABLE_ROUTER_LOG = false
+@@ -172,13 +172,13 @@ DISABLE_ROUTER_LOG = false
; not forget to export the private key):
; $ openssl pkcs12 -in cert.pfx -out cert.pem -nokeys
; $ openssl pkcs12 -in cert.pfx -out key.pem -nocerts -nodes
@@ -45,7 +45,7 @@ Index: custom/conf/app.ini.sample
-KEY_FILE = custom/https/key.pem
+CERT_FILE = ${LOCALSTATEDIR}/gitea/custom/https/cert.pem
+KEY_FILE = ${LOCALSTATEDIR}/gitea/custom/https/key.pem
- ; Upper level of template and static file path
+ ; Root directory containing templates and static files.
; default is the path where Gitea is executed
STATIC_ROOT_PATH =
; Default path for App data
@@ -54,7 +54,16 @@ Index: custom/conf/app.ini.sample
; Application level GZIP support
ENABLE_GZIP = false
; Landing page, can be "home", "explore", or "organizations"
-@@ -196,7 +196,7 @@ DSA = 1024
+@@ -186,7 +186,7 @@ LANDING_PAGE = home
+ ; Enables git-lfs support. true or false, default is false.
+ LFS_START_SERVER = false
+ ; Where your lfs files reside, default is data/lfs.
+-LFS_CONTENT_PATH = data/lfs
++LFS_CONTENT_PATH = ${LOCALSTATEDIR}/gitea/data/lfs
+ ; LFS authentication secret, change this yourself
+ LFS_JWT_SECRET =
+ ; LFS authentication validity period (in time.Duration), pushes taking longer
than this may fail.
+@@ -201,7 +201,7 @@ DSA = 1024
[database]
; Either "mysql", "postgres", "mssql" or "sqlite3", it's your choice
@@ -63,16 +72,17 @@ Index: custom/conf/app.ini.sample
HOST = 127.0.0.1:3306
NAME = gitea
USER = root
-@@ -205,14 +205,14 @@ PASSWD =
+@@ -210,7 +210,7 @@ PASSWD =
; For "postgres" only, either "disable", "require" or "verify-full"
SSL_MODE = disable
- ; For "sqlite3" and "tidb", use absolute path when you start as service
+ ; For "sqlite3" and "tidb", use absolute path when you start gitea as service
-PATH = data/gitea.db
+PATH = ${LOCALSTATEDIR}/gitea/data/gitea.db
; For "sqlite3" only. Query timeout
SQLITE_TIMEOUT = 500
; For iterate buffer, default is 50
- ITERATE_BUFFER_SIZE = 50
+@@ -219,7 +219,7 @@ ITERATE_BUFFER_SIZE = 50
+ LOG_SQL = true
[indexer]
-ISSUE_INDEXER_PATH = indexers/issues.bleve
@@ -80,7 +90,7 @@ Index: custom/conf/app.ini.sample
; repo indexer by default disabled, since it uses a lot of disk space
REPO_INDEXER_ENABLED = false
REPO_INDEXER_PATH = indexers/repos.bleve
-@@ -339,8 +339,8 @@ HELO_HOSTNAME =
+@@ -350,8 +350,8 @@ HELO_HOSTNAME =
SKIP_VERIFY =
; Use client certificate
USE_CERTIFICATE = false
@@ -91,14 +101,14 @@ Index: custom/conf/app.ini.sample
; Mail from address, RFC 5322. This can be just an email address, or the
`"Name" <[email protected]>` format
FROM =
; Mailer user name and password
-@@ -371,13 +371,13 @@ ITEM_TTL = 16h
+@@ -382,13 +382,13 @@ ITEM_TTL = 16h
[session]
; Either "memory", "file", or "redis", default is "memory"
-PROVIDER = memory
+PROVIDER = file
; Provider config options
- ; memory: not have any config yet
+ ; memory: doesn't have any config yet
; 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`
@@ -107,25 +117,25 @@ Index: custom/conf/app.ini.sample
; Session cookie name
COOKIE_NAME = i_like_gitea
; If you use session in https only, default is false
-@@ -390,7 +390,7 @@ GC_INTERVAL_TIME = 86400
+@@ -401,7 +401,7 @@ GC_INTERVAL_TIME = 86400
SESSION_LIFE_TIME = 86400
[picture]
-AVATAR_UPLOAD_PATH = data/avatars
+AVATAR_UPLOAD_PATH = ${LOCALSTATEDIR}/gitea/data/avatars
- ; Chinese users can choose "duoshuo"
- ; or a custom avatar source, like: http://cn.gravatar.com/avatar/
- GRAVATAR_SOURCE = gravatar
-@@ -405,7 +405,7 @@ ENABLE_FEDERATED_AVATAR = false
+ ; Max Width and Height of uploaded avatars. This is to limit the amount of RAM
+ ; used when resizing the image.
+ AVATAR_MAX_WIDTH = 4096
+@@ -420,7 +420,7 @@ ENABLE_FEDERATED_AVATAR = false
; Whether attachments are enabled. Defaults to `true`
- ENABLE = true
+ ENABLED = true
; Path for attachments. Defaults to `data/attachments`
-PATH = data/attachments
+PATH = ${LOCALSTATEDIR}/gitea/data/attachments
; One or more allowed types, e.g. image/jpeg|image/png
ALLOWED_TYPES = image/jpeg|image/png|application/zip|application/gzip
- ; Max size of each file. Defaults to 32MB
-@@ -420,14 +420,14 @@ MAX_FILES = 5
+ ; Max size of each file. Defaults to 4MB
+@@ -435,14 +435,14 @@ MAX_FILES = 5
FORMAT =
[log]
@@ -135,7 +145,7 @@ Index: custom/conf/app.ini.sample
; Use comma to separate multiple modes, e.g. "console, file"
-MODE = console
+MODE = file
- ; Buffer length of channel, keep it as it is if you don't know what it is.
+ ; Buffer length of the channel, keep it as it is if you don't know what it is.
BUFFER_LEN = 10000
; Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is
"Trace"
-LEVEL = Trace
Index: patches/patch-main_go
===================================================================
RCS file: /cvs/ports/www/gitea/patches/patch-main_go,v
retrieving revision 1.2
diff -u -p -r1.2 patch-main_go
--- patches/patch-main_go 8 Apr 2018 11:08:58 -0000 1.2
+++ patches/patch-main_go 18 Aug 2018 18:57:59 -0000
@@ -9,7 +9,7 @@ Index: main.go
)
// Version holds the current Gitea version
--var Version = "1.4.0-dev"
+-var Version = "1.5.0-dev"
+var Version = "${VERSION}"
// Tags holds the build tags used
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/gitea/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 8 Apr 2018 11:08:58 -0000 1.5
+++ pkg/PLIST 18 Aug 2018 18:57:59 -0000
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.5 2018/04/08 11:08:58 pvk Exp $
@newgroup _gitea:787
@newuser _gitea:787:_gitea:daemon:Gitea Account:/nonexistent:/sbin/nologin
+@rcscript ${RCDIR}/gitea
@bin sbin/gitea
share/doc/pkg-readmes/${FULLPKGNAME}
share/gitea/
@@ -202,6 +203,7 @@ share/gitea/options/label/
share/gitea/options/label/Default
share/gitea/options/license/
share/gitea/options/license/0BSD
+share/gitea/options/license/389-exception
share/gitea/options/license/AAL
share/gitea/options/license/ADSL
share/gitea/options/license/AFL-1.1
@@ -210,7 +212,8 @@ share/gitea/options/license/AFL-2.0
share/gitea/options/license/AFL-2.1
share/gitea/options/license/AFL-3.0
share/gitea/options/license/AGPL-1.0
-share/gitea/options/license/AGPL-3.0
+share/gitea/options/license/AGPL-3.0-only
+share/gitea/options/license/AGPL-3.0-or-later
share/gitea/options/license/AMDPLPA
share/gitea/options/license/AML
share/gitea/options/license/AMPAS
@@ -233,9 +236,13 @@ share/gitea/options/license/Artistic-1.0
share/gitea/options/license/Artistic-1.0-Perl
share/gitea/options/license/Artistic-1.0-cl8
share/gitea/options/license/Artistic-2.0
+share/gitea/options/license/Autoconf-exception-2.0
+share/gitea/options/license/Autoconf-exception-3.0
+share/gitea/options/license/BSD-1-Clause
share/gitea/options/license/BSD-2-Clause
share/gitea/options/license/BSD-2-Clause-FreeBSD
share/gitea/options/license/BSD-2-Clause-NetBSD
+share/gitea/options/license/BSD-2-Clause-Patent
share/gitea/options/license/BSD-3-Clause
share/gitea/options/license/BSD-3-Clause-Attribution
share/gitea/options/license/BSD-3-Clause-Clear
@@ -251,8 +258,10 @@ share/gitea/options/license/BSL-1.0
share/gitea/options/license/Bahyph
share/gitea/options/license/Barr
share/gitea/options/license/Beerware
+share/gitea/options/license/Bison-exception-2.2
share/gitea/options/license/BitTorrent-1.0
share/gitea/options/license/BitTorrent-1.1
+share/gitea/options/license/Bootloader-exception
share/gitea/options/license/Borceux
share/gitea/options/license/CATOSL-1.1
share/gitea/options/license/CC-BY-1.0
@@ -282,12 +291,15 @@ share/gitea/options/license/CC-BY-SA-4.0
share/gitea/options/license/CC0-1.0
share/gitea/options/license/CDDL-1.0
share/gitea/options/license/CDDL-1.1
+share/gitea/options/license/CDLA-Permissive-1.0
+share/gitea/options/license/CDLA-Sharing-1.0
share/gitea/options/license/CECILL-1.0
share/gitea/options/license/CECILL-1.1
share/gitea/options/license/CECILL-2.0
share/gitea/options/license/CECILL-2.1
share/gitea/options/license/CECILL-B
share/gitea/options/license/CECILL-C
+share/gitea/options/license/CLISP-exception-2.0
share/gitea/options/license/CNRI-Jython
share/gitea/options/license/CNRI-Python
share/gitea/options/license/CNRI-Python-GPL-Compatible
@@ -297,6 +309,7 @@ share/gitea/options/license/CPOL-1.02
share/gitea/options/license/CUA-OPL-1.0
share/gitea/options/license/Caldera
share/gitea/options/license/ClArtistic
+share/gitea/options/license/Classpath-exception-2.0
share/gitea/options/license/Condor-1.1
share/gitea/options/license/Crossword
share/gitea/options/license/CrystalStacker
@@ -304,32 +317,46 @@ share/gitea/options/license/Cube
share/gitea/options/license/D-FSL-1.0
share/gitea/options/license/DOC
share/gitea/options/license/DSDP
+share/gitea/options/license/DigiRule-FOSS-exception
share/gitea/options/license/Dotseqn
share/gitea/options/license/ECL-1.0
share/gitea/options/license/ECL-2.0
share/gitea/options/license/EFL-1.0
share/gitea/options/license/EFL-2.0
share/gitea/options/license/EPL-1.0
+share/gitea/options/license/EPL-2.0
share/gitea/options/license/EUDatagrid
share/gitea/options/license/EUPL-1.0
share/gitea/options/license/EUPL-1.1
+share/gitea/options/license/EUPL-1.2
share/gitea/options/license/Entessa
share/gitea/options/license/ErlPL-1.1
share/gitea/options/license/Eurosym
+share/gitea/options/license/FLTK-exception
share/gitea/options/license/FSFAP
share/gitea/options/license/FSFUL
share/gitea/options/license/FSFULLR
share/gitea/options/license/FTL
share/gitea/options/license/Fair
+share/gitea/options/license/Fawkes-Runtime-exception
+share/gitea/options/license/Font-exception-2.0
share/gitea/options/license/Frameworx-1.0
share/gitea/options/license/FreeImage
-share/gitea/options/license/GFDL-1.1
-share/gitea/options/license/GFDL-1.2
-share/gitea/options/license/GFDL-1.3
+share/gitea/options/license/GCC-exception-2.0
+share/gitea/options/license/GCC-exception-3.1
+share/gitea/options/license/GFDL-1.1-only
+share/gitea/options/license/GFDL-1.1-or-later
+share/gitea/options/license/GFDL-1.2-only
+share/gitea/options/license/GFDL-1.2-or-later
+share/gitea/options/license/GFDL-1.3-only
+share/gitea/options/license/GFDL-1.3-or-later
share/gitea/options/license/GL2PS
-share/gitea/options/license/GPL-1.0
-share/gitea/options/license/GPL-2.0
-share/gitea/options/license/GPL-3.0
+share/gitea/options/license/GPL-1.0-only
+share/gitea/options/license/GPL-1.0-or-later
+share/gitea/options/license/GPL-2.0-only
+share/gitea/options/license/GPL-2.0-or-later
+share/gitea/options/license/GPL-3.0-only
+share/gitea/options/license/GPL-3.0-or-later
share/gitea/options/license/Giftware
share/gitea/options/license/Glide
share/gitea/options/license/Glulxe
@@ -351,9 +378,12 @@ share/gitea/options/license/JSON
share/gitea/options/license/JasPer-2.0
share/gitea/options/license/LAL-1.2
share/gitea/options/license/LAL-1.3
-share/gitea/options/license/LGPL-2.0
-share/gitea/options/license/LGPL-2.1
-share/gitea/options/license/LGPL-3.0
+share/gitea/options/license/LGPL-2.0-only
+share/gitea/options/license/LGPL-2.0-or-later
+share/gitea/options/license/LGPL-2.1-only
+share/gitea/options/license/LGPL-2.1-or-later
+share/gitea/options/license/LGPL-3.0-only
+share/gitea/options/license/LGPL-3.0-or-later
share/gitea/options/license/LGPLLR
share/gitea/options/license/LPL-1.0
share/gitea/options/license/LPL-1.02
@@ -362,12 +392,15 @@ share/gitea/options/license/LPPL-1.1
share/gitea/options/license/LPPL-1.2
share/gitea/options/license/LPPL-1.3a
share/gitea/options/license/LPPL-1.3c
+share/gitea/options/license/LZMA-exception
share/gitea/options/license/Latex2e
share/gitea/options/license/Leptonica
share/gitea/options/license/LiLiQ-P-1.1
share/gitea/options/license/LiLiQ-R-1.1
share/gitea/options/license/LiLiQ-Rplus-1.1
share/gitea/options/license/Libpng
+share/gitea/options/license/Libtool-exception
+share/gitea/options/license/Linux-syscall-note
share/gitea/options/license/MIT
share/gitea/options/license/MIT-CMU
share/gitea/options/license/MIT-advertising
@@ -403,9 +436,10 @@ share/gitea/options/license/Net-SNMP
share/gitea/options/license/NetCDF
share/gitea/options/license/Newsletr
share/gitea/options/license/Nokia
+share/gitea/options/license/Nokia-Qt-exception-1.1
share/gitea/options/license/Noweb
-share/gitea/options/license/Nunit
share/gitea/options/license/OCCT-PL
+share/gitea/options/license/OCCT-exception-1.0
share/gitea/options/license/OCLC-2.0
share/gitea/options/license/ODbL-1.0
share/gitea/options/license/OFL-1.0
@@ -441,6 +475,7 @@ share/gitea/options/license/PostgreSQL
share/gitea/options/license/Python-2.0
share/gitea/options/license/QPL-1.0
share/gitea/options/license/Qhull
+share/gitea/options/license/Qwt-exception-1.0
share/gitea/options/license/RHeCos-1.1
share/gitea/options/license/RPL-1.1
share/gitea/options/license/RPSL-1.0
@@ -478,7 +513,6 @@ share/gitea/options/license/Unicode-DFS-
share/gitea/options/license/Unicode-DFS-2016
share/gitea/options/license/Unicode-TOU
share/gitea/options/license/Unlicense
-share/gitea/options/license/Updating the SPDX Licenses
share/gitea/options/license/VOSTROM
share/gitea/options/license/VSL-1.0
share/gitea/options/license/Vim
@@ -488,6 +522,7 @@ share/gitea/options/license/W3C-20150513
share/gitea/options/license/WTFPL
share/gitea/options/license/Watcom-1.0
share/gitea/options/license/Wsuipa
+share/gitea/options/license/WxWindows-exception-3.1
share/gitea/options/license/X11
share/gitea/options/license/XFree86-1.1
share/gitea/options/license/XSkat
@@ -506,14 +541,21 @@ share/gitea/options/license/Zlib
share/gitea/options/license/curl
share/gitea/options/license/diffmark
share/gitea/options/license/dvipdfm
+share/gitea/options/license/eCos-exception-2.0
share/gitea/options/license/eGenix
+share/gitea/options/license/freertos-exception-2.0
share/gitea/options/license/gSOAP-1.3b
+share/gitea/options/license/gnu-javamail-exception
share/gitea/options/license/gnuplot
+share/gitea/options/license/i2p-gpl-java-exception
share/gitea/options/license/iMatix
share/gitea/options/license/libtiff
+share/gitea/options/license/mif-exception
share/gitea/options/license/mpich2
+share/gitea/options/license/openvpn-openssl-exception
share/gitea/options/license/psfrag
share/gitea/options/license/psutils
+share/gitea/options/license/u-boot-exception-2.0
share/gitea/options/license/xinetd
share/gitea/options/license/xpp
share/gitea/options/license/zlib-acknowledgement
@@ -593,6 +635,7 @@ share/gitea/public/less/_install.less
share/gitea/public/less/_markdown.less
share/gitea/public/less/_organization.less
share/gitea/public/less/_repository.less
+share/gitea/public/less/_tribute.less
share/gitea/public/less/_user.less
share/gitea/public/less/index.less
share/gitea/public/swagger.v1.json
@@ -635,9 +678,6 @@ share/gitea/public/vendor/assets/swagger
share/gitea/public/vendor/assets/swagger-ui/swagger-ui.js.map
share/gitea/public/vendor/librejs.html
share/gitea/public/vendor/plugins/
-share/gitea/public/vendor/plugins/autolink/
-share/gitea/public/vendor/plugins/autolink/LICENSE
-share/gitea/public/vendor/plugins/autolink/autolink.js
share/gitea/public/vendor/plugins/clipboard/
share/gitea/public/vendor/plugins/clipboard/LICENSE
share/gitea/public/vendor/plugins/clipboard/clipboard.min.js
@@ -2103,6 +2143,8 @@ share/gitea/public/vendor/plugins/simple
share/gitea/public/vendor/plugins/tribute/
share/gitea/public/vendor/plugins/tribute/tribute.css
share/gitea/public/vendor/plugins/tribute/tribute.min.js
+share/gitea/public/vendor/plugins/u2f/
+share/gitea/public/vendor/plugins/u2f/index.js
share/gitea/public/vendor/plugins/vue/
share/gitea/public/vendor/plugins/vue/LICENSE
share/gitea/public/vendor/plugins/vue/vue.min.js
@@ -2128,6 +2170,7 @@ share/gitea/templates/admin/org/
share/gitea/templates/admin/org/list.tmpl
share/gitea/templates/admin/repo/
share/gitea/templates/admin/repo/list.tmpl
+share/gitea/templates/admin/repo/search.tmpl
share/gitea/templates/admin/user/
share/gitea/templates/admin/user/edit.tmpl
share/gitea/templates/admin/user/list.tmpl
@@ -2148,9 +2191,11 @@ share/gitea/templates/custom/extra_tabs.
share/gitea/templates/custom/footer.tmpl
share/gitea/templates/custom/header.tmpl
share/gitea/templates/explore/
+share/gitea/templates/explore/code.tmpl
share/gitea/templates/explore/navbar.tmpl
share/gitea/templates/explore/organizations.tmpl
share/gitea/templates/explore/repo_list.tmpl
+share/gitea/templates/explore/repo_search.tmpl
share/gitea/templates/explore/repos.tmpl
share/gitea/templates/explore/search.tmpl
share/gitea/templates/explore/users.tmpl
@@ -2247,21 +2292,22 @@ share/gitea/templates/repo/settings/coll
share/gitea/templates/repo/settings/deploy_keys.tmpl
share/gitea/templates/repo/settings/githook_edit.tmpl
share/gitea/templates/repo/settings/githooks.tmpl
-share/gitea/templates/repo/settings/hook_delete_modal.tmpl
-share/gitea/templates/repo/settings/hook_dingtalk.tmpl
-share/gitea/templates/repo/settings/hook_discord.tmpl
-share/gitea/templates/repo/settings/hook_gitea.tmpl
-share/gitea/templates/repo/settings/hook_gogs.tmpl
-share/gitea/templates/repo/settings/hook_history.tmpl
-share/gitea/templates/repo/settings/hook_list.tmpl
-share/gitea/templates/repo/settings/hook_new.tmpl
-share/gitea/templates/repo/settings/hook_settings.tmpl
-share/gitea/templates/repo/settings/hook_slack.tmpl
-share/gitea/templates/repo/settings/hooks.tmpl
share/gitea/templates/repo/settings/nav.tmpl
share/gitea/templates/repo/settings/navbar.tmpl
share/gitea/templates/repo/settings/options.tmpl
share/gitea/templates/repo/settings/protected_branch.tmpl
+share/gitea/templates/repo/settings/webhook/
+share/gitea/templates/repo/settings/webhook/base.tmpl
+share/gitea/templates/repo/settings/webhook/delete_modal.tmpl
+share/gitea/templates/repo/settings/webhook/dingtalk.tmpl
+share/gitea/templates/repo/settings/webhook/discord.tmpl
+share/gitea/templates/repo/settings/webhook/gitea.tmpl
+share/gitea/templates/repo/settings/webhook/gogs.tmpl
+share/gitea/templates/repo/settings/webhook/history.tmpl
+share/gitea/templates/repo/settings/webhook/list.tmpl
+share/gitea/templates/repo/settings/webhook/new.tmpl
+share/gitea/templates/repo/settings/webhook/settings.tmpl
+share/gitea/templates/repo/settings/webhook/slack.tmpl
share/gitea/templates/repo/sub_menu.tmpl
share/gitea/templates/repo/user_cards.tmpl
share/gitea/templates/repo/view_file.tmpl
@@ -2295,6 +2341,8 @@ share/gitea/templates/user/auth/signup_o
share/gitea/templates/user/auth/signup_openid_register.tmpl
share/gitea/templates/user/auth/twofa.tmpl
share/gitea/templates/user/auth/twofa_scratch.tmpl
+share/gitea/templates/user/auth/u2f.tmpl
+share/gitea/templates/user/auth/u2f_error.tmpl
share/gitea/templates/user/dashboard/
share/gitea/templates/user/dashboard/dashboard.tmpl
share/gitea/templates/user/dashboard/feeds.tmpl
@@ -2308,27 +2356,22 @@ share/gitea/templates/user/notification/
share/gitea/templates/user/notification/notification.tmpl
share/gitea/templates/user/profile.tmpl
share/gitea/templates/user/settings/
-share/gitea/templates/user/settings/account_link.tmpl
+share/gitea/templates/user/settings/account.tmpl
share/gitea/templates/user/settings/applications.tmpl
-share/gitea/templates/user/settings/avatar.tmpl
-share/gitea/templates/user/settings/delete.tmpl
-share/gitea/templates/user/settings/email.tmpl
share/gitea/templates/user/settings/keys.tmpl
share/gitea/templates/user/settings/keys_gpg.tmpl
share/gitea/templates/user/settings/keys_ssh.tmpl
share/gitea/templates/user/settings/navbar.tmpl
-share/gitea/templates/user/settings/openid.tmpl
share/gitea/templates/user/settings/organization.tmpl
share/gitea/templates/user/settings/profile.tmpl
share/gitea/templates/user/settings/repos.tmpl
share/gitea/templates/user/settings/security.tmpl
-share/gitea/templates/user/settings/twofa.tmpl
+share/gitea/templates/user/settings/security_accountlinks.tmpl
+share/gitea/templates/user/settings/security_openid.tmpl
+share/gitea/templates/user/settings/security_twofa.tmpl
+share/gitea/templates/user/settings/security_u2f.tmpl
share/gitea/templates/user/settings/twofa_enroll.tmpl
@mode 750
@owner _gitea
@group _gitea
@sample /var/gitea/
-@owner
-@group
-@mode
-@rcscript ${RCDIR}/gitea
