From b6b8feb3dec19e7bc96bc583acf10c01afca3362 Mon Sep 17 00:00:00 2001 From: delvh Date: Wed, 1 Feb 2023 20:14:40 +0100 Subject: [PATCH] Enable `@`- completion popup on the release description textarea (#22359) For some unknown reason, this was previously disabled. Additionally removed an unused return value. --- routers/web/repo/release.go | 15 +++++++++++++++ web_src/js/features/repo-release.js | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/routers/web/repo/release.go b/routers/web/repo/release.go index 54f503642b..5204b5fd00 100644 --- a/routers/web/repo/release.go +++ b/routers/web/repo/release.go @@ -328,6 +328,14 @@ func NewRelease(ctx *context.Context) { } } ctx.Data["IsAttachmentEnabled"] = setting.Attachment.Enabled + var err error + // Get assignees. + ctx.Data["Assignees"], err = repo_model.GetRepoAssignees(ctx, ctx.Repo.Repository) + if err != nil { + ctx.ServerError("GetAssignees", err) + return + } + upload.AddUploadContext(ctx, "release") ctx.HTML(http.StatusOK, tplReleaseNew) } @@ -484,6 +492,13 @@ func EditRelease(ctx *context.Context) { } ctx.Data["attachments"] = rel.Attachments + // Get assignees. + ctx.Data["Assignees"], err = repo_model.GetRepoAssignees(ctx, rel.Repo) + if err != nil { + ctx.ServerError("GetAssignees", err) + return + } + ctx.HTML(http.StatusOK, tplReleaseNew) } diff --git a/web_src/js/features/repo-release.js b/web_src/js/features/repo-release.js index e84cc53d17..7589d108f9 100644 --- a/web_src/js/features/repo-release.js +++ b/web_src/js/features/repo-release.js @@ -17,12 +17,12 @@ export function initRepoRelease() { export function initRepoReleaseEditor() { const $editor = $('.repository.new.release .content-editor'); if ($editor.length === 0) { - return false; + return; } (async () => { const $textarea = $editor.find('textarea'); - await attachTribute($textarea.get(), {mentions: false, emoji: true}); + await attachTribute($textarea.get(), {mentions: true, emoji: true}); const easyMDE = await createCommentEasyMDE($textarea); initCompMarkupContentPreviewTab($editor); const $dropzone = $editor.parent().find('.dropzone');