diff options
4 files changed, 43 insertions, 10 deletions
diff --git a/app/assets/javascripts/notes/components/issue_comment_form.vue b/app/assets/javascripts/notes/components/issue_comment_form.vue index afd51f8fa21..a8d8a22be76 100644 --- a/app/assets/javascripts/notes/components/issue_comment_form.vue +++ b/app/assets/javascripts/notes/components/issue_comment_form.vue @@ -16,6 +16,7 @@ return { note: '', markdownDocsUrl: '', + quickActionsDocsUrl: null, markdownPreviewUrl: gl.issueData.preview_note_path, noteType: constants.COMMENT, issueState: state, @@ -149,6 +150,7 @@ const issueData = JSON.parse(issuableDataEl.innerHTML.replace(/"/g, '"')); this.markdownDocsUrl = issueData.markdownDocs; + this.quickActionsDocsUrl = issueData.quickActionsDocs; eventHub.$on('issueStateChanged', (isClosed) => { this.issueState = isClosed ? constants.CLOSED : constants.REOPENED; @@ -183,7 +185,8 @@ <markdown-field :markdown-preview-url="markdownPreviewUrl" :markdown-docs="markdownDocsUrl" - :addSpacingClasses="false"> + :quick-actions-docs="quickActionsDocsUrl" + :add-spacing-classes="false"> <textarea id="note-body" name="note[note]" @@ -217,7 +220,8 @@ aria-label="Open comment type dropdown"> <i aria-hidden="true" - class="fa fa-caret-down toggle-icon"></i> + class="fa fa-caret-down toggle-icon"> + </i> </button> <ul class="note-type-dropdown dropdown-open-top dropdown-menu"> <li diff --git a/app/assets/javascripts/vue_shared/components/markdown/field.vue b/app/assets/javascripts/vue_shared/components/markdown/field.vue index f1c7264ec4f..af7ea748077 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/field.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/field.vue @@ -21,6 +21,10 @@ required: false, default: true, }, + quickActionsDocs: { + type: String, + required: false, + }, }, data() { return { @@ -115,7 +119,9 @@ </i> </a> <markdown-toolbar - :markdown-docs="markdownDocs" /> + :markdown-docs="markdownDocs" + :quick-actions-docs="quickActionsDocs" + /> </div> </div> <div diff --git a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue index 0f3f6c6bb93..13402f34c5b 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue @@ -5,6 +5,10 @@ type: String, required: true, }, + quickActionsDocs: { + type: String, + required: false, + }, }, }; </script> @@ -12,12 +16,30 @@ <template> <div class="comment-toolbar clearfix"> <div class="toolbar-text"> - <a - :href="markdownDocs" - target="_blank" - tabindex="-1"> - Markdown is supported - </a> + <template v-if="!quickActionsDocs && markdownDocs"> + <a + :href="markdownDocs" + target="_blank" + tabindex="-1"> + Markdown is supported + </a> + </template> + <template v-if="quickActionsDocs && markdownDocs"> + <a + :href="markdownDocs" + target="_blank" + tabindex="-1"> + Markdown + </a> + and + <a + :href="quickActionsDocs" + target="_blank" + tabindex="-1"> + quick actions + </a> + are supported + </template> </div> <span class="uploading-container"> <span class="uploading-progress-container hide"> diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index f85afb1894e..38ffc62fbdf 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -213,7 +213,8 @@ module IssuablesHelper initialTitleText: issuable.title, initialDescriptionHtml: markdown_field(issuable, :description), initialDescriptionText: issuable.description, - initialTaskStatus: issuable.task_status + initialTaskStatus: issuable.task_status, + quickActionsDocs: help_page_path('user/project/quick_actions'), } data.merge!(updated_at_by(issuable)) |