From e7221ad66efeb0f7d263ead7ed523d194243fb09 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Thu, 9 Jun 2016 16:24:16 +0100 Subject: Added shortcut to help shortcuts view Updated shortcuts.png for docs Updated CHANGELOG Moved CHANGELOG entry updated shortcut docs --- CHANGELOG | 1 + app/views/help/_shortcuts.html.haml | 6 +++++- doc/workflow/shortcuts.png | Bin 90936 -> 108255 bytes 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index b12ba9f31b1..fbbccf75112 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -72,6 +72,7 @@ v 8.9.0 (unreleased) - Projects pending deletion will render a 404 page - Measure queue duration between gitlab-workhorse and Rails - Added Gfm autocomplete for labels + - Added edit note 'up' shortcut documentation to the help panel and docs screenshot #18114 - Make Omniauth providers specs to not modify global configuration - Remove unused JiraIssue class and replace references with ExternalIssue. !4659 (Ilan Shamir) - Make authentication service for Container Registry to be compatible with < Docker 1.11 diff --git a/app/views/help/_shortcuts.html.haml b/app/views/help/_shortcuts.html.haml index 01648047ce2..8cc0b59edeb 100644 --- a/app/views/help/_shortcuts.html.haml +++ b/app/views/help/_shortcuts.html.haml @@ -28,8 +28,12 @@ .key ⌘ shift p - else .key ctrl shift p - %td Toggle Markdown preview + %tr + %td.shortcut + .key + %i.fa.fa-arrow-up + %td Edit last comment (when focused on an empty textarea) %tbody %tr %th diff --git a/doc/workflow/shortcuts.png b/doc/workflow/shortcuts.png index beb6c53ec77..16be0413b64 100644 Binary files a/doc/workflow/shortcuts.png and b/doc/workflow/shortcuts.png differ -- cgit v1.2.1