b202b42cfe
Link to outdated diff in older MR version from outdated diff discussion
2017-04-08 14:37:46 -05:00
2d0c0308d5
prevent diff unfolding link from appearing for deleted files
2017-02-16 15:41:04 -06:00
c89d9e741c
only show diff unfolding link if there are more lines to show
2017-02-16 15:40:50 -06:00
ece2e80bf8
ensure linenumber data attribute is correct for the last line in a diff chunk
2017-01-18 15:13:27 -06:00
bc0a82334a
ensure last line in diff block is contained within a table row element
2017-01-18 15:13:22 -06: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
b6d545df51
Add unfold links for Side-by-Side view
2016-08-04 09:09:59 +03:00
79214be727
Add Discussion model to represent MR/diff discussion
2016-07-20 16:18:18 -06: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
29d574868a
Display new diff notes and allow creation through the web interface
2016-07-06 18:51:00 -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
9a3ed265e9
Use `@diff_notes_disabled` instead of `@comments_allowed`
2016-05-13 17:31:58 -05:00
99d3e21f19
Extract LegacyDiffNote out of Note
2016-05-13 17:31:43 -05:00
afbcdd8e7f
Move diff line to separate partial
2016-03-19 20:04:23 +01:00
1764e1b7cb
Use Gitlab::Git::DiffCollections
2016-03-03 18:38:44 +01:00
11ed1cbbb7
Emoji reponses on diffs aren't award emoji
2016-02-19 10:04:38 +01:00
2fed8bf390
Merge branch 'fix-diff-comments' into 'master'
...
More highlighted diff fixes
See merge request !2545
2016-01-22 07:37:47 +00:00
16d17b78ca
Restore diff comments
2016-01-22 02:10:58 +01:00
21facf5353
Use consistent markup and styling for highlighting across blobs, diffs, blame and snippets
2016-01-21 14:23:53 +01:00
0e992a3b4e
Properly highlight lines around '\ No newline at end of file'
2016-01-20 19:20:13 +01:00
701513dcc7
Move parallel diff logic to separate class
2016-01-20 14:53:20 +01:00
8dfad143d4
Add inline diff markers in highlighted diffs.
2016-01-14 22:28:07 +01:00
80a4c808b1
Make diff_line_content helper return a safe String. #3945
2016-01-12 11:02:16 -05:00
21958a3939
Add some styling for syntax highlighting themes. #3945
2016-01-07 13:45:19 -05:00
1494bb3f25
Force white theme when viewing diffs. #3945
2016-01-06 21:01:44 -05:00
776d70d11b
Use #html_safe instead of #raw in some diff views. #3945
2016-01-06 19:54:36 -05:00
7de90f4b53
Fix broken spec and small refactor. #3945
2015-12-30 18:42:11 -05:00
bb96d63153
New implementation for highlighting diff files. #3945
...
* It is more performant given now we process all the diff file instead
of processing line by line.
* Multiline comments are highlighted correctly.
2015-12-30 00:52:50 -05:00
34657b821a
Add syntax highlighting to diff view. #3945
2015-12-28 18:31:27 -05:00
cad0e848b0
Fix and style the "Changes suppressed" link.
2015-07-23 16:07:45 -04:00
342d553709
Rename abilities to correspond contoller/model action names
...
write_ was renamed to create_
modify_ was renamed to update_
So now in update action we have next code
def create
can?(current_user, :create_issue, @issue)
end
def update
can?(current_user, :update_issue, @issue)
end
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-26 15:55:56 +02:00
3c892f3554
Disabled expansion of top/bottom blobs for new file diffs
2015-05-21 09:25:07 +02:00
d4fec49abc
Fix merge request comments on files with multiple commits
...
Having a merge request with a comments on a line which is then changed
in a later commit prevented new comments from properly showing up in the
merge request show page.
* `Note#set_diff` do not use stored the diff when creating a new note
in merge requests (we can not be sure the diff did not changed since
the last comment on that line)
* Do not rely just on `outdated?` of the first note when displaying
comments of a MR in the discussion tab, but partition the
active/outdated notes and display them all
* In the inline changes tab just select the active notes, so an
outdated note does not prevent an active one from being rendered
* Just show active comments in the side-by-side changes tab
2015-04-15 18:23:57 +02:00
a30645c68f
Don't show commit comment button when user is not signed in.
2015-03-23 16:17:10 +01:00
93dc885530
Fix usage of diff file mode change
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-08 22:25:20 +03:00
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
e0eb48031d
Refactor diff views
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-08 16:26:49 +03:00
Douwe Maan
Mike Greiling
Tim Masliuchenko
Paco Guzman
Jacob Vosmaer
Zeger-Jan van de Weg
Robert Speicher
Douwe Maan
Rubén Dávila
Rubén Dávila
Robert Speicher
Dmitriy Zaporozhets
Alex Connor
Dominik Sander