diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-10-08 16:21:05 +0000 |
|---|---|---|
| committer | Cindy Pallares <cindy@gitlab.com> | 2018-10-11 16:45:10 -0500 |
| commit | aa08653ca5762d01d1d951ed9d825aa4be7e3041 (patch) | |
| tree | c0f0a98b60c988bc0e86a6b69d8c542aee4b9807 | |
| parent | d96d2f7df78c94883e23d663e5238ea93566bcb2 (diff) | |
| download | gitlab-ce-11-4-stable-prepare-rc4.tar.gz | |
Merge branch 'gt-remove-duplicate-button-from-the-md-header-toolbar' into 'master'11-4-stable-prepare-rc4
Remove duplicate button from the markdown header toolbar
See merge request gitlab-org/gitlab-ce!22192
| -rw-r--r-- | app/views/projects/_md_preview.html.haml | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/gt-remove-duplicate-button-from-the-md-header-toolbar.yml | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/views/projects/_md_preview.html.haml b/app/views/projects/_md_preview.html.haml index c62328e3fb9..f398d97028b 100644 --- a/app/views/projects/_md_preview.html.haml +++ b/app/views/projects/_md_preview.html.haml @@ -26,8 +26,7 @@ = markdown_toolbar_button({ icon: "list-bulleted", data: { "md-tag" => "* ", "md-prepend" => true }, title: s_("MarkdownToolbar|Add a bullet list") }) = markdown_toolbar_button({ icon: "list-numbered", data: { "md-tag" => "1. ", "md-prepend" => true }, title: s_("MarkdownToolbar|Add a numbered list") }) = markdown_toolbar_button({ icon: "task-done", data: { "md-tag" => "* [ ] ", "md-prepend" => true }, title: s_("MarkdownToolbar|Add a task list") }) - = markdown_toolbar_button({ icon: "table", data: { "md-tag" => "| header 1 | header 2 |\n| -------- | -------- |\n| cell 1 | cell 2 |\n| cell 3 | cell 4 |", "md-prepend" => true }, title: s_("MarkdownToolbar|Add a table") }) - = markdown_toolbar_button({ icon: "table", data: { "md-tag" => "| header | header |\n| ------ | ------ |\n| cell | cell |\n| cell | cell |", "md-prepend" => true }, title: _('Add a table') }) + = markdown_toolbar_button({ icon: "table", data: { "md-tag" => "| header | header |\n| ------ | ------ |\n| cell | cell |\n| cell | cell |", "md-prepend" => true }, title: s_("MarkdownToolbar|Add a table") }) %button.toolbar-btn.toolbar-fullscreen-btn.js-zen-enter.has-tooltip{ type: "button", tabindex: -1, "aria-label": "Go full screen", title: s_("MarkdownToolbar|Go full screen"), data: { container: "body" } } = sprite_icon("screen-full") diff --git a/changelogs/unreleased/gt-remove-duplicate-button-from-the-md-header-toolbar.yml b/changelogs/unreleased/gt-remove-duplicate-button-from-the-md-header-toolbar.yml new file mode 100644 index 00000000000..c2e828eb697 --- /dev/null +++ b/changelogs/unreleased/gt-remove-duplicate-button-from-the-md-header-toolbar.yml @@ -0,0 +1,5 @@ +--- +title: Remove duplicate button from the markdown header toolbar +merge_request: 22192 +author: George Tsiolis +type: changed |