Skip to content

Commit b6b8feb

Browse files
authored
Enable @<user>- completion popup on the release description textarea (#22359)
For some unknown reason, this was previously disabled. Additionally removed an unused return value.
1 parent 6ba9ff7 commit b6b8feb

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

Diff for: routers/web/repo/release.go

+15
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,14 @@ func NewRelease(ctx *context.Context) {
328328
}
329329
}
330330
ctx.Data["IsAttachmentEnabled"] = setting.Attachment.Enabled
331+
var err error
332+
// Get assignees.
333+
ctx.Data["Assignees"], err = repo_model.GetRepoAssignees(ctx, ctx.Repo.Repository)
334+
if err != nil {
335+
ctx.ServerError("GetAssignees", err)
336+
return
337+
}
338+
331339
upload.AddUploadContext(ctx, "release")
332340
ctx.HTML(http.StatusOK, tplReleaseNew)
333341
}
@@ -484,6 +492,13 @@ func EditRelease(ctx *context.Context) {
484492
}
485493
ctx.Data["attachments"] = rel.Attachments
486494

495+
// Get assignees.
496+
ctx.Data["Assignees"], err = repo_model.GetRepoAssignees(ctx, rel.Repo)
497+
if err != nil {
498+
ctx.ServerError("GetAssignees", err)
499+
return
500+
}
501+
487502
ctx.HTML(http.StatusOK, tplReleaseNew)
488503
}
489504

Diff for: web_src/js/features/repo-release.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ export function initRepoRelease() {
1717
export function initRepoReleaseEditor() {
1818
const $editor = $('.repository.new.release .content-editor');
1919
if ($editor.length === 0) {
20-
return false;
20+
return;
2121
}
2222

2323
(async () => {
2424
const $textarea = $editor.find('textarea');
25-
await attachTribute($textarea.get(), {mentions: false, emoji: true});
25+
await attachTribute($textarea.get(), {mentions: true, emoji: true});
2626
const easyMDE = await createCommentEasyMDE($textarea);
2727
initCompMarkupContentPreviewTab($editor);
2828
const $dropzone = $editor.parent().find('.dropzone');

0 commit comments

Comments
 (0)