Merge branch 'main' into fix-incorrect-value-in-oauth-tmpl

Author: lunny

.eslintrc.yaml

@@ -164,7 +164,7 @@ rules:
   jquery/no-parse-html: [2]
   jquery/no-prop: [0]
   jquery/no-proxy: [2]
-  jquery/no-ready: [0]
+  jquery/no-ready: [2]
   jquery/no-serialize: [2]
   jquery/no-show: [2]
   jquery/no-size: [2]

build/backport-locales.go

@@ -77,10 +77,11 @@ func main() {
 				if secNew.HasKey(keyEnUs.Name()) {
 					oldStr := secOld.Key(keyEnUs.Name()).String()
 					newStr := secNew.Key(keyEnUs.Name()).String()
-					// A bug: many of new translations with ";" are broken in Crowdin (due to last messy restoring)
-					// As the broken strings are gradually fixed, this workaround check could be removed (in a few months?)
-					if strings.Contains(oldStr, ";") && !strings.Contains(newStr, ";") {
-						println("skip potential broken string", path, secEnUS.Name(), keyEnUs.Name())
+					if oldStr != "" && strings.Count(oldStr, "%") != strings.Count(newStr, "%") {
+						fmt.Printf("WARNING: locale %s [%s]%s has different number of arguments, skipping\n", path, secEnUS.Name(), keyEnUs.Name())
+						fmt.Printf("\told: %s\n", oldStr)
+						fmt.Printf("\tnew: %s\n", newStr)
+						fmt.Println("---- ")
 						continue
 					}
 					secOld.Key(keyEnUs.Name()).SetValue(newStr)

build/update-locales.sh

@@ -17,17 +17,10 @@ fi
 
 mv ./options/locale/locale_en-US.ini ./options/
 
-# the "ini" library for locale has many quirks
-#  * `a="xx"` gets `xx` (no quote)
-#  * `a=x\"y` gets `x\"y` (no unescaping)
-#  * `a="x\"y"` gets `"x\"y"` (no unescaping, the quotes are still there)
-#  * `a='x\"y'` gets `x\"y` (no unescaping, no quote)
-#  * `a="foo` gets `"foo` (although the quote is not closed)
-#  * 'a=`foo`' works like single-quote
-# crowdin needs the strings to be quoted correctly and doesn't like incomplete quotes
-# crowdin always outputs quoted strings if there are quotes in the strings.
-
-# this script helps to unquote the crowdin outputs for the quirky ini library
+# the "ini" library for locale has many quirks, its behavior is different from Crowdin.
+# see i18n_test.go for more details
+
+# this script helps to unquote the Crowdin outputs for the quirky ini library
 # * find all `key="...\"..."` lines
 # * remove the leading quote
 # * remove the trailing quote

custom/conf/app.example.ini

@@ -1238,6 +1238,10 @@ ROUTER = console
 ;;
 ;; Whether to enable a Service Worker to cache frontend assets
 ;USE_SERVICE_WORKER = false
+;;
+;; Whether to only show relevant repos on the explore page when no keyword is specified and default sorting is used.
+;; A repo is considered irrelevant if it's a fork or if it has no metadata (no description, no icon, no topic).
+;ONLY_SHOW_RELEVANT_REPOS = false
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

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

@@ -226,11 +226,13 @@ The following configuration set `Content-Type: application/vnd.android.package-a
     Values can be emoji alias (:smile:) or a unicode emoji.
     For custom reactions, add a tightly cropped square image to public/img/emoji/reaction_name.png
 - `CUSTOM_EMOJIS`: **gitea, codeberg, gitlab, git, github, gogs**: Additional Emojis not defined in the utf8 standard.
-    By default we support Gitea (:gitea:), to add more copy them to public/img/emoji/emoji_name.png and
+    By default, we support Gitea (:gitea:), to add more copy them to public/img/emoji/emoji_name.png and
     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`: **false**: Whether to enable a Service Worker to cache frontend assets.
+- `ONLY_SHOW_RELEVANT_REPOS`: **false** Whether to only show relevant repos on the explore page when no keyword is specified and default sorting is used.
+    A repo is considered irrelevant if it's a fork or if it has no metadata (no description, no icon, no topic).
 
 ### UI - Admin (`ui.admin`)
 

go.mod

@@ -289,7 +289,7 @@ replace github.com/shurcooL/vfsgen => github.com/lunny/vfsgen v0.0.0-20220105142
 
 replace github.com/blevesearch/zapx/v15 v15.3.6 => github.com/zeripath/zapx/v15 v15.3.6-alignment-fix
 
-replace github.com/nektos/act => gitea.com/gitea/act v0.243.1
+replace github.com/nektos/act => gitea.com/gitea/act v0.243.2-0.20230329055922-5e76853b55ab
 
 exclude github.com/gofrs/uuid v3.2.0+incompatible
 

go.sum

@@ -52,8 +52,8 @@ codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570/go.mod h1:IIAjsi
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:cliQ4HHsCo6xi2oWZYKWW4bly/Ory9FuTpFPRxj/mAg=
 git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078/go.mod h1:g/V2Hjas6Z1UHUp4yIx6bATpNzJ7DYtD0FG3+xARWxs=
-gitea.com/gitea/act v0.243.1 h1:zIVlhGOLE4SHFPW++u3+5Y/jX5mub3QIhB13oNf6rtA=
-gitea.com/gitea/act v0.243.1/go.mod h1:iLHCXqOPUElA2nSyHo4wtxSmvdkym3WU7CkP3AxF39Q=
+gitea.com/gitea/act v0.243.2-0.20230329055922-5e76853b55ab h1:HDImhO/XpMJrw2PJcADI/wgur9Gro/pegLFaRt8Wpg0=
+gitea.com/gitea/act v0.243.2-0.20230329055922-5e76853b55ab/go.mod h1:mabw6AZAiDgxGlK83orWLrNERSPvgBJzEUS3S7u2bHI=
 gitea.com/go-chi/binding v0.0.0-20221013104517-b29891619681 h1:MMSPgnVULVwV9kEBgvyEUhC9v/uviZ55hPJEMjpbNR4=
 gitea.com/go-chi/binding v0.0.0-20221013104517-b29891619681/go.mod h1:77TZu701zMXWJFvB8gvTbQ92zQ3DQq/H7l5wAEjQRKc=
 gitea.com/go-chi/cache v0.0.0-20210110083709-82c4c9ce2d5e/go.mod h1:k2V/gPDEtXGjjMGuBJiapffAXTv76H4snSmlJRLUhH0=

models/actions/run.go

@@ -197,7 +197,9 @@ func InsertRun(ctx context.Context, run *ActionRun, jobs []*jobparser.SingleWork
 	for _, v := range jobs {
 		id, job := v.Job()
 		needs := job.Needs()
-		job.EraseNeeds()
+		if err := v.SetJob(id, job.EraseNeeds()); err != nil {
+			return err
+		}
 		payload, _ := v.Marshal()
 		status := StatusWaiting
 		if len(needs) > 0 || run.NeedApproval {

models/auth/source.go

@@ -317,7 +317,14 @@ func UpdateSource(source *Source) error {
 		}
 	}
 
-	_, err := db.GetEngine(db.DefaultContext).ID(source.ID).AllCols().Update(source)
+	has, err := db.GetEngine(db.DefaultContext).Where("name=? AND id!=?", source.Name, source.ID).Exist(new(Source))
+	if err != nil {
+		return err
+	} else if has {
+		return ErrSourceAlreadyExist{source.Name}
+	}
+
+	_, err = db.GetEngine(db.DefaultContext).ID(source.ID).AllCols().Update(source)
 	if err != nil {
 		return err
 	}

models/migrations/migrations.go

@@ -477,6 +477,8 @@ var migrations = []Migration{
 	NewMigration("Add version column to action_runner table", v1_20.AddVersionToActionRunner),
 	// v249 -> v250
 	NewMigration("Improve Action table indices v3", v1_20.ImproveActionTableIndices),
+	// v250 -> v251
+	NewMigration("Change Container Metadata", v1_20.ChangeContainerMetadataMultiArch),
 }
 
 // GetCurrentDBVersion returns the current db version