Merge branch 'release/v1.22' into backport/32079-to-v1.22

cmd/serv.go

@@ -143,6 +143,12 @@ func runServ(c *cli.Context) error {
  return nil
  }
 
+ defer func() {
+ if err := recover(); err != nil {
+ _ = fail(ctx, "Internal Server Error", "Panic: %v\n%s", err, log.Stack(2))
+ }
+ }()
+
  keys := strings.Split(c.Args().First(), "-")
  if len(keys) != 2 || keys[0] != "key" {
  return fail(ctx, "Key ID format error", "Invalid key argument: %s", c.Args().First())
@@ -189,10 +195,7 @@ func runServ(c *cli.Context) error {
  }
 
  verb := words[0]
- repoPath := words[1]
- if repoPath[0] == '/' {
- repoPath = repoPath[1:]
- }
+ repoPath := strings.TrimPrefix(words[1], "/")
 
  var lfsVerb string
  if verb == lfsAuthenticateVerb {

routers/web/repo/issue.go

@@ -461,6 +461,7 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption opt
  ctx.Data["AssigneeID"] = assigneeID
  ctx.Data["PosterID"] = posterID
  ctx.Data["Keyword"] = keyword
+ ctx.Data["IsShowClosed"] = isShowClosed
  switch {
  case isShowClosed.Value():
  ctx.Data["State"] = "closed"

routers/web/web.go

@@ -1063,7 +1063,7 @@ func registerRoutes(m *web.Route) {
  m.Combo("/edit").Get(repo_setting.SettingsProtectedBranch).
  Post(web.Bind(forms.ProtectBranchForm{}), context.RepoMustNotBeArchived(), repo_setting.SettingsProtectedBranchPost)
  m.Post("/{id}/delete", repo_setting.DeleteProtectedBranchRulePost)
- }, repo.MustBeNotEmpty)
+ })
 
  m.Group("/tags", func() {
  m.Get("", repo_setting.ProtectedTags)

services/webhook/discord.go

@@ -11,6 +11,7 @@ import (
  "net/url"
  "strconv"
  "strings"
+ "unicode/utf8"
 
  webhook_model "code.gitea.io/gitea/models/webhook"
  "code.gitea.io/gitea/modules/git"
@@ -149,8 +150,14 @@ func (d discordConvertor) Push(p *api.PushPayload) (DiscordPayload, error) {
  var text string
  // for each commit, generate attachment text
  for i, commit := range p.Commits {
- text += fmt.Sprintf("[%s](%s) %s - %s", commit.ID[:7], commit.URL,
- strings.TrimRight(commit.Message, "\r\n"), commit.Author.Name)
+ // limit the commit message display to just the summary, otherwise it would be hard to read
+ message := strings.TrimRight(strings.SplitN(commit.Message, "\n", 1)[0], "\r")
+
+ // a limit of 50 is set because GitHub does the same
+ if utf8.RuneCountInString(message) > 50 {
+ message = fmt.Sprintf("%.47s...", message)
+ }
+ text += fmt.Sprintf("[%s](%s) %s - %s", commit.ID[:7], commit.URL, message, commit.Author.Name)
  // add linebreak to each commit but the last
  if i < len(p.Commits)-1 {
  text += "\n"

services/webhook/discord_test.go

@@ -80,6 +80,20 @@ func TestDiscordPayload(t *testing.T) {
  assert.Equal(t, p.Sender.AvatarURL, pl.Embeds[0].Author.IconURL)
  })
 
+ t.Run("PushWithLongCommitMessage", func(t *testing.T) {
+ p := pushTestMultilineCommitMessagePayload()
+
+ pl, err := dc.Push(p)
+ require.NoError(t, err)
+
+ assert.Len(t, pl.Embeds, 1)
+ assert.Equal(t, "[test/repo:test] 2 new commits", pl.Embeds[0].Title)
+ assert.Equal(t, "[2020558](http://localhost:3000/test/repo/commit/2020558fe2e34debb818a514715839cabd25e778) This is a commit summary ⚠️⚠️⚠️⚠️ containing 你好... - user1\n[2020558](http://localhost:3000/test/repo/commit/2020558fe2e34debb818a514715839cabd25e778) This is a commit summary ⚠️⚠️⚠️⚠️ containing 你好... - user1", pl.Embeds[0].Description)
+ assert.Equal(t, p.Sender.UserName, pl.Embeds[0].Author.Name)
+ assert.Equal(t, setting.AppURL+p.Sender.UserName, pl.Embeds[0].Author.URL)
+ assert.Equal(t, p.Sender.AvatarURL, pl.Embeds[0].Author.IconURL)
+ })
+
  t.Run("Issue", func(t *testing.T) {
  p := issueTestPayload()
 

services/webhook/general_test.go

@@ -64,9 +64,17 @@ func forkTestPayload() *api.ForkPayload {
 }
 
 func pushTestPayload() *api.PushPayload {
+ return pushTestPayloadWithCommitMessage("commit message")
+}
+
+func pushTestMultilineCommitMessagePayload() *api.PushPayload {
+ return pushTestPayloadWithCommitMessage("This is a commit summary ⚠️⚠️⚠️⚠️ containing 你好 ⚠️⚠️️\n\nThis is the message body.")
+}
+
+func pushTestPayloadWithCommitMessage(message string) *api.PushPayload {
  commit := &api.PayloadCommit{
  ID: "2020558fe2e34debb818a514715839cabd25e778",
- Message: "commit message",
+ Message: message,
  URL: "http://localhost:3000/test/repo/commit/2020558fe2e34debb818a514715839cabd25e778",
  Author: &api.PayloadUser{
  Name: "user1",

templates/repo/issue/filter_actions.tmpl

@@ -1,9 +1,9 @@
 <div class="ui secondary filter menu">
  {{if not .Repository.IsArchived}}
  <!-- Action Button -->
- {{if .IsShowClosed}}
+ {{if and .IsShowClosed.Has .IsShowClosed.Value}}
  <button class="ui primary basic button issue-action" data-action="open" data-url="{{$.RepoLink}}/issues/status">{{ctx.Locale.Tr "repo.issues.action_open"}}</button>
- {{else}}
+ {{else if and .IsShowClosed.Has (not .IsShowClosed.Value)}}
  <button class="ui red basic button issue-action" data-action="close" data-url="{{$.RepoLink}}/issues/status">{{ctx.Locale.Tr "repo.issues.action_close"}}</button>
  {{end}}
  {{if $.IsRepoAdmin}}

templates/repo/settings/branches.tmpl

@@ -15,19 +15,17 @@
  <form class="tw-flex" action="{{.Link}}" method="post">
  {{.CsrfTokenHtml}}
  <input type="hidden" name="action" value="default_branch">
- {{if not .Repository.IsEmpty}}
- <div class="ui dropdown selection search tw-flex-1 tw-mr-2 tw-max-w-96">
- {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- <input type="hidden" name="branch" value="{{.Repository.DefaultBranch}}">
- <div class="default text">{{.Repository.DefaultBranch}}</div>
- <div class="menu">
- {{range .Branches}}
- <div class="item" data-value="{{.}}">{{.}}</div>
- {{end}}
- </div>
+ <div class="ui dropdown selection search tw-flex-1 tw-mr-2 tw-max-w-96">
+ {{svg "octicon-triangle-down" 14 "dropdown icon"}}
+ <input type="hidden" name="branch" value="{{.Repository.DefaultBranch}}">
+ <div class="default text">{{.Repository.DefaultBranch}}</div>
+ <div class="menu">
+ {{range .Branches}}
+ <div class="item" data-value="{{.}}">{{.}}</div>
+ {{end}}
  </div>
-  <button class="ui primary button">{{ctx.Locale.Tr "repo.settings.branches.update_default_branch"}}</button>
- {{end}}
+ </div>
+ <button class="ui primary button"{{if .Repository.IsEmpty}} disabled{{end}}>{{ctx.Locale.Tr "repo.settings.branches.update_default_branch"}}</button>
  </form>
  </div>
 

templates/repo/settings/navbar.tmpl

@@ -13,11 +13,9 @@
  </a>
  {{end}}
  {{if .Repository.UnitEnabled $.Context ctx.Consts.RepoUnitTypeCode}}
- {{if not .Repository.IsEmpty}}
- <a class="{{if .PageIsSettingsBranches}}active {{end}}item" href="{{.RepoLink}}/settings/branches">
- {{ctx.Locale.Tr "repo.settings.branches"}}
- </a>
- {{end}}
+ <a class="{{if .PageIsSettingsBranches}}active {{end}}item" href="{{.RepoLink}}/settings/branches">
+ {{ctx.Locale.Tr "repo.settings.branches"}}
+ </a>
  <a class="{{if .PageIsSettingsTags}}active {{end}}item" href="{{.RepoLink}}/settings/tags">
  {{ctx.Locale.Tr "repo.settings.tags"}}
  </a>

web_src/js/components/DashboardRepoList.vue

@@ -78,7 +78,6 @@ const sfc = {
  searchURL() {
  return `${this.subUrl}/repo/search?sort=updated&order=desc&uid=${this.uid}&team_id=${this.teamId}&q=${this.searchQuery
  }&page=${this.page}&limit=${this.searchLimit}&mode=${this.repoTypes[this.reposFilter].searchMode
- }${this.reposFilter !== 'all' ? '&exclusive=1' : ''
  }${this.archivedFilter === 'archived' ? '&archived=true' : ''}${this.archivedFilter === 'unarchived' ? '&archived=false' : ''
  }${this.privateFilter === 'private' ? '&is_private=true' : ''}${this.privateFilter === 'public' ? '&is_private=false' : ''
  }`;