Commit graph

17 commits

Author SHA1 Message Date
Douwe Maan
10c5ec3e57 Fix expansion of discussions in diff 2016-08-18 20:49:25 -05:00
Douwe Maan
6a355d451e Improve performance of MR show page 2016-08-18 19:08:59 -05:00
Sean McGivern
18f13e8bb8 Fix email line-height in Outlook
Outlook seems to handle `white-space: pre` weirdly, so just use `pre`
elements (but only for emails!).
2016-08-17 15:55:34 +01:00
Tim Masliuchenko
b6d545df51 Add unfold links for Side-by-Side view 2016-08-04 09:09:59 +03:00
Paco Guzman
44eec823fb Avoid line_code and position calculation on line partial for plain view 2016-08-01 12:38:16 +02:00
Douwe Maan
5a8f727fd5 Merge branch 'master' into faster-diffs
# Conflicts:
#	app/helpers/notes_helper.rb
#	app/views/projects/diffs/_line.html.haml
#	app/views/projects/diffs/_parallel_view.html.haml
#	app/views/projects/diffs/_text_file.html.haml
#	features/steps/shared/diff_note.rb
2016-07-07 18:05:34 -04:00
Douwe Maan
14c2b9683a Use HAML class syntax in diff line partials 2016-07-07 16:14:18 -04:00
Douwe Maan
29d574868a Display new diff notes and allow creation through the web interface 2016-07-06 18:51:00 -04:00
Douwe Maan
a27462a5c6 Extract parts of LegacyDiffNote into DiffOnNote concern and move part of responsibility to other classes 2016-07-06 18:50:59 -04:00
Paco Guzman
39b6e678da Simplify HAML code using unless condition and nesting
Extract diff line data attributes to helper methods
2016-07-06 09:02:53 +02:00
Paco Guzman
914bb05d28 Moving up common html data attributes 2016-07-06 08:29:57 +02:00
Jacob Schatz
e065f4848b Diffs will create button/diff form on demand no on server side 2016-07-06 08:29:57 +02:00
Douwe Maan
9a3ed265e9 Use @diff_notes_disabled instead of @comments_allowed 2016-05-13 17:31:58 -05:00
Annabel Dunstone
80d8f8b876 Syntax & style updates 2016-04-14 12:33:29 -05:00
Annabel Dunstone
82d0221b63 Add line type conditional to diff line helper 2016-04-14 09:10:40 -05:00
Annabel Dunstone
7030ffb0e0 Copying and pasting doesn't grab line numbers or +/- 2016-04-14 09:10:40 -05:00
Douwe Maan
afbcdd8e7f Move diff line to separate partial 2016-03-19 20:04:23 +01:00