789bae241c
Fixed bugs with diff comment avatars
...
The comment button on commit view was way out to the left side because
the element that renders the diff avatars was rendering when it shouldnt
be
When commenting on a discussion on the discussions tab it would try to
render the avatar & in some cases work correctly even though it shouldnt
be possible for this to happen. Changed the if statement to take this
into account
Closes #29237 , #29238 , #29243
2017-03-09 08:53:47 +00:00
1466b7eecc
Added discussion comments avatars to diff
2017-03-08 16:07:26 +00:00
fb3e365412
HAMLLint: Fix `SpaceInsideHashAttributes` offences
2016-12-31 11:58:36 +05:30
87a2762b8b
Don't use diff_line_content for emails
2016-11-28 19:40:48 +00:00
93f6fcc91e
Don't remove + / - signs from diff emails
...
In the browser, we remove the + and - signs from the front of a diff
line because we add them in with CSS, so they aren't copied. We can't do
that in an email, because the CSS isn't supported, so we should keep
them in that case.
2016-11-28 19:40:48 +00:00
bea83d2579
Remove an extra leading space from diff content
2016-11-04 14:05:49 +09:00
10c5ec3e57
Fix expansion of discussions in diff
2016-08-18 20:49:25 -05:00
6a355d451e
Improve performance of MR show page
2016-08-18 19:08:59 -05:00
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
b6d545df51
Add unfold links for Side-by-Side view
2016-08-04 09:09:59 +03:00
44eec823fb
Avoid line_code and position calculation on line partial for plain view
2016-08-01 12:38:16 +02:00
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
14c2b9683a
Use HAML class syntax in diff line partials
2016-07-07 16:14:18 -04:00
29d574868a
Display new diff notes and allow creation through the web interface
2016-07-06 18:51:00 -04:00
a27462a5c6
Extract parts of LegacyDiffNote into DiffOnNote concern and move part of responsibility to other classes
2016-07-06 18:50:59 -04:00
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
914bb05d28
Moving up common html data attributes
2016-07-06 08:29:57 +02:00
e065f4848b
Diffs will create button/diff form on demand no on server side
2016-07-06 08:29:57 +02:00
9a3ed265e9
Use `@diff_notes_disabled` instead of `@comments_allowed`
2016-05-13 17:31:58 -05:00
80d8f8b876
Syntax & style updates
2016-04-14 12:33:29 -05:00
82d0221b63
Add line type conditional to diff line helper
2016-04-14 09:10:40 -05:00
7030ffb0e0
Copying and pasting doesn't grab line numbers or +/-
2016-04-14 09:10:40 -05:00
afbcdd8e7f
Move diff line to separate partial
2016-03-19 20:04:23 +01:00
Phil Hughes