Merge branch 'master' of https://github.com/go-gitea/gitea into prunehooktask

Author: bhalbright

.drone.yml

@@ -10,6 +10,12 @@ workspace:
   base: /go
   path: src/code.gitea.io/gitea
 
+trigger:
+  event:
+    - push
+    - tag
+    - pull_request
+
 steps:
   - name: deps-frontend
     pull: always
@@ -131,6 +137,12 @@ platform:
 depends_on:
   - compliance
 
+trigger:
+  event:
+    - push
+    - tag
+    - pull_request
+
 workspace:
   base: /go
   path: src/code.gitea.io/gitea
@@ -164,7 +176,7 @@ services:
     image: elasticsearch:7.5.0
 
   - name: minio
-    image: minio/minio:RELEASE.2020-10-09T22-55-05Z
+    image: minio/minio:RELEASE.2021-01-16T02-19-44Z
     commands:
     - minio server /data
     environment:
@@ -306,6 +318,12 @@ platform:
 depends_on:
   - compliance
 
+trigger:
+  event:
+    - push
+    - tag
+    - pull_request
+
 workspace:
   base: /go
   path: src/code.gitea.io/gitea
@@ -433,6 +451,45 @@ steps:
       CROWDIN_KEY:
         from_secret: crowdin_key
 
+---
+kind: pipeline
+name: update_gitignore_and_licenses
+
+platform:
+  os: linux
+  arch: amd64
+
+workspace:
+  base: /go
+  path: src/code.gitea.io/gitea
+
+trigger:
+  branch:
+    - master
+  event:
+    - cron
+  cron:
+    - update_gitignore_and_licenses
+
+steps:
+  - name: download
+    image: golang:1.15
+    commands:
+      - timeout -s ABRT 40m make generate-license generate-gitignore
+
+  - name: push
+    pull: always
+    image: appleboy/drone-git-push
+    settings:
+      author_email: "[email protected]"
+      author_name: GiteaBot
+      commit: true
+      commit_message: "[skip ci] Updated licenses and gitignores "
+      remote: "[email protected]:go-gitea/gitea.git"
+    environment:
+      GIT_PUSH_SSH_KEY:
+        from_secret: git_push_ssh_key
+
 ---
 kind: pipeline
 name: release-latest
@@ -623,6 +680,12 @@ platform:
 depends_on:
   - compliance
 
+trigger:
+  event:
+    - push
+    - tag
+    - pull_request
+
 steps:
   - name: build-docs
     pull: always

Makefile

@@ -709,7 +709,7 @@ pr\#%: clean-all
 golangci-lint:
 	@hash golangci-lint > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
 		export BINARY="golangci-lint"; \
-		curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(GOPATH)/bin v1.31.0; \
+		curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(GOPATH)/bin v1.35.2; \
 	fi
 	golangci-lint run --timeout 10m
 

custom/conf/app.example.ini

@@ -688,9 +688,8 @@ AUTO_WATCH_NEW_REPOS = true
 ; Default value for AutoWatchOnChanges
 ; Make the user watch a repository When they commit for the first time
 AUTO_WATCH_ON_CHANGES = false
-; Default value for the minimum age a user has to exist before deletion to keep issue comments.
-; If a user deletes his account before that amount of days, his comments will be deleted as well.
-USER_DELETE_WITH_COMMENTS_MAX_DAYS = 0
+; Minimum amount of time a user must exist before comments are kept when the user is deleted.
+USER_DELETE_WITH_COMMENTS_MAX_TIME = 0
 
 [webhook]
 ; Hook task queue length, increase if webhook shooting starts hanging

docs/config.yaml

@@ -359,3 +359,50 @@ languages:
           url: https://discourse.gitea.io/
           weight: 80
           pre: group
+
+  de-de:
+    weight: 7
+    languageName: Deutsch
+    menu:
+      page:
+        - name: Webseite
+          url: https://gitea.io/en-us/
+          weight: 10
+          pre: home
+          post: active
+        - name: Dokumentation
+          url: /de-de/
+          weight: 20
+          pre: question
+        - name: API
+          url: https://try.gitea.io/api/swagger
+          weight: 45
+          pre: plug
+        - name: Blog
+          url: https://blog.gitea.io/
+          weight: 30
+          pre: rss
+        - name: Code
+          url: https://code.gitea.io/
+          weight: 40
+          pre: code
+        - name: Übersetzung
+          url: https://crowdin.com/project/gitea
+          weight: 41
+          pre: language
+        - name: Downloads
+          url: https://dl.gitea.io/
+          weight: 50
+          pre: download
+        - name: GitHub
+          url: https://github.com/go-gitea/
+          weight: 60
+          pre: github
+        - name: Discord Chat
+          url: https://discord.gg/Gitea
+          weight: 70
+          pre: comment
+        - name: Forum
+          url: https://discourse.gitea.io/
+          weight: 80
+          pre: group

docs/content/doc/advanced/config-cheat-sheet.en-us.md

@@ -474,7 +474,7 @@ relation to port exhaustion.
 - `ALLOW_ONLY_EXTERNAL_REGISTRATION`: **false** Set to true to force registration only using third-party services.
 - `NO_REPLY_ADDRESS`: **DOMAIN** Default value for the domain part of the user's email address in the git log if he has set KeepEmailPrivate to true.
   The user's email will be replaced with a concatenation of the user name in lower case, "@" and NO_REPLY_ADDRESS.
-- `USER_DELETE_WITH_COMMENTS_MAX_DAYS`: **0** If a user deletes his account before that amount of days, his comments will be deleted as well.
+- `USER_DELETE_WITH_COMMENTS_MAX_TIME`: **0** Minimum amount of time a user must exist before comments are kept when the user is deleted.
 
 ## SSH Minimum Key Sizes (`ssh.minimum_key_sizes`)
 

docs/content/doc/installation/from-package.en-us.md

@@ -43,6 +43,11 @@ Arch Linux ARM provides packages for [aarch64](https://archlinuxarm.org/packages
 pacman -S gitea
 ```
 
+## SUSE and openSUSE
+
+OpenSUSE build service provides packages for [openSUSE and SLE](https://software.opensuse.org/download/package?package=gitea&project=devel%3Atools%3Ascm) 
+in the Development Software Configuration Management Repository
+
 ## Windows
 
 There is a [Gitea](https://chocolatey.org/packages/gitea) package for Windows by [Chocolatey](https://chocolatey.org/).

docs/content/doc/installation/with-docker.en-us.md

@@ -345,19 +345,23 @@ ports:
   - "127.0.0.1:2222:22"
 ```
 
-In addition, `/home/git/.ssh/authorized_keys` on the host needs to be modified. It needs to act in the same way as `authorized_keys` within the Gitea container. Therefore add
+In addition, `/home/git/.ssh/authorized_keys` on the host needs to be modified. It needs to act in the same way as `authorized_keys` within the Gitea container. Therefore add the public key of the key you created above ("Gitea Host Key") to `~/git/.ssh/authorized_keys`.
+This can be done via `echo "$(cat /home/git/.ssh/id_rsa.pub)" >> /home/git/.ssh/authorized_keys`.
+Important: The pubkey from the `git` user needs to be added "as is" while all other pubkeys added via the Gitea web interface will be prefixed with `command="/app [...]`.
 
-```bash
-command="/app/gitea/gitea --config=/data/gitea/conf/app.ini serv key-1",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-rsa <YOUR_SSH_PUBKEY>
-```
+The file should then look somewhat like
 
-and replace `<YOUR_SSH_PUBKEY>` with a valid SSH public key of yours.
+```bash
+# SSH pubkey from git user
+ssh-rsa <Gitea Host Key>
 
-In addition the public key of the `git` user on the host needs to be added to `/home/git/.ssh/authorized_keys` so authentication against the container can succeed: `echo "$(cat /home/git/.ssh/id_rsa.pub)" >> /home/git/.ssh/authorized_keys`.
+# other keys from users
+command="/app/gitea/gitea --config=/data/gitea/conf/app.ini serv key-1",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty <user pubkey>
+```
 
 Here is a detailed explanation what is happening when a SSH request is made:
 
-1. A SSH request is made against the host using the `git` user, e.g. `git clone git@domain:user/repo.git`.
+1. A SSH request is made against the host (usually port 22) using the `git` user, e.g. `git clone git@domain:user/repo.git`.
 2. In `/home/git/.ssh/authorized_keys` , the command executes the `/app/gitea/gitea` script.
 3. `/app/gitea/gitea` forwards the SSH request to port 2222 which is mapped to the SSH port (22) of the container.
 4. Due to the existence of the public key of the `git` user in `/home/git/.ssh/authorized_keys` the authentication host → container succeeds and the SSH request get forwarded to Gitea running in the docker container.

docs/content/doc/translation.de-de.md

@@ -0,0 +1,13 @@
+---
+date: "2021-01-22T00:00:00+02:00"
+title: "Übersetzung"
+slug: "translation"
+weight: 35
+toc: false
+draft: false
+menu:
+  sidebar:
+    name: "Übersetzung"
+    weight: 45
+    identifier: "translation"
+---

docs/content/doc/translation.en-us.md

@@ -0,0 +1,13 @@
+---
+date: "2021-01-22T00:00:00+02:00"
+title: "Translation"
+slug: "translation"
+weight: 35
+toc: false
+draft: false
+menu:
+  sidebar:
+    name: "Translation"
+    weight: 45
+    identifier: "translation"
+---

docs/content/doc/translation/guidelines.de-de.md

@@ -0,0 +1,61 @@
+---
+date: "2021-01-22T00:00:00+02:00"
+title: "Übersetzungs Richtlinien"
+weight: 10
+toc: true
+draft: false
+menu:
+  sidebar:
+    parent: "translation"
+    name: "Übersetzungsrichtlinien"
+    weight: 70
+    identifier: "translation-guidelines"
+---
+
+## Allgemeines
+
+Anrede: Wenig förmlich:
+* "Du"-Form
+* Keine "Amtsdeusch"-Umschreibungen, einfach so als ob man den Nutzer direkt persönlich ansprechen würde
+
+Genauer definiert:
+* "falsch" anstatt "nicht korrekt/inkorrekt"
+* Benutzerkonto oder Konto? Oder Account?
+* "Wende dich an ..." anstatt "kontaktiere ..."
+* In der selben Zeit übersetzen (sonst wird aus "is" "war")
+* Richtige Anführungszeichen verwenden. Also `"` statt `''` oder `'` oder \` oder `´`
+  * `„` für beginnende Anführungszeichen, `“` für schließende Anführungszeichen
+
+Es gelten Artikel und Worttrennungen aus dem Duden.
+
+## Formulierungen in Modals und Buttons
+
+Es sollten die gleichen Formulierungen auf Buttons und Modals verwendet werden.
+
+Beispiel: Wenn der Button mit `löschen` beschriftet ist, sollte im Modal die Frage lauten `Willst du das wirklich löschen?` und nicht `Willst du das wirklich entfernen?`. Gleiches gilt für Success/Errormeldungen nach der Aktion.
+
+## Trennungen
+
+* Pull-Request
+* Time-Tracker
+* E-Mail-Adresse (siehe Duden)
+
+## Artikeldefinitionen für Anglizismen
+
+* _Der_ Commit (m.)
+* _Der_ Branch (m.)
+* _Das_ Issue (n.)
+* _Der_ Fork (m.)
+* _Das_ Repository (n.)
+* _Der_ Pull-Request (m.)
+* _Der_ Token (m.)
+* _Das_ Review (n.)
+* _Der_ Key (m.)
+* _Der_ Committer (m.)
+
+## Weiterführende Links
+
+Diese beiden Links sind sehr empfehlenswert:
+
+* http://docs.translatehouse.org/projects/localization-guide/en/latest/guide/translation_guidelines_german.html
+* https://docs.qgis.org/2.18/en/docs/documentation_guidelines/do_translations.html

docs/content/doc/translation/guidelines.en-us.md

@@ -0,0 +1,17 @@
+---
+date: "2021-01-22T00:00:00+02:00"
+title: "Translation Guidelines"
+weight: 10
+toc: true
+draft: false
+menu:
+  sidebar:
+    parent: "translation"
+    name: "Translation Guidelines"
+    weight: 70
+    identifier: "translation-guidelines"
+---
+
+This place is used to provide a common set of rules to make sure the translation is consistent.
+
+* [German](/de-de/übersetzungs-richtlinien/)

docs/content/page/index.de-de.md

@@ -0,0 +1,36 @@
+---
+date: "2016-11-08T16:00:00+02:00"
+title: "Dokumentation"
+slug: "documentation"
+url: "/de-de/"
+weight: 10
+toc: false
+draft: false
+---
+
+# Was ist Gitea?
+
+Gitea ist ein einfacher, selbst gehosteter Git-Service. Änlich wie GitHub, Bitbucket oder GitLab.  
+Gitea ist ein [Gogs](http://gogs.io)-Fork.
+
+## Ziele
+
+ * Einfach zu installieren
+ * Plattformübergreifend
+ * Leichtgewichtig
+ * Quelloffen
+
+## System Voraussetzungen
+
+- A Raspberry Pi 3 is powerful enough to run Gitea for small workloads.
+- 2 CPU cores and 1GB RAM is typically sufficient for small teams/projects.
+- Gitea should be run with a dedicated non-root system account on UNIX-type systems.
+   - Note: Gitea manages the `~/.ssh/authorized_keys` file. Running Gitea as a regular user could break that user's ability to log in.
+- [Git](https://git-scm.com/) version 1.7.2 or later is required. Version 1.9.0 or later is recommended. Also please note:
+   - Git [large file storage](https://git-lfs.github.com/) will be available if enabled when git >= 2.1.2.
+   - Git commit-graph rendering will be enabled automatically when git >= 2.18.
+
+## Browser Unterstützung
+
+- Letzten 2 Versions von Chrome, Firefox, Safari, Edge (EdgeHTML) and Edge (Chromium)
+- Firefox ESR

go.mod

@@ -46,6 +46,7 @@ require (
 	github.com/gobwas/glob v0.2.3
 	github.com/gogs/chardet v0.0.0-20191104214054-4b6791f73a28
 	github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14
+	github.com/gogs/go-gogs-client v0.0.0-20200905025246-8bb8a50cb355
 	github.com/google/go-github/v32 v32.1.0
 	github.com/google/uuid v1.1.2
 	github.com/gorilla/context v1.1.1
@@ -128,3 +129,5 @@ require (
 replace github.com/hashicorp/go-version => github.com/6543/go-version v1.2.4
 
 replace github.com/microcosm-cc/bluemonday => github.com/lunny/bluemonday v1.0.5-0.20201227154428-ca34796141e8
+
+replace github.com/gogs/go-gogs-client => github.com/6543-forks/go-gogs-client v0.0.0-20210116182316-f2f8bc0ea9cc