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

@@ -1,5 +1,5 @@
 ---
-date: "2023-01-07T22:03:00+01:00"
+date: "2016-11-08T16:00:00+02:00"
 title: "Dokumentation"
 slug: "documentation"
 url: "/de-de/"
@@ -27,11 +27,11 @@ Gitea ist ein [Gogs](http://gogs.io)-Fork.
 * 2 CPU Kerne und 1GB RAM sind für kleine Teams/Projekte ausreichend.
 * Gitea sollte unter einem seperaten nicht-root Account auf UNIX-Systemen ausgeführt werden.
   * Achtung: Gitea verwaltet die `~/.ssh/authorized_keys` Datei. Gitea unter einem normalen Benutzer auszuführen könnte dazu führen, dass dieser sich nicht mehr anmelden kann.
-* [Git](https://git-scm.com/) Version 2.0 oder aktueller wird benötigt.
+* [Git](https://git-scm.com/) Version 2.0 oder später wird benötigt.
-  * Wenn Git >= 2.1.2 und [Git LFS](https://git-lfs.github.com/) vorhanden ist, dann wird Git LFS Support automatisch für Gitea aktiviert.
+  * Wenn git >= 2.1.2. und [Git large file storage](https://git-lfs.github.com/) aktiviert ist, dann wird es auch in Gitea verwendbar sein.
-  * Wenn Git >= 2.18, dann wird das Rendern von Commit-Graphen automatisch aktiviert.
+  * Wenn git >= 2.18, dann wird das Rendern von Commit-Graphen automatisch aktiviert.
 
 ## Browser Unterstützung
 
-* Die neuesten zwei Versionen von Chrome, Firefox, Safari und Edge
+* Letzten 2 Versions von Chrome, Firefox, Safari und Edge
 * Firefox ESR

go.mod

@@ -303,6 +303,8 @@ replace github.com/hashicorp/go-version => github.com/6543/go-version v1.3.1
 
 replace github.com/shurcooL/vfsgen => github.com/lunny/vfsgen v0.0.0-20220105142115-2c99e1ffdfa0
 
+replace github.com/satori/go.uuid v1.2.0 => github.com/gofrs/uuid v4.2.0+incompatible
+
 replace github.com/blevesearch/zapx/v15 v15.3.6 => github.com/zeripath/zapx/v15 v15.3.6-alignment-fix
 
 exclude github.com/gofrs/uuid v3.2.0+incompatible
@@ -310,5 +312,3 @@ exclude github.com/gofrs/uuid v3.2.0+incompatible
 exclude github.com/gofrs/uuid v4.0.0+incompatible
 
 exclude github.com/goccy/go-json v0.4.11
-
-exclude github.com/satori/go.uuid v1.2.0

go.sum

@@ -596,6 +596,7 @@ github.com/goccy/go-json v0.10.0 h1:mXKd9Qw4NuzShiRlOXKews24ufknHO7gx30lsDyokKA=
 github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=

models/db/context.go

@@ -98,31 +98,19 @@ type Committer interface {
 // halfCommitter is a wrapper of Committer.
 // It can be closed early, but can't be committed early, it is useful for reusing a transaction.
 type halfCommitter struct {
-	committer Committer
+	Committer
-	committed bool
 }
 
-func (c *halfCommitter) Commit() error {
+func (*halfCommitter) Commit() error {
-	c.committed = true
+	// do nothing
-	// should do nothing, and the parent committer will commit later
 	return nil
 }
 
-func (c *halfCommitter) Close() error {
-	if c.committed {
-		// it's "commit and close", should do nothing, and the parent committer will commit later
-		return nil
-	}
-
-	// it's "rollback and close", let the parent committer rollback right now
-	return c.committer.Close()
-}
-
 // TxContext represents a transaction Context,
 // it will reuse the existing transaction in the parent context or create a new one.
 func TxContext(parentCtx context.Context) (*Context, Committer, error) {
 	if sess, ok := inTransaction(parentCtx); ok {
-		return newContext(parentCtx, sess, true), &halfCommitter{committer: sess}, nil
+		return newContext(parentCtx, sess, true), &halfCommitter{Committer: sess}, nil
 	}
 
 	sess := x.NewSession()
@@ -138,12 +126,7 @@ func TxContext(parentCtx context.Context) (*Context, Committer, error) {
 // this function will reuse it otherwise will create a new one and close it when finished.
 func WithTx(parentCtx context.Context, f func(ctx context.Context) error) error {
 	if sess, ok := inTransaction(parentCtx); ok {
-		err := f(newContext(parentCtx, sess, true))
+		return f(newContext(parentCtx, sess, true))
-		if err != nil {
-			// rollback immediately, in case the caller ignores returned error and tries to commit the transaction.
-			_ = sess.Close()
-		}
-		return err
 	}
 	return txWithNoCheck(parentCtx, f)
 }

models/db/context_committer_test.go

@@ -1,102 +0,0 @@
-// Copyright 2022 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package db // it's not db_test, because this file is for testing the private type halfCommitter
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-type MockCommitter struct {
-	wants []string
-	gots  []string
-}
-
-func NewMockCommitter(wants ...string) *MockCommitter {
-	return &MockCommitter{
-		wants: wants,
-	}
-}
-
-func (c *MockCommitter) Commit() error {
-	c.gots = append(c.gots, "commit")
-	return nil
-}
-
-func (c *MockCommitter) Close() error {
-	c.gots = append(c.gots, "close")
-	return nil
-}
-
-func (c *MockCommitter) Assert(t *testing.T) {
-	assert.Equal(t, c.wants, c.gots, "want operations %v, but got %v", c.wants, c.gots)
-}
-
-func Test_halfCommitter(t *testing.T) {
-	/*
-		Do something like:
-
-		ctx, committer, err := db.TxContext(db.DefaultContext)
-		if err != nil {
-			return nil
-		}
-		defer committer.Close()
-
-		// ...
-
-		if err != nil {
-			return nil
-		}
-
-		// ...
-
-		return committer.Commit()
-	*/
-
-	testWithCommitter := func(committer Committer, f func(committer Committer) error) {
-		if err := f(&halfCommitter{committer: committer}); err == nil {
-			committer.Commit()
-		}
-		committer.Close()
-	}
-
-	t.Run("commit and close", func(t *testing.T) {
-		mockCommitter := NewMockCommitter("commit", "close")
-
-		testWithCommitter(mockCommitter, func(committer Committer) error {
-			defer committer.Close()
-			return committer.Commit()
-		})
-
-		mockCommitter.Assert(t)
-	})
-
-	t.Run("rollback and close", func(t *testing.T) {
-		mockCommitter := NewMockCommitter("close", "close")
-
-		testWithCommitter(mockCommitter, func(committer Committer) error {
-			defer committer.Close()
-			if true {
-				return fmt.Errorf("error")
-			}
-			return committer.Commit()
-		})
-
-		mockCommitter.Assert(t)
-	})
-
-	t.Run("close and commit", func(t *testing.T) {
-		mockCommitter := NewMockCommitter("close", "close")
-
-		testWithCommitter(mockCommitter, func(committer Committer) error {
-			committer.Close()
-			committer.Commit()
-			return fmt.Errorf("error")
-		})
-
-		mockCommitter.Assert(t)
-	})
-}

modules/setting/mailer.go

@@ -178,25 +178,14 @@ func newMailService() {
 
 	// we want to warn if users use SMTP on a non-local IP;
 	// we might as well take the opportunity to check that it has an IP at all
-	// This check is not needed for sendmail
+	ips := tryResolveAddr(MailService.SMTPAddr)
-	switch MailService.Protocol {
+	if MailService.Protocol == "smtp" {
-	case "sendmail":
+		for _, ip := range ips {
-		var err error
+			if !ip.IsLoopback() {
-		MailService.SendmailArgs, err = shellquote.Split(sec.Key("SENDMAIL_ARGS").String())
+				log.Warn("connecting over insecure SMTP protocol to non-local address is not recommended")
-		if err != nil {
+				break
-			log.Error("Failed to parse Sendmail args: '%s' with error %v", sec.Key("SENDMAIL_ARGS").String(), err)
-		}
-	case "smtp", "smtps", "smtp+starttls", "smtp+unix":
-		ips := tryResolveAddr(MailService.SMTPAddr)
-		if MailService.Protocol == "smtp" {
-			for _, ip := range ips {
-				if !ip.IsLoopback() {
-					log.Warn("connecting over insecure SMTP protocol to non-local address is not recommended")
-					break
-				}
 			}
 		}
-	case "dummy": // just mention and do nothing
 	}
 
 	if MailService.From != "" {
@@ -225,6 +214,14 @@ func newMailService() {
 		MailService.EnvelopeFrom = parsed.Address
 	}
 
+	if MailService.Protocol == "sendmail" {
+		var err error
+		MailService.SendmailArgs, err = shellquote.Split(sec.Key("SENDMAIL_ARGS").String())
+		if err != nil {
+			log.Error("Failed to parse Sendmail args: %s with error %v", CustomConf, err)
+		}
+	}
+
 	log.Info("Mail Service Enabled")
 }
 

templates/base/head_navbar.tmpl

@@ -77,7 +77,6 @@
 		</div>
 	{{else if .IsSigned}}
 		<div class="right stackable menu">
-			{{if EnableTimetracking}}
 			<a class="active-stopwatch-trigger item ui label {{if not .ActiveStopwatch}}hidden{{end}}" href="{{.ActiveStopwatch.IssueLink}}">
 				<span class="text">
 					<span class="fitted item">
@@ -116,7 +115,6 @@
 					</form>
 				</div>
 			</div>
-			{{end}}
 
 			<a href="{{AppSubUrl}}/notifications" class="item tooltip not-mobile" data-content="{{.locale.Tr "notifications"}}" aria-label="{{.locale.Tr "notifications"}}">
 				<span class="text">

tools/fuzz_test.go

@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package fuzz
+package main
 
 import (
 	"bytes"

web_src/js/features/stopwatch.js

@@ -24,7 +24,6 @@ export function initStopwatch() {
     trigger: 'click',
     maxWidth: 'none',
     interactive: true,
-    hideOnClick: true,
   });
 
   // global stop watch (in the head_navbar), it should always work in any case either the EventSource or the PeriodicPoller is used.