Merge branch 'master' into fix-api_11006_optional-branch

models/migrate.go

@@ -64,15 +64,20 @@ func insertIssue(sess *xorm.Session, issue *Issue) error {
  })
  labelIDs = append(labelIDs, label.ID)
  }
- if _, err := sess.Insert(issueLabels); err != nil {
- return err
+ if len(issueLabels) > 0 {
+ if _, err := sess.Insert(issueLabels); err != nil {
+ return err
+ }
  }
 
  for _, reaction := range issue.Reactions {
  reaction.IssueID = issue.ID
  }
- if _, err := sess.Insert(issue.Reactions); err != nil {
- return err
+
+ if len(issue.Reactions) > 0 {
+ if _, err := sess.Insert(issue.Reactions); err != nil {
+ return err
+ }
  }
 
  cols := make([]string, 0)
@@ -151,8 +156,10 @@ func InsertIssueComments(comments []*Comment) error {
  reaction.IssueID = comment.IssueID
  reaction.CommentID = comment.ID
  }
- if _, err := sess.Insert(comment.Reactions); err != nil {
- return err
+ if len(comment.Reactions) > 0 {
+ if _, err := sess.Insert(comment.Reactions); err != nil {
+ return err
+ }
  }
  }
 
@@ -196,12 +203,14 @@ func InsertReleases(rels ...*Release) error {
  return err
  }
 
- for i := 0; i < len(rel.Attachments); i++ {
- rel.Attachments[i].ReleaseID = rel.ID
- }
+ if len(rel.Attachments) > 0 {
+ for i := range rel.Attachments {
+ rel.Attachments[i].ReleaseID = rel.ID
+ }
 
- if _, err := sess.NoAutoTime().Insert(rel.Attachments); err != nil {
- return err
+ if _, err := sess.NoAutoTime().Insert(rel.Attachments); err != nil {
+ return err
+ }
  }
  }
 

modules/migrations/gitea.go

@@ -393,13 +393,16 @@ func (g *GiteaLocalUploader) CreateIssues(issues ...*base.Issue) error {
  iss = append(iss, &is)
  }
 
- err := models.InsertIssues(iss...)
- if err != nil {
- return err
- }
- for _, is := range iss {
- g.issues.Store(is.Index, is.ID)
+ if len(iss) > 0 {
+ if err := models.InsertIssues(iss...); err != nil {
+ return err
+ }
+
+ for _, is := range iss {
+ g.issues.Store(is.Index, is.ID)
+ }
  }
+
  return nil
 }
 
@@ -478,6 +481,9 @@ func (g *GiteaLocalUploader) CreateComments(comments ...*base.Comment) error {
  cms = append(cms, &cm)
  }
 
+ if len(cms) == 0 {
+ return nil
+ }
  return models.InsertIssueComments(cms)
 }
 

options/locale/locale_lv-LV.ini

@@ -829,7 +829,7 @@ issues.new_label=Jauna etiķete
 issues.new_label_placeholder=Etiķetes nosaukums
 issues.new_label_desc_placeholder=Apraksts
 issues.create_label=Izveidot etiķeti
-issues.label_templates.title=Ielādēt sākotnēji noteikto etiķešu kopu
+issues.label_templates.title=Ielādēt sākotnēji noteiktu etiķešu kopu
 issues.label_templates.info=Nav izveidota neviena etiķete. Jūs varat noklikšķināt uz "Jauna etiķete" augstāk, lai to izveidotu vai izmantot zemāk piedāvātās etiķetes:
 issues.label_templates.helper=Izvēlieties etiķešu kopu
 issues.label_templates.use=Izmantot etiķešu kopu

templates/explore/code.tmpl

@@ -18,7 +18,7 @@
  </h3>
  <div>
  {{range $term := .SearchResultLanguages}}
- <a class="ui language-label {{if eq $.Language $term.Language}}primary {{end}}basic label" href="{{AppSubUrl}}/explore/code?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}">
+ <a class="ui text-label {{if eq $.Language $term.Language}}primary {{end}}basic label" href="{{AppSubUrl}}/explore/code?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}">
  <i class="color-icon" style="background-color: {{$term.Color}}"></i>
  {{$term.Language}}
  <div class="detail">{{$term.Count}}</div>

templates/repo/branch/list.tmpl

@@ -93,11 +93,11 @@
  {{else}}
  <a href="{{.LatestPullRequest.Issue.HTMLURL}}">{{if not .LatestPullRequest.IsSameRepo}}{{.LatestPullRequest.BaseRepo.FullName}}{{end}}#{{.LatestPullRequest.Issue.Index}}</a>
  {{if .LatestPullRequest.HasMerged}}
- <a href="{{.LatestPullRequest.Issue.HTMLURL}}" class="ui purple mini label">{{svg "octicon-git-pull-request" 16}} {{$.i18n.Tr "repo.pulls.merged"}}</a>
+ <a href="{{.LatestPullRequest.Issue.HTMLURL}}" class="ui text-label purple mini label">{{svg "octicon-git-merge" 16}} {{$.i18n.Tr "repo.pulls.merged"}}</a>
  {{else if .LatestPullRequest.Issue.IsClosed}}
- <a href="{{.LatestPullRequest.Issue.HTMLURL}}" class="ui red mini label">{{svg "octicon-issue-closed" 16}} {{$.i18n.Tr "repo.issues.closed_title"}}</a>
+ <a href="{{.LatestPullRequest.Issue.HTMLURL}}" class="ui text-label red mini label">{{svg "octicon-issue-closed" 16}} {{$.i18n.Tr "repo.issues.closed_title"}}</a>
  {{else}}
- <a href="{{.LatestPullRequest.Issue.HTMLURL}}" class="ui green mini label">{{svg "octicon-issue-opened" 16}} {{$.i18n.Tr "repo.issues.open_title"}}</a>
+ <a href="{{.LatestPullRequest.Issue.HTMLURL}}" class="ui text-label green mini label">{{svg "octicon-issue-opened" 16}} {{$.i18n.Tr "repo.issues.open_title"}}</a>
  {{end}}
  {{end}}
  </td>

templates/repo/search.tmpl

@@ -18,7 +18,7 @@
  </h3>
  <div>
  {{range $term := .SearchResultLanguages}}
- <a class="ui language-label {{if eq $.Language $term.Language}}primary {{end}}basic label" href="{{EscapePound $.SourcePath}}/search?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}">
+ <a class="ui text-label {{if eq $.Language $term.Language}}primary {{end}}basic label" href="{{EscapePound $.SourcePath}}/search?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}">
  <i class="color-icon" style="background-color: {{$term.Color}}"></i>
  {{$term.Language}}
  <div class="detail">{{$term.Count}}</div>

web_src/less/_base.less

@@ -1229,11 +1229,11 @@ i.icon.centerlock {
  text-overflow: ellipsis;
 }
 
-.language-label {
+.text-label {
  display: inline-flex !important;
  align-items: center !important;
 }
 
-.language-label .color-icon {
+.text-label .color-icon {
  position: static !important;
 }