Merge branch 'main' into feature/load-referencing-branches-and-tags

delvh · web-flow · commit f335dd1b1642 · 2023-07-22T14:17:35.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,34 @@ This changelog goes through all the changes that have been made in each release
 without substantial changes to our git log; to see the highlights of what has
 been added to each release, please refer to the [blog](https://blog.gitea.io).
 
+## [1.20.1](https://github.com/go-gitea/gitea/releases/tag/1.20.1) - 2023-07-22
+
+* SECURITY
+  * Disallow dangerous URL schemes (#25960) (#25964)
+* ENHANCEMENTS
+  * Show the mismatched ROOT_URL warning on the sign-in page if OAuth2 is enabled (#25947) (#25972)
+  * Make pending commit status yellow again (#25935) (#25968)
+* BUGFIXES
+  * Fix version in rpm repodata/primary.xml.gz (#26009) (#26048)
+  * Fix env config parsing for "GITEA____APP_NAME" (#26001) (#26013)
+  * ParseScope with owner/repo always sets owner to zero (#25987) (#25989)
+  * Fix SSPI auth panic (#25955) (#25969)
+  * Avoid creating directories when loading config (#25944) (#25957)
+  * Make environment-to-ini work with INSTALL_LOCK=true (#25926) (#25937)
+  * Ignore `runs-on` with expressions when warning no matched runners (#25917) (#25933)
+  * Avoid opening/closing PRs which are already merged (#25883) (#25903)
+* DOCS
+  * RPM Registry: Show zypper commands for SUSE based distros as well (#25981) (#26020)
+  * Correctly refer to dev tags as nightly in the docker docs (#26004) (#26019)
+  * Update path related documents (#25417) (#25982)
+* MISC
+  * Adding remaining enum for migration repo model type. (#26021) (#26034)
+  * Fix the route for pull-request's authors (#26016) (#26018)
+  * Fix commit status color on dashboard repolist (#25993) (#25998)
+  * Avoid hard-coding height in language dropdown menu (#25986) (#25997)
+  * Add shutting down notice (#25920) (#25922)
+  * Fix incorrect milestone count when provide a keyword (#25880) (#25904)
+
 ## [1.20.0](https://github.com/go-gitea/gitea/releases/tag/v1.20.0) - 2023-07-16
 
 * BREAKING
diff --git a/docs/content/doc/usage/secrets.en-us.md b/docs/content/doc/usage/secrets.en-us.md
@@ -18,7 +18,7 @@ menu:
 # Secrets
 
 Secrets allow you to store sensitive information in your user, organization or repository.
-Secrets are available on Gitea 1.19+.
+Secrets are available on Gitea 1.19+ and are only visible in 1.20+ when ACTIONS are enabled 
 
 # Naming your secrets
 
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
@@ -1451,7 +1451,7 @@ issues.context.quote_reply = Quote Reply
 issues.context.reference_issue = Reference in New Issue
 issues.context.edit = Edit
 issues.context.delete = Delete
-issues.no_content = There is no content yet.
+issues.no_content = No description provided.
 issues.close = Close Issue
 issues.comment_pull_merged_at = merged commit %[1]s into %[2]s %[3]s
 issues.comment_manually_pull_merged_at = manually merged commit %[1]s into %[2]s %[3]s
diff --git a/routers/web/web.go b/routers/web/web.go
@@ -1091,7 +1091,6 @@ func registerRoutes(m *web.Route) {
 		}, context.RepoRef(), canEnableEditor, context.RepoMustNotBeArchived())
 
 		m.Group("/branches", func() {
-			m.Get("/list", repo.GetBranchesList)
 			m.Group("/_new", func() {
 				m.Post("/branch/*", context.RepoRefByType(context.RepoRefBranch), repo.CreateBranch)
 				m.Post("/tag/*", context.RepoRefByType(context.RepoRefTag), repo.CreateBranch)
@@ -1248,6 +1247,7 @@ func registerRoutes(m *web.Route) {
 		}, repo.MustBeNotEmpty, dlSourceEnabled, reqRepoCodeReader)
 
 		m.Group("/branches", func() {
+			m.Get("/list", repo.GetBranchesList)
 			m.Get("", repo.Branches)
 		}, repo.MustBeNotEmpty, context.RepoRef(), reqRepoCodeReader)
 
diff --git a/services/packages/rpm/repository.go b/services/packages/rpm/repository.go
@@ -378,7 +378,7 @@ func buildPrimary(pv *packages_model.PackageVersion, pfs []*packages_model.Packa
 			Architecture: pd.FileMetadata.Architecture,
 			Version: Version{
 				Epoch:   pd.FileMetadata.Epoch,
-				Version: pd.Version.Version,
+				Version: pd.FileMetadata.Version,
 				Release: pd.FileMetadata.Release,
 			},
 			Checksum: Checksum{
@@ -466,7 +466,7 @@ func buildFilelists(pv *packages_model.PackageVersion, pfs []*packages_model.Pac
 			Architecture: pd.FileMetadata.Architecture,
 			Version: Version{
 				Epoch:   pd.FileMetadata.Epoch,
-				Version: pd.Version.Version,
+				Version: pd.FileMetadata.Version,
 				Release: pd.FileMetadata.Release,
 			},
 			Files: pd.FileMetadata.Files,
@@ -513,7 +513,7 @@ func buildOther(pv *packages_model.PackageVersion, pfs []*packages_model.Package
 			Architecture: pd.FileMetadata.Architecture,
 			Version: Version{
 				Epoch:   pd.FileMetadata.Epoch,
-				Version: pd.Version.Version,
+				Version: pd.FileMetadata.Version,
 				Release: pd.FileMetadata.Release,
 			},
 			Changelogs: pd.FileMetadata.Changelogs,
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl
@@ -47,8 +47,8 @@
 					{{range .Emails}}
 						<tr>
 							<td><a href="{{AppSubUrl}}/{{.Name | PathEscape}}">{{.Name}}</a></td>
-							<td><span class="text truncate">{{.FullName}}</span></td>
-							<td><span class="text email">{{.Email}}</span></td>
+							<td class="gt-ellipsis gt-max-width-12rem">{{.FullName}}</td>
+							<td class="gt-ellipsis gt-max-width-12rem">{{.Email}}</td>
 							<td>{{if .IsPrimary}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
 							<td>
 								{{if .CanChange}}
diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl
@@ -56,8 +56,8 @@
 								{{end}}
 							</td>
 							<td>{{.Package.Type.Name}}</td>
-							<td class="text truncate email">{{.Package.Name}}</td>
-							<td><a href="{{.FullWebLink}}" class="text truncate email">{{.Version.Version}}</a></td>
+							<td class="gt-ellipsis gt-max-width-12rem">{{.Package.Name}}</td>
+							<td class="gt-ellipsis gt-max-width-12rem"><a href="{{.FullWebLink}}">{{.Version.Version}}</a></td>
 							<td><a href="{{.Creator.HomeLink}}">{{.Creator.Name}}</a></td>
 							<td>
 							{{if .Repository}}
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl
@@ -85,7 +85,7 @@
 						<tr>
 							<td>{{.ID}}</td>
 							<td><a href="{{.HomeLink}}">{{.Name}}</a></td>
-							<td><span class="text truncate email">{{.Email}}</span></td>
+							<td class="gt-ellipsis gt-max-width-12rem">{{.Email}}</td>
 							<td>{{if .IsActive}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
 							<td>{{if .IsAdmin}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
 							<td>{{if .IsRestricted}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
diff --git a/tests/integration/api_packages_rpm_test.go b/tests/integration/api_packages_rpm_test.go
@@ -196,15 +196,15 @@ gpgkey=%sapi/packages/%s/rpm/repository.key`, user.Name, user.Name, setting.AppN
 				switch d.Type {
 				case "primary":
 					assert.EqualValues(t, 718, d.Size)
-					assert.EqualValues(t, 1731, d.OpenSize)
+					assert.EqualValues(t, 1729, d.OpenSize)
 					assert.Equal(t, "repodata/primary.xml.gz", d.Location.Href)
 				case "filelists":
-					assert.EqualValues(t, 258, d.Size)
-					assert.EqualValues(t, 328, d.OpenSize)
+					assert.EqualValues(t, 257, d.Size)
+					assert.EqualValues(t, 326, d.OpenSize)
 					assert.Equal(t, "repodata/filelists.xml.gz", d.Location.Href)
 				case "other":
-					assert.EqualValues(t, 308, d.Size)
-					assert.EqualValues(t, 396, d.OpenSize)
+					assert.EqualValues(t, 306, d.Size)
+					assert.EqualValues(t, 394, d.OpenSize)
 					assert.Equal(t, "repodata/other.xml.gz", d.Location.Href)
 				}
 			}
diff --git a/tests/integration/auth_ldap_test.go b/tests/integration/auth_ldap_test.go
@@ -226,45 +226,20 @@ func TestLDAPUserSync(t *testing.T) {
 	addAuthSourceLDAP(t, "", "")
 	auth.SyncExternalUsers(context.Background(), true)
 
-	session := loginUser(t, "user1")
 	// Check if users exists
-	for _, u := range gitLDAPUsers {
-		req := NewRequest(t, "GET", "/admin/users?q="+u.UserName)
-		resp := session.MakeRequest(t, req, http.StatusOK)
-
-		htmlDoc := NewHTMLParser(t, resp.Body)
-
-		tr := htmlDoc.doc.Find("table.table tbody tr")
-		if !assert.True(t, tr.Length() == 1) {
-			continue
-		}
-		tds := tr.Find("td")
-		if !assert.True(t, tds.Length() > 0) {
-			continue
-		}
-		assert.Equal(t, u.UserName, strings.TrimSpace(tds.Find("td:nth-child(2) a").Text()))
-		assert.Equal(t, u.Email, strings.TrimSpace(tds.Find("td:nth-child(3) span").Text()))
-		if u.IsAdmin {
-			assert.True(t, tds.Find("td:nth-child(5) svg").HasClass("octicon-check"))
-		} else {
-			assert.True(t, tds.Find("td:nth-child(5) svg").HasClass("octicon-x"))
-		}
-		if u.IsRestricted {
-			assert.True(t, tds.Find("td:nth-child(6) svg").HasClass("octicon-check"))
-		} else {
-			assert.True(t, tds.Find("td:nth-child(6) svg").HasClass("octicon-x"))
-		}
+	for _, gitLDAPUser := range gitLDAPUsers {
+		dbUser, err := user_model.GetUserByName(db.DefaultContext, gitLDAPUser.UserName)
+		assert.NoError(t, err)
+		assert.Equal(t, gitLDAPUser.UserName, dbUser.Name)
+		assert.Equal(t, gitLDAPUser.Email, dbUser.Email)
+		assert.Equal(t, gitLDAPUser.IsAdmin, dbUser.IsAdmin)
+		assert.Equal(t, gitLDAPUser.IsRestricted, dbUser.IsRestricted)
 	}
 
 	// Check if no users exist
-	for _, u := range otherLDAPUsers {
-		req := NewRequest(t, "GET", "/admin/users?q="+u.UserName)
-		resp := session.MakeRequest(t, req, http.StatusOK)
-
-		htmlDoc := NewHTMLParser(t, resp.Body)
-
-		tr := htmlDoc.doc.Find("table.table tbody tr")
-		assert.True(t, tr.Length() == 0)
+	for _, otherLDAPUser := range otherLDAPUsers {
+		_, err := user_model.GetUserByName(db.DefaultContext, otherLDAPUser.UserName)
+		assert.True(t, user_model.IsErrUserNotExist(err))
 	}
 }
 
diff --git a/web_src/css/admin.css b/web_src/css/admin.css
@@ -26,10 +26,6 @@
   margin: 12px -1rem -1rem;
 }
 
-.admin.user table.table .email {
-  max-width: 200px;
-}
-
 .admin dl.admin-dl-horizontal {
   padding: 1em;
   margin: 0;
diff --git a/web_src/css/helpers.css b/web_src/css/helpers.css
@@ -52,6 +52,7 @@ Gitea's private styles use `g-` prefix.
   text-overflow: ellipsis;
 }
 
+.gt-max-width-12rem { max-width: 12rem !important; }
 .gt-max-width-24rem { max-width: 24rem !important; }
 
 /* below class names match Tailwind CSS */

Original file line number	Diff line number	Diff line change
@@ -52,6 +52,7 @@ Gitea's private styles use `g-` prefix.
`52`	`52`	`text-overflow: ellipsis;`
`53`	`53`	`}`
`54`	`54`
	`55`	`+.gt-max-width-12rem { max-width: 12rem !important; }`
`55`	`56`	`.gt-max-width-24rem { max-width: 24rem !important; }`
`56`	`57`
`57`	`58`	`/* below class names match Tailwind CSS */`