From c020bd59e3bf45698c0eeb73bd9a34ed620553c0 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Tue, 2 May 2023 16:58:11 -0400 Subject: [PATCH 1/2] Enable whitespace rendering on selection in Monaco (#24444) (#24485) Backport #24444 by @silverwind Remove the [renderWhitespace](https://microsoft.github.io/monaco-editor/docs.html#interfaces/editor.IEditorOptions.html#renderWhitespace) override, so the default value of `selection` takes over and makes whitespace visible on selection. Screenshot 2023-04-30 at 19 09 41 Co-authored-by: silverwind --- web_src/js/features/codeeditor.js | 1 - 1 file changed, 1 deletion(-) diff --git a/web_src/js/features/codeeditor.js b/web_src/js/features/codeeditor.js index 23a26ba2b0d80..c6d55908f3a21 100644 --- a/web_src/js/features/codeeditor.js +++ b/web_src/js/features/codeeditor.js @@ -13,7 +13,6 @@ const baseOptions = { overviewRulerLanes: 0, renderLineHighlight: 'all', renderLineHighlightOnlyWhenFocus: true, - renderWhitespace: 'none', rulers: false, scrollbar: {horizontalScrollbarSize: 6, verticalScrollbarSize: 6}, scrollBeyondLastLine: false, From dfc6c592cff86497bca04e83319b8993190fd9de Mon Sep 17 00:00:00 2001 From: "Otto Richter (fnetX)" Date: Wed, 3 May 2023 02:26:38 +0200 Subject: [PATCH 2/2] Fix api error message if fork exists (#24487) On the @Forgejo instance of Codeberg, we discovered that forking a repo which is already forked now returns a 500 Internal Server Error, which is unexpected. This is an attempt at fixing this. The error message in the log: ~~~ 2023/05/02 08:36:30 .../api/v1/repo/fork.go:147:CreateFork() [E] [6450cb8e-113] ForkRepository: repository is already forked by user [uname: ...., repo path: .../..., fork path: .../...] ~~~ The service that is used for forking returns a custom error message which is not checked against. About the order of options: The case that the fork already exists should be more common, followed by the case that a repo with the same name already exists for other reasons. The case that the global repo limit is hit is probably not the likeliest. Co-authored-by: Otto Richter Co-authored-by: Giteabot --- routers/api/v1/repo/fork.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/api/v1/repo/fork.go b/routers/api/v1/repo/fork.go index 5b564a8066c9f..e1e79c0e780ac 100644 --- a/routers/api/v1/repo/fork.go +++ b/routers/api/v1/repo/fork.go @@ -141,7 +141,7 @@ func CreateFork(ctx *context.APIContext) { Description: repo.Description, }) if err != nil { - if repo_model.IsErrReachLimitOfRepo(err) || repo_model.IsErrRepoAlreadyExist(err) { + if repo_service.IsErrForkAlreadyExist(err) || repo_model.IsErrRepoAlreadyExist(err) || repo_model.IsErrReachLimitOfRepo(err) { ctx.Error(http.StatusConflict, "ForkRepository", err) } else { ctx.Error(http.StatusInternalServerError, "ForkRepository", err)