Merge branch 'master' into webkit-calendar-icon

Author: zeripath

options/locale/locale_de-DE.ini

@@ -2178,6 +2178,8 @@ dashboard.total_gc_time=Gesamte GC-Pause
 dashboard.total_gc_pause=Gesamte GC-Pause
 dashboard.last_gc_pause=Letzte GC-Pause
 dashboard.gc_times=Anzahl GC
+dashboard.delete_old_actions=Alle alten Aktionen aus der Datenbank löschen
+dashboard.delete_old_actions.started=Löschen aller alten Aktionen in der Datenbank gestartet.
 
 users.user_manage_panel=Benutzerkontenverwaltung
 users.new_account=Benutzerkonto erstellen

options/locale/locale_en-US.ini

@@ -1887,6 +1887,7 @@ diff.file_image_width = Width
 diff.file_image_height = Height
 diff.file_byte_size = Size
 diff.file_suppressed = File diff suppressed because it is too large
+diff.file_suppressed_line_too_long = File diff suppressed because one or more lines are too long
 diff.too_many_files = Some files were not shown because too many files changed in this diff
 diff.comment.placeholder = Leave a comment
 diff.comment.markdown_info = Styling with markdown is supported.

options/locale/locale_ja-JP.ini

@@ -2178,6 +2178,8 @@ dashboard.total_gc_time=GC停止時間の合計
 dashboard.total_gc_pause=GC停止時間の合計
 dashboard.last_gc_pause=前回のGC停止時間
 dashboard.gc_times=GC実行回数
+dashboard.delete_old_actions=データベースから古い操作履歴をすべて削除
+dashboard.delete_old_actions.started=データベースからの古い操作履歴の削除を開始しました。
 
 users.user_manage_panel=ユーザーアカウント管理
 users.new_account=ユーザーアカウントを作成

options/locale/locale_tr-TR.ini

@@ -2177,6 +2177,8 @@ dashboard.total_gc_time=Toplam GC Durması
 dashboard.total_gc_pause=Toplam GC Durması
 dashboard.last_gc_pause=Son GC Durması
 dashboard.gc_times=GC Zamanları
+dashboard.delete_old_actions=Veritabanından tüm eski eylemleri sil
+dashboard.delete_old_actions.started=Veritabanından başlatılan tüm eski eylemleri silin.
 
 users.user_manage_panel=Kullanıcı Hesap Yönetimi
 users.new_account=Yeni Kullanıcı Hesabı

services/gitdiff/gitdiff.go

@@ -574,21 +574,22 @@ func (diffSection *DiffSection) GetComputedInlineDiffFor(diffLine *DiffLine) tem
 
 // DiffFile represents a file diff.
 type DiffFile struct {
-	Name               string
-	OldName            string
-	Index              int
-	Addition, Deletion int
-	Type               DiffFileType
-	IsCreated          bool
-	IsDeleted          bool
-	IsBin              bool
-	IsLFSFile          bool
-	IsRenamed          bool
-	IsAmbiguous        bool
-	IsSubmodule        bool
-	Sections           []*DiffSection
-	IsIncomplete       bool
-	IsProtected        bool
+	Name                    string
+	OldName                 string
+	Index                   int
+	Addition, Deletion      int
+	Type                    DiffFileType
+	IsCreated               bool
+	IsDeleted               bool
+	IsBin                   bool
+	IsLFSFile               bool
+	IsRenamed               bool
+	IsAmbiguous             bool
+	IsSubmodule             bool
+	Sections                []*DiffSection
+	IsIncomplete            bool
+	IsIncompleteLineTooLong bool
+	IsProtected             bool
 }
 
 // GetType returns type of diff file.
@@ -935,6 +936,7 @@ func parseHunks(curFile *DiffFile, maxLines, maxLineCharacters int, input *bufio
 	for {
 		for isFragment {
 			curFile.IsIncomplete = true
+			curFile.IsIncompleteLineTooLong = true
 			_, isFragment, err = input.ReadLine()
 			if err != nil {
 				// Now by the definition of ReadLine this cannot be io.EOF
@@ -1062,6 +1064,7 @@ func parseHunks(curFile *DiffFile, maxLines, maxLineCharacters int, input *bufio
 		line := string(lineBytes)
 		if isFragment {
 			curFile.IsIncomplete = true
+			curFile.IsIncompleteLineTooLong = true
 			for isFragment {
 				lineBytes, isFragment, err = input.ReadLine()
 				if err != nil {
@@ -1073,6 +1076,7 @@ func parseHunks(curFile *DiffFile, maxLines, maxLineCharacters int, input *bufio
 		}
 		if len(line) > maxLineCharacters {
 			curFile.IsIncomplete = true
+			curFile.IsIncompleteLineTooLong = true
 			line = line[:maxLineCharacters]
 		}
 		curSection.Lines[len(curSection.Lines)-1].Content = line

services/pull/pull.go

@@ -677,7 +677,8 @@ func GetIssuesLastCommitStatus(issues models.IssueList) (map[int64]*models.Commi
 
 		status, err := getLastCommitStatus(gitRepo, issue.PullRequest)
 		if err != nil {
-			return nil, err
+			log.Error("getLastCommitStatus: cant get last commit of pull [%d]: %v", issue.PullRequest.ID, err)
+			continue
 		}
 		res[issue.PullRequest.ID] = status
 	}

templates/repo/diff/box.tmpl

@@ -53,7 +53,13 @@
 						</div>
 						<span class="file mono">{{$file.Name}}</span>
 						<div class="diff-file-header-actions df ac">
-							<div class="text grey">{{$.i18n.Tr "repo.diff.file_suppressed"}}</div>
+							<div class="text grey">
+								{{if $file.IsIncompleteLineTooLong}}
+									{{$.i18n.Tr "repo.diff.file_suppressed_line_too_long"}}
+								{{else}}
+									{{$.i18n.Tr "repo.diff.file_suppressed"}}
+								{{end}}
+							</div>
 							{{if $file.IsProtected}}
 								<span class="ui basic label">{{$.i18n.Tr "repo.diff.protected"}}</span>
 							{{end}}