Merge branch 'main' of https://github.com/go-gitea/gitea into fix-null-fields

Author: KN4CK3R

.eslintrc

@@ -442,6 +442,7 @@ rules:
   unicorn/require-post-message-target-origin: [0]
   unicorn/string-content: [0]
   unicorn/template-indent: [2]
+  unicorn/text-encoding-identifier-case: [0]
   unicorn/throw-new-error: [2]
   use-isnan: [2]
   valid-typeof: [2, {requireStringLiterals: true}]

.stylelintrc

@@ -14,6 +14,7 @@ rules:
   declaration-block-no-redundant-longhand-properties: null
   declaration-block-single-line-max-declarations: null
   declaration-empty-line-before: null
+  function-no-unknown: null
   hue-degree-notation: null
   indentation: 2
   max-line-length: null

Makefile

@@ -235,7 +235,7 @@ clean:
 .PHONY: fmt
 fmt:
 	@hash gofumpt > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
-		$(GO) install mvdan.cc/gofumpt@latest; \
+		$(GO) install mvdan.cc/gofumpt@v0.3.0; \
 	fi
 	@echo "Running gitea-fmt (with gofumpt)..."
 	@$(GO) run build/code-batch-process.go gitea-fmt -w '{file-list}'
@@ -287,7 +287,7 @@ errcheck:
 .PHONY: fmt-check
 fmt-check:
 	@hash gofumpt > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
-		$(GO) install mvdan.cc/gofumpt@latest; \
+		$(GO) install mvdan.cc/gofumpt@0.3.0; \
 	fi
 	# get all go files and run gitea-fmt (with gofmt) on them
 	@diff=$$($(GO) run build/code-batch-process.go gitea-fmt -l '{file-list}'); \

custom/conf/app.example.ini

@@ -1115,7 +1115,7 @@ PATH =
 ;SEARCH_REPO_DESCRIPTION = true
 ;;
 ;; Whether to enable a Service Worker to cache frontend assets
-;USE_SERVICE_WORKER = true
+;USE_SERVICE_WORKER = false
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

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

@@ -189,7 +189,7 @@ The following configuration set `Content-Type: application/vnd.android.package-a
     add it to this config.
 - `DEFAULT_SHOW_FULL_NAME`: **false**: Whether the full name of the users should be shown where possible. If the full name isn't set, the username will be used.
 - `SEARCH_REPO_DESCRIPTION`: **true**: Whether to search within description at repository search on explore page.
-- `USE_SERVICE_WORKER`: **true**: Whether to enable a Service Worker to cache frontend assets.
+- `USE_SERVICE_WORKER`: **false**: Whether to enable a Service Worker to cache frontend assets.
 
 ### UI - Admin (`ui.admin`)
 

docs/content/doc/developers/hacking-on-gitea.en-us.md

@@ -185,8 +185,6 @@ Before committing, make sure the linters pass:
 make lint-frontend
 ```
 
-Note: When working on frontend code, set `USE_SERVICE_WORKER` to `false` in `app.ini` to prevent undesirable caching of frontend assets.
-
 ### Configuring local ElasticSearch instance
 
 Start local ElasticSearch instance using docker:

integrations/gitea-repositories-meta/user30/empty.git/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/main

integrations/gitea-repositories-meta/user30/empty.git/config

@@ -0,0 +1,6 @@
+[core]
+	bare = true
+	repositoryformatversion = 0
+	filemode = false
+	symlinks = false
+	ignorecase = true

integrations/testlogger.go

@@ -181,6 +181,11 @@ func (log *TestLogger) Init(config string) error {
 	return nil
 }
 
+// Content returns the content accumulated in the content provider
+func (log *TestLogger) Content() (string, error) {
+	return "", fmt.Errorf("not supported")
+}
+
 // Flush when log should be flushed
 func (log *TestLogger) Flush() {
 }

models/fixtures/repository.yml

@@ -24,6 +24,7 @@
   owner_name: user2
   lower_name: repo2
   name: repo2
+  is_empty: false
   is_archived: false
   is_private: true
   num_issues: 2
@@ -41,6 +42,7 @@
   lower_name: repo3
   name: repo3
   is_archived: false
+  is_empty: false
   is_private: true
   num_issues: 1
   num_closed_issues: 0
@@ -57,6 +59,7 @@
   owner_name: user5
   lower_name: repo4
   name: repo4
+  is_empty: false
   is_private: false
   num_issues: 0
   num_closed_issues: 0
@@ -144,6 +147,7 @@
   owner_name: user12
   lower_name: repo10
   name: repo10
+  is_empty: false
   is_private: false
   num_issues: 0
   num_closed_issues: 0
@@ -161,6 +165,7 @@
   owner_name: user13
   lower_name: repo11
   name: repo11
+  is_empty: false
   is_private: false
   num_issues: 0
   num_closed_issues: 0
@@ -218,7 +223,8 @@
   owner_name: user2
   lower_name: repo15
   name: repo15
-  is_empty: true
+  is_empty: false
+  is_private: true
   status: 0
 
 -
@@ -227,6 +233,7 @@
   owner_name: user2
   lower_name: repo16
   name: repo16
+  is_empty: false
   is_private: true
   num_issues: 0
   num_closed_issues: 0
@@ -460,6 +467,8 @@
   owner_name: user2
   lower_name: repo20
   name: repo20
+  is_empty: false
+  is_private: true
   num_stars: 0
   num_forks: 0
   num_issues: 0
@@ -485,6 +494,7 @@
   owner_name: user2
   lower_name: utf8
   name: utf8
+  is_empty: false
   is_private: false
   status: 0
 
@@ -520,6 +530,7 @@
   owner_name: user2
   lower_name: commits_search_test
   name: commits_search_test
+  is_empty: false
   is_private: false
   num_stars: 0
   num_forks: 0
@@ -533,6 +544,7 @@
   owner_name: user2
   lower_name: git_hooks_test
   name: git_hooks_test
+  is_empty: false
   is_private: false
   num_stars: 0
   num_forks: 0
@@ -546,6 +558,7 @@
   owner_name: limited_org
   lower_name: public_repo_on_limited_org
   name: public_repo_on_limited_org
+  is_empty: false
   is_private: false
   num_stars: 0
   num_forks: 0
@@ -559,6 +572,7 @@
   owner_name: limited_org
   lower_name: private_repo_on_limited_org
   name: private_repo_on_limited_org
+  is_empty: false
   is_private: true
   num_stars: 0
   num_forks: 0
@@ -572,6 +586,7 @@
   owner_name: privated_org
   lower_name: public_repo_on_private_org
   name: public_repo_on_private_org
+  is_empty: false
   is_private: false
   num_stars: 0
   num_forks: 0
@@ -585,6 +600,7 @@
   owner_name: privated_org
   lower_name: private_repo_on_private_org
   name: private_repo_on_private_org
+  is_empty: false
   is_private: true
   num_stars: 0
   num_forks: 0
@@ -597,6 +613,7 @@
   owner_name: user2
   lower_name: glob
   name: glob
+  is_empty: false
   is_private: false
   num_stars: 0
   num_forks: 0
@@ -623,6 +640,7 @@
   owner_name: user27
   lower_name: template1
   name: template1
+  is_empty: false
   is_private: false
   is_template: true
   num_stars: 0
@@ -651,6 +669,7 @@
   owner_name: org26
   lower_name: repo_external_tracker
   name: repo_external_tracker
+  is_empty: false
   is_private: false
   num_stars: 0
   num_forks: 0
@@ -664,6 +683,7 @@
   owner_name: org26
   lower_name: repo_external_tracker_numeric
   name: repo_external_tracker_numeric
+  is_empty: false
   is_private: false
   num_stars: 0
   num_forks: 0
@@ -677,6 +697,7 @@
   owner_name: org26
   lower_name: repo_external_tracker_alpha
   name: repo_external_tracker_alpha
+  is_empty: false
   is_private: false
   num_stars: 0
   num_forks: 0
@@ -691,6 +712,7 @@
   owner_name: user27
   lower_name: repo49
   name: repo49
+  is_empty: false
   is_private: false
   num_stars: 0
   num_forks: 0
@@ -737,3 +759,13 @@
   num_projects: 0
   num_closed_projects: 0
   status: 0
+
+-
+  id: 52
+  owner_id: 30
+  owner_name: user30
+  lower_name: empty
+  name: empty
+  is_empty: true
+  is_private: true
+  status: 0

models/fixtures/user.yml

@@ -523,7 +523,7 @@
   is_restricted: true
   avatar: avatar29
   avatar_email: user30@example.com
-  num_repos: 2
+  num_repos: 3
   is_active: true
   prohibit_login: true
 

models/issue_xref.go

@@ -195,7 +195,8 @@ func (issue *Issue) updateCrossReferenceList(list []*crossReference, xref *cross
 
 // verifyReferencedIssue will check if the referenced issue exists, and whether the doer has permission to do what
 func (issue *Issue) verifyReferencedIssue(stdCtx context.Context, ctx *crossReferencesContext, repo *repo_model.Repository,
-	ref references.IssueReference) (*Issue, references.XRefAction, error) {
+	ref references.IssueReference,
+) (*Issue, references.XRefAction, error) {
 	refIssue := &Issue{RepoID: repo.ID, Index: ref.Index}
 	refAction := ref.Action
 	e := db.GetEngine(stdCtx)

models/migrations/testlogger_test.go

@@ -166,6 +166,11 @@ func (log *TestLogger) Init(config string) error {
 	return nil
 }
 
+// Content returns the content accumulated in the content provider
+func (log *TestLogger) Content() (string, error) {
+	return "", fmt.Errorf("not supported")
+}
+
 // Flush when log should be flushed
 func (log *TestLogger) Flush() {
 }

models/migrations/v210.go

@@ -11,8 +11,8 @@ import (
 	"strings"
 
 	"code.gitea.io/gitea/modules/timeutil"
-	"github.com/tstranex/u2f"
 
+	"github.com/tstranex/u2f"
 	"xorm.io/xorm"
 	"xorm.io/xorm/schemas"
 )
@@ -137,17 +137,23 @@ func remigrateU2FCredentials(x *xorm.Engine) error {
 					CreatedUnix:     reg.CreatedUnix,
 				}
 
-				has, err := sess.ID(reg.ID).Where("id = ?", reg.ID).Get(new(webauthnCredential))
+				has, err := sess.ID(reg.ID).Get(new(webauthnCredential))
 				if err != nil {
 					return fmt.Errorf("unable to get webauthn_credential[%d]. Error: %w", reg.ID, err)
 				}
 				if !has {
-					_, err = sess.Insert(remigrated)
+					has, err := sess.Where("`lower_name`=?", remigrated.LowerName).And("`user_id`=?", remigrated.UserID).Exist(new(webauthnCredential))
 					if err != nil {
-						return fmt.Errorf("unable to (re)insert webauthn_credential[%d]. Error: %w", reg.ID, err)
+						return fmt.Errorf("unable to check webauthn_credential[lower_name: %s, user_id:%v]. Error: %w", remigrated.LowerName, remigrated.UserID, err)
 					}
+					if !has {
+						_, err = sess.Insert(remigrated)
+						if err != nil {
+							return fmt.Errorf("unable to (re)insert webauthn_credential[%d]. Error: %w", reg.ID, err)
+						}
 
-					continue
+						continue
+					}
 				}
 
 				_, err = sess.ID(remigrated.ID).AllCols().Update(remigrated)

models/migrations/v210_test.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"code.gitea.io/gitea/modules/timeutil"
+
 	"github.com/stretchr/testify/assert"
 	"xorm.io/xorm/schemas"
 )