Commit Graph
10 Commits
Author SHA1 Message Date
Robert SpeicherandRobert Speicher 65d85a4403 Merge branch 'note-highlighting' into 'master'
Highlight note code and edit preview

More highlighting fixes! Highlighting wasn't applied all the way for
code in notes, diff notes diffs and diff preview (on the file edit page).

The CSS changes further unify the styling for file-content highlighting,
diff highlighting and note code highlighting.

See merge request !2594
2016-01-25 16:01:37 -08:00
Robert SpeicherandRobert Speicher 22a0106fa3 Merge branch 'diff-highlight-themes' into 'master'
Diff highlight themes

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12484

See merge request !2530
2016-01-22 11:47:51 -08:00
Robert SpeicherandRobert Speicher eebb691cb6 Merge branch 'issue_3945' into 'master'
Add syntax highlighting to diff view

Closes #3945

See merge request !2109
2016-01-20 16:56:13 -05:00
Gert Goet 7d2259b36f Diff colors on MR Discussion like on Changes-tab
Fixes #2216
2015-08-06 21:39:22 +02:00
Dmitriy Zaporozhets 0d50a65b32 Fix diff header in discussion blocks 2015-03-24 16:27:40 -07:00
Jeroen van Baarsen 39bfe0aa1d Also show colors in the sidebar of comment
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-02-03 18:45:39 +01:00
Evgeniy Sokovikov 732e6c3dbb same rendering for note diff as for usual diff 2014-10-15 13:03:27 +04:00
Dmitriy Zaporozhets 218219abbd Refactoring inside refactoring. We need to go deeper
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-08 21:54:52 +03:00
Dmitriy Zaporozhets 531f16beb0 Use new diff parsing logic
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-08 16:27:12 +03:00
Dmitriy Zaporozhets 674cbe1534 Fix diff comments toggle button
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-25 11:40:33 +03:00