Merge branch 'master' into feature/main.go

Author: tboerger

.bra.toml

@@ -1,21 +1,9 @@
-# This is the official list of people who have contributed code to the Gitea/Gogs repository.
-# This document should be reviewed and approved by maintainers.
-#
-# The submission process automatically checks to make sure
-# that people submitting code are listed in this file (by email address).
-#
-# The agreement for individuals can be filled out on the web.
-#
-
-# Names should be added to this file like so:
-#     Individual's name <submission email address>
-#     Individual's name <submission email address> <email2> <emailN>
-#
-# An entry with multiple email addresses specifies that the
-# first address should be used in the submit logs and
-# that the other addresses should be recognized as the
-# same person when interacting with github.
-
-# Please keep the list sorted. 
-
-Lunny Xiao <[email protected]>
+Andrey Nering <[email protected]> (@andreynering)
+Kim Carlbäcker <[email protected]> (@bkcsoft)
+LefsFlare <[email protected]> (@LefsFlarey)
+Lunny Xiao <[email protected]> (@lunny)
+Rachid Zarouali <[email protected]> (@xinity)
+Rémy Boulanouar <[email protected]> (@DblK)
+Sandro Santilli <[email protected]> (@strk)
+Thibault Meyer <[email protected]> (@0xbaadf00d)
+Thomas Boerger <[email protected]> (@tboerger)

.codebeatignore

@@ -1,21 +1,9 @@
-# This is the official list of people who have spent time on code review Pull Requests on the Gitea repository.
-# This document should be reviewed and approved by owners.
-#
-# The submission process automatically checks to make sure
-# that people submitting code are listed in this file (by email address).
-#
-# The agreement for individuals can be filled out on the web.
-#
-
-# Names should be added to this file like so:
-#     Individual's name <submission email address>
-#     Individual's name <submission email address> <email2> <emailN>
-#
-# An entry with multiple email addresses specifies that the
-# first address should be used in the submit logs and
-# that the other addresses should be recognized as the
-# same person when interacting with github.
-
-# Please keep the list sorted. 
-
-Lunny Xiao <[email protected]>
+Andrey Nering <[email protected]> (@andreynering)
+Kim Carlbäcker <[email protected]> (@bkcsoft)
+LefsFlare <[email protected]> (@LefsFlarey)
+Lunny Xiao <[email protected]> (@lunny)
+Rachid Zarouali <[email protected]> (@xinity)
+Rémy Boulanouar <[email protected]> (@DblK)
+Sandro Santilli <[email protected]> (@strk)
+Thibault Meyer <[email protected]> (@0xbaadf00d)
+Thomas Boerger <[email protected]> (@tboerger)

.codebeatsettings

@@ -3,7 +3,7 @@ LDFLAGS += -X "github.com/go-gitea/gitea/modules/setting.BuildGitHash=$(shell gi
 
 DATA_FILES := $(shell find conf | sed 's/ /\\ /g')
 LESS_FILES := $(wildcard public/less/gogs.less public/less/_*.less)
-GENERATED  := modules/bindata/bindata.go public/css/gogs.css
+GENERATED  := modules/bindata/bindata.go public/css/index.css
 
 TAGS = ""
 BUILD_FLAGS = "-v"
@@ -15,7 +15,7 @@ GOVET = go tool vet -composites=false -methods=false -structtags=false
 
 .PHONY: build pack release bindata clean
 
-.IGNORE: public/css/gogs.css
+.IGNORE: public/css/index.css
 
 all: build
 
@@ -53,9 +53,9 @@ bindata: modules/bindata/bindata.go
 modules/bindata/bindata.go: $(DATA_FILES)
 	go-bindata -o=$@ -ignore="\\.DS_Store|README.md|TRANSLATORS" -pkg=bindata conf/...
 
-less: public/css/gogs.css
+less: public/css/index.css
 
-public/css/gogs.css: $(LESS_FILES)
+public/css/index.css: $(LESS_FILES)
 	lessc $< $@
 
 clean:

.gopmfile

@@ -26,8 +26,6 @@
 5. If you're interested in using APIs, we have experimental support with [documentation](https://github.com/gogits/go-gogs-client/wiki).
 6. If your team/company is using Gogs and would like to put your logo on [our website](https://gogs.io), contact us by any means.
 
-[简体中文](README_ZH.md)
-
 ## Purpose
 
 The goal of this project is to make the easiest, fastest, and most painless way of setting up a self-hosted Git service. With Go, this can be done with an independent binary distribution across **ALL platforms** that Go supports, including Linux, Mac OS X, Windows and ARM.