docs/content/doc/advanced/external-renderers.en-us.md

@@ -192,5 +192,5 @@ And so you could write some CSS:
 Add your stylesheet to your custom directory e.g `custom/public/css/my-style-XXXXX.css` and import it using a custom header file `custom/templates/custom/header.tmpl`:
 
 ```html
-<link rel="stylesheet" href="{{AppSubUrl}}/assets/css/my-style-XXXXX.css" />
+<link type="text/css" href="{{AppSubUrl}}/assets/css/my-style-XXXXX.css" />
 ```

models/fixtures/repository.yml

@@ -24,7 +24,7 @@
   fork_id: 0
   is_template: false
   template_id: 0
-  size: 6708
+  size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
 

models/repo/update.go

@@ -184,7 +184,7 @@ func ChangeRepositoryName(doer *user_model.User, repo *Repository, newRepoName s
 	return committer.Commit()
 }
 
-// UpdateRepoSize updates the repository size, calculating it using getDirectorySize
+// UpdateRepoSize updates the repository size, calculating it using util.GetDirectorySize
 func UpdateRepoSize(ctx context.Context, repoID, size int64) error {
 	_, err := db.GetEngine(ctx).ID(repoID).Cols("size").NoAutoTime().Update(&Repository{
 		Size: size,

modules/markup/external/external.go

@@ -4,7 +4,6 @@
 package external
 
 import (
-	"bytes"
 	"fmt"
 	"io"
 	"os"
@@ -133,13 +132,11 @@ func (p *Renderer) Render(ctx *markup.RenderContext, input io.Reader, output io.
 	if !p.IsInputFile {
 		cmd.Stdin = input
 	}
-	var stderr bytes.Buffer
 	cmd.Stdout = output
-	cmd.Stderr = &stderr
 	process.SetSysProcAttribute(cmd)
 
 	if err := cmd.Run(); err != nil {
-		return fmt.Errorf("%s render run command %s %v failed: %w\nStderr: %s", p.Name(), commands[0], args, err, stderr.String())
+		return fmt.Errorf("%s render run command %s %v failed: %w", p.Name(), commands[0], args, err)
 	}
 	return nil
 }

modules/repository/create.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"os"
 	"path"
-	"path/filepath"
 	"strings"
 
 	"code.gitea.io/gitea/models"
@@ -286,36 +285,9 @@ func CreateRepository(doer, u *user_model.User, opts CreateRepoOptions) (*repo_m
 	return repo, nil
 }
 
-const notRegularFileMode = os.ModeSymlink | os.ModeNamedPipe | os.ModeSocket | os.ModeDevice | os.ModeCharDevice | os.ModeIrregular
+// UpdateRepoSize updates the repository size, calculating it using util.GetDirectorySize
-
-// getDirectorySize returns the disk consumption for a given path
-func getDirectorySize(path string) (int64, error) {
-	var size int64
-	err := filepath.WalkDir(path, func(_ string, info os.DirEntry, err error) error {
-		if err != nil {
-			if os.IsNotExist(err) { // ignore the error because the file maybe deleted during traversing.
-				return nil
-			}
-			return err
-		}
-		if info.IsDir() {
-			return nil
-		}
-		f, err := info.Info()
-		if err != nil {
-			return err
-		}
-		if (f.Mode() & notRegularFileMode) == 0 {
-			size += f.Size()
-		}
-		return err
-	})
-	return size, err
-}
-
-// UpdateRepoSize updates the repository size, calculating it using getDirectorySize
 func UpdateRepoSize(ctx context.Context, repo *repo_model.Repository) error {
-	size, err := getDirectorySize(repo.RepoPath())
+	size, err := util.GetDirectorySize(repo.RepoPath())
 	if err != nil {
 		return fmt.Errorf("updateSize: %w", err)
 	}

modules/repository/create_test.go

@@ -168,13 +168,3 @@ func TestUpdateRepositoryVisibilityChanged(t *testing.T) {
 	assert.NoError(t, err)
 	assert.True(t, act.IsPrivate)
 }
-
-func TestGetDirectorySize(t *testing.T) {
-	assert.NoError(t, unittest.PrepareTestDatabase())
-	repo, err := repo_model.GetRepositoryByID(db.DefaultContext, 1)
-	assert.NoError(t, err)
-
-	size, err := getDirectorySize(repo.RepoPath())
-	assert.NoError(t, err)
-	assert.EqualValues(t, size, repo.Size)
-}

modules/util/path.go

@@ -22,6 +22,20 @@ func EnsureAbsolutePath(path, absoluteBase string) string {
 	return filepath.Join(absoluteBase, path)
 }
 
+const notRegularFileMode os.FileMode = os.ModeSymlink | os.ModeNamedPipe | os.ModeSocket | os.ModeDevice | os.ModeCharDevice | os.ModeIrregular
+
+// GetDirectorySize returns the disk consumption for a given path
+func GetDirectorySize(path string) (int64, error) {
+	var size int64
+	err := filepath.Walk(path, func(_ string, info os.FileInfo, err error) error {
+		if info != nil && (info.Mode()&notRegularFileMode) == 0 {
+			size += info.Size()
+		}
+		return err
+	})
+	return size, err
+}
+
 // IsDir returns true if given path is a directory,
 // or returns false when it's a file or does not exist.
 func IsDir(dir string) (bool, error) {

options/locale/locale_en-US.ini

@@ -1379,7 +1379,7 @@ issues.label_title = Label name
 issues.label_description = Label description
 issues.label_color = Label color
 issues.label_count = %d labels
-issues.label_open_issues = %d open issues/pull requests
+issues.label_open_issues = %d open issues
 issues.label_edit = Edit
 issues.label_delete = Delete
 issues.label_modify = Edit Label

templates/repo/diff/box.tmpl

@@ -143,7 +143,7 @@
 													{{$.locale.Tr "repo.diff.file_suppressed_line_too_long"}}
 												{{else}}
 													{{$.locale.Tr "repo.diff.file_suppressed"}}
-													<a class="ui basic tiny button diff-load-button" data-href="{{$.Link}}?file-only=true&files={{$file.Name}}&files={{$file.OldName}}">{{$.locale.Tr "repo.diff.load"}}</a>
+													<a class="ui basic tiny button diff-show-more-button" data-href="{{$.Link}}?file-only=true&files={{$file.Name}}&files={{$file.OldName}}">{{$.locale.Tr "repo.diff.load"}}</a>
 												{{end}}
 											{{else}}
 												{{$.locale.Tr "repo.diff.bin_not_shown"}}

web_src/js/components/DiffFileTree.vue

@@ -8,7 +8,7 @@
       <DiffFileTreeItem v-for="item in fileTree" :key="item.name" :item="item" />
     </div>
     <div v-if="isIncomplete" id="diff-too-many-files-stats" class="pt-2">
-      <span class="mr-2">{{ tooManyFilesMessage }}</span><a :class="['ui', 'basic', 'tiny', 'button', isLoadingNewData === true ? 'disabled' : '']" id="diff-show-more-files-stats" @click.stop="loadMoreData">{{ showMoreMessage }}</a>
+      <span>{{ tooManyFilesMessage }}</span><a :class="['ui', 'basic', 'tiny', 'button', isLoadingNewData === true ? 'disabled' : '']" id="diff-show-more-files-stats" @click.stop="loadMoreData">{{ showMoreMessage }}</a>
     </div>
   </div>
 </template>
@@ -94,9 +94,6 @@ export default {
   mounted() {
     // ensure correct buttons when we are mounted to the dom
     this.adjustToggleButton(this.fileTreeIsVisible);
-    // replace the pageData.diffFileInfo.files with our watched data so we get updates
-    pageData.diffFileInfo.files = this.files;
-
     document.querySelector('.diff-toggle-file-tree-button').addEventListener('click', this.toggleVisibility);
   },
   unmounted() {

web_src/js/features/repo-diff.js

@@ -119,47 +119,26 @@ function onShowMoreFiles() {
 
 export function doLoadMoreFiles(link, diffEnd, callback) {
   const url = `${link}?skip-to=${diffEnd}&file-only=true`;
-  loadMoreFiles(url, callback);
-}
-
-function loadMoreFiles(url, callback) {
-  const $target = $('a#diff-show-more-files');
-  if ($target.hasClass('disabled')) {
-    callback();
-    return;
-  }
-  $target.addClass('disabled');
   $.ajax({
     type: 'GET',
     url,
   }).done((resp) => {
     if (!resp) {
-      $target.removeClass('disabled');
       callback(resp);
       return;
     }
-    $('#diff-incomplete').replaceWith($(resp).find('#diff-file-boxes').children());
     // By simply rerunning the script we add the new data to our existing
     // pagedata object. this triggers vue and the filetree and filelist will
     // render the new elements.
     $('body').append($(resp).find('script#diff-data-script'));
-    onShowMoreFiles();
     callback(resp);
   }).fail(() => {
-    $target.removeClass('disabled');
     callback();
   });
 }
 
 export function initRepoDiffShowMore() {
-  $(document).on('click', 'a#diff-show-more-files', (e) => {
+  $(document).on('click', 'a.diff-show-more-button', (e) => {
-    e.preventDefault();
-
-    const $target = $(e.target);
-    loadMoreFiles($target.data('href'), () => {});
-  });
-
-  $(document).on('click', 'a.diff-load-button', (e) => {
     e.preventDefault();
     const $target = $(e.target);
 

web_src/less/_repository.less

@@ -1667,9 +1667,6 @@
         background-color: var(--color-teal);
       }
     }
-    .button {
-      padding: 8px 12px;
-    }
   }
 
   .diff-box .header:not(.resolved-placeholder) {