delta/gitlab/gitlab-ce.git, branch edited-text

Added skip_js comment

2016-03-16T08:51:09+00:00

[ci skip]

Fixed failing rubocop test

2016-03-10T08:39:47+00:00

Fixed issue with timeago not firing

2016-03-10T08:39:47+00:00

Single if statement

2016-03-10T08:39:47+00:00

Fixed ruby issues from feedback

2016-03-10T08:39:47+00:00

Fixed failing tests

Edited timeago text on comments

2016-03-10T08:39:47+00:00

Unified the 'edited text' to be the same in descriptions and comments

Closes #5538

Merge branch 'issue-referenced-merge-requests-specs' into 'master'

2016-03-10T04:06:52+00:00


Added specs for Issue#referenced_merge_requests

Added these while looking into https://gitlab.com/gitlab-org/gitlab-ce/issues/13651.

See merge request !3125

Added specs for Issue#referenced_merge_requests

2016-03-10T03:30:55+00:00

Merge branch 'markdown_preview_shortcut' into 'master'

2016-03-10T01:50:22+00:00


Add shortcut to toggle markdown preview

Allow to toggle markdown preview with shortcut `ctrl+shift+p` (`cmd+shift+p` on OSX).

- If the user is focused on a md textarea, `ctrl-shift-p` will show the preview, otherwise native browser event is fired
- The textarea is re-focused after disabling the preview tab
- Results of markdown render is cached for fast toggles

I'm on linux, so if someone can test it on OS X, it would be great!

Closes #14038

See merge request !3111

Merge branch 'master' into markdown_preview_shortcut

2016-03-09T21:54:53+00:00