Commit graph

61 commits

Author SHA1 Message Date
GitLab Bot
85ea3dd4f4 Add latest changes from gitlab-org/gitlab@master 2022-03-31 15:08:32 +00:00
GitLab Bot
b72218d98e Add latest changes from gitlab-org/gitlab@master 2022-03-30 00:09:03 +00:00
GitLab Bot
7e17b031fa Add latest changes from gitlab-org/gitlab@master 2021-07-08 18:09:32 +00:00
GitLab Bot
79659fe1fe Add latest changes from gitlab-org/gitlab@master 2021-06-28 09:08:19 +00:00
GitLab Bot
a3dfd311f4 Add latest changes from gitlab-org/gitlab@master 2021-04-14 15:09:04 +00:00
GitLab Bot
b4e854a900 Add latest changes from gitlab-org/gitlab@master 2021-02-16 15:09:50 +00:00
GitLab Bot
a1ed241c82 Add latest changes from gitlab-org/gitlab@master 2021-02-03 21:09:17 +00:00
GitLab Bot
9ecdb93f4e Add latest changes from gitlab-org/gitlab@master 2021-02-01 12:09:03 +00:00
GitLab Bot
71c85847eb Add latest changes from gitlab-org/gitlab@master 2020-11-19 18:09:13 +00:00
GitLab Bot
cfaf98a3b2 Add latest changes from gitlab-org/gitlab@master 2020-11-18 03:09:21 +00:00
GitLab Bot
f4182abcb6 Add latest changes from gitlab-org/gitlab@master 2020-11-12 18:09:26 +00:00
GitLab Bot
840d5ecdbb Add latest changes from gitlab-org/gitlab@master 2020-07-02 15:09:08 +00:00
GitLab Bot
d6348d22dd Add latest changes from gitlab-org/gitlab@master 2020-06-24 09:08:32 +00:00
GitLab Bot
a89cb5cbdd Add latest changes from gitlab-org/gitlab@master 2020-02-06 21:08:48 +00:00
GitLab Bot
69d6d3ca20 Add latest changes from gitlab-org/gitlab@master 2019-12-16 21:08:00 +00:00
GitLab Bot
eac0da9a47 Add latest changes from gitlab-org/gitlab@master 2019-11-29 15:06:43 +00:00
GitLab Bot
9865665cb1 Add latest changes from gitlab-org/gitlab@master 2019-10-08 12:06:01 +00:00
Francisco Javier López
5a3e6fdff9
Fixing image lfs bug and also displaying text lfs
This commit, introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23812,
fixes a problem creating a displaying image diff notes when the image
is stored in LFS. The main problem was that `Gitlab::Diff::File` was
returning an invalid valid in `text?` for this kind of files.

It also fixes a rendering problem with other LFS files, like text
ones. They LFS pointer shouldn't be shown when LFS is enabled
for the project, but they were.
2018-12-27 16:51:07 +01:00
Douwe Maan
98106ec54e
Merge branch '42028-xss-diffs-10-6' into 'security-10-6'
Port of "Fix XSS on commit diff view" for 10-6

See merge request 
2018-04-05 08:40:05 +02:00
Phil Hughes
500a3de7b4
Fix changes dropdown ellipsis working across browsers
Closes 
2018-01-09 11:29:57 +00:00
micael.bergeron
46e4e8f4dc changed InlineDiffMarker to make it html_safe its output
updated the spec
2017-09-12 13:42:40 -04:00
Jarka Kadlecova
c271fdc80f Don't escape html entities when rich == raw line 2017-08-17 19:55:07 +02:00
Robert Speicher
9513bd18c4 Ensure all project factories use :repository trait or :empty_project 2017-08-01 14:51:52 -04:00
Sean McGivern
fdfb4bbe5c Fix diff commenting results just after changing view
When you change the diff view (inline / side-by-side), we set a cookie based on
that new view. When you add a comment, we choose the style to use in the
response based on that cookie.

However, when you have just changed diff style, the request cookie will contain
the old value, so we should use the view param instead.
2017-07-28 13:59:57 +01:00
Douwe Maan
5e8aca2152 Don't display comment on unchanged line on both sides in parallel diff 2017-06-19 11:50:46 -05:00
Douwe Maan
7944254563 Implement diff viewers 2017-06-14 10:12:21 -05:00
Sean McGivern
c1ee45953e Merge branch 'fix_diff_line_comments' into 'master'
Fix: A diff comment on a change at last line of a file shows as two comments in discussion

Closes 

See merge request 
2017-06-01 10:30:46 +00:00
Valery Sizov
b417fc0329 Fix rubocop in spec/helpers/diff_helper_spec.rb 2017-06-01 12:07:06 +03:00
Valery Sizov
563c1ca01c Fix: A diff comment on a change at last line of a file shows as two comments in discussion 2017-05-31 18:38:10 +03:00
Douwe Maan
aed0387f97 Consistent diff and blob size limit names 2017-05-29 17:02:02 -05:00
Douwe Maan
02650d97e5 Fix specs 2017-05-10 08:26:21 -05:00
Valery Sizov
ceb1ebd959 Active tense test coverage
Ports changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/642 back into CE
2017-02-01 22:45:41 +00:00
Robert Speicher
edf7dbfacd Merge branch 'html-safe-diff-line-content' into 'security'
Don't accidentally mark unsafe diff lines as HTML safe

Fixes potential XSS issue when a legacy diff note is created on a merge
request whose diff contained HTML

See https://gitlab.com/gitlab-org/gitlab-ce/issues/25249

See merge request 
2016-12-08 21:38:35 -03:00
Hiroyuki Sato
bea83d2579 Remove an extra leading space from diff content 2016-11-04 14:05:49 +09:00
tiagonbotelho
1d268a89de adds second batch of tests changed to active tense 2016-08-09 15:11:39 +01:00
tiagonbotelho
519275c110 fixes part1 of files to start using active tense 2016-08-09 15:06:23 +01:00
Tim Masliuchenko
b6d545df51 Add unfold links for Side-by-Side view 2016-08-04 09:09:59 +03:00
Paco Guzman
c86c1905b5 switch from diff_file_collection to diffs
So we have raw_diffs too
2016-08-03 07:00:20 +02:00
Paco Guzman
a404ab380d Collapsed diffs lines/size don't accumulate to overflow diffs. 2016-07-18 14:43:28 -06:00
Jacob Schatz
0452e0a57e Merge branch 'master' into faster-diffs 2016-07-11 17:19:17 -04:00
Sean McGivern
78496e8c38 Disable overflow messages
With the option to expand and collapse individual diffs, these aren't
needed any more.
2016-07-08 10:57:21 +01: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
a9fa45f09e Represent DiffRefs as proper class instead of tuple array 2016-07-06 18:50:58 -04:00
Luke "Jared" Bennett
50dfdf0296 fix up tests
Added more exceptions

Added handling inline view type
2016-07-06 08:29:57 +02:00
Adam Butler
8a8b5497c5 Create DiffFilter and change SystemNoteService#change_title to use Gitlab::Diff::InlineDiff 2016-05-18 11:15:10 -05:00
Robert Speicher
90a67a76d5 Always read diff_view setting from the cookie
Prior, when the user had their view set to "parallel" and then visited a
merge request's changes tab _without_ passing the `view` parameter via
query string, the view would be parallel but the `Notes` class was
always instantiated with the default value from `diff_view` ("inline"),
resulting in broken markup when the form to add a line note was
dynamically inserted.

The cookie is set whenever the view is changed, so this value should
always be up-to-date.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14557
2016-04-14 17:38:34 -04:00
Jacob Vosmaer
1764e1b7cb Use Gitlab::Git::DiffCollections 2016-03-03 18:38:44 +01:00
Douwe Maan
fa0cbb1399 Fix specs and add a new one 2016-01-30 12:53:12 +01:00
Douwe Maan
701513dcc7 Move parallel diff logic to separate class 2016-01-20 14:53:20 +01:00
Rubén Dávila
6b9c730e91 More refactoring from last code review.
* Use commit objects instead of IDs when generating diffs
* Use proper references when generating MR's source and target
* Update broken specs
2016-01-14 16:47:55 -05:00