20625a2433
Add latest changes from gitlab-org/gitlab@master
2024-10-09 21:14:51 +00:00
41bd3e161f
Add latest changes from gitlab-org/gitlab@master
2024-05-24 12:12:31 +00:00
e408c9c787
Add latest changes from gitlab-org/gitlab@master
2024-03-06 12:12:50 +00:00
54b2cc7dfc
Add latest changes from gitlab-org/gitlab@master
2024-02-22 15:11:11 +00:00
77c5e51177
Add latest changes from gitlab-org/gitlab@master
2024-02-13 15:11:12 +00:00
f5ea25c365
Add latest changes from gitlab-org/gitlab@master
2023-10-16 21:12:54 +00:00
acc3d48da4
Add latest changes from gitlab-org/gitlab@master
2023-10-12 06:11:31 +00:00
403b33efdb
Add latest changes from gitlab-org/gitlab@master
2023-09-26 06:11:42 +00:00
d0db908485
Add latest changes from gitlab-org/gitlab@master
2023-03-07 03:07:43 +00:00
66e3f84f52
Add latest changes from gitlab-org/gitlab@master
2022-11-23 21:11:46 +00:00
bc9a474793
Add latest changes from gitlab-org/gitlab@master
2022-11-07 09:08:11 +00:00
44434461b3
Add latest changes from gitlab-org/gitlab@master
2022-11-03 18:11:17 +00:00
eac94e5cd6
Add latest changes from gitlab-org/gitlab@master
2022-11-01 15:11:22 +00:00
affec3ced2
Add latest changes from gitlab-org/gitlab@master
2022-07-13 12:09:54 +00:00
e129eff883
Add latest changes from gitlab-org/gitlab@master
2022-07-05 18:08:43 +00:00
06bcbc77e4
Add latest changes from gitlab-org/gitlab@master
2022-06-16 06:08:59 +00:00
85ea3dd4f4
Add latest changes from gitlab-org/gitlab@master
2022-03-31 15:08:32 +00:00
b72218d98e
Add latest changes from gitlab-org/gitlab@master
2022-03-30 00:09:03 +00:00
7e17b031fa
Add latest changes from gitlab-org/gitlab@master
2021-07-08 18:09:32 +00:00
79659fe1fe
Add latest changes from gitlab-org/gitlab@master
2021-06-28 09:08:19 +00:00
a3dfd311f4
Add latest changes from gitlab-org/gitlab@master
2021-04-14 15:09:04 +00:00
b4e854a900
Add latest changes from gitlab-org/gitlab@master
2021-02-16 15:09:50 +00:00
a1ed241c82
Add latest changes from gitlab-org/gitlab@master
2021-02-03 21:09:17 +00:00
9ecdb93f4e
Add latest changes from gitlab-org/gitlab@master
2021-02-01 12:09:03 +00:00
71c85847eb
Add latest changes from gitlab-org/gitlab@master
2020-11-19 18:09:13 +00:00
cfaf98a3b2
Add latest changes from gitlab-org/gitlab@master
2020-11-18 03:09:21 +00:00
f4182abcb6
Add latest changes from gitlab-org/gitlab@master
2020-11-12 18:09:26 +00:00
840d5ecdbb
Add latest changes from gitlab-org/gitlab@master
2020-07-02 15:09:08 +00:00
d6348d22dd
Add latest changes from gitlab-org/gitlab@master
2020-06-24 09:08:32 +00:00
a89cb5cbdd
Add latest changes from gitlab-org/gitlab@master
2020-02-06 21:08:48 +00:00
69d6d3ca20
Add latest changes from gitlab-org/gitlab@master
2019-12-16 21:08:00 +00:00
eac0da9a47
Add latest changes from gitlab-org/gitlab@master
2019-11-29 15:06:43 +00:00
9865665cb1
Add latest changes from gitlab-org/gitlab@master
2019-10-08 12:06:01 +00:00
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
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 gitlab/gitlabhq!2364
2018-04-05 08:40:05 +02:00
500a3de7b4
Fix changes dropdown ellipsis working across browsers
...
Closes #41561
2018-01-09 11:29:57 +00:00
46e4e8f4dc
changed InlineDiffMarker to make it html_safe its output
...
updated the spec
2017-09-12 13:42:40 -04:00
c271fdc80f
Don't escape html entities when rich == raw line
2017-08-17 19:55:07 +02:00
9513bd18c4
Ensure all project factories use `:repository` trait or `:empty_project`
2017-08-01 14:51:52 -04:00
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
5e8aca2152
Don't display comment on unchanged line on both sides in parallel diff
2017-06-19 11:50:46 -05:00
7944254563
Implement diff viewers
2017-06-14 10:12:21 -05:00
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 #32353
See merge request !11802
2017-06-01 10:30:46 +00:00
b417fc0329
Fix rubocop in spec/helpers/diff_helper_spec.rb
2017-06-01 12:07:06 +03:00
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
aed0387f97
Consistent diff and blob size limit names
2017-05-29 17:02:02 -05:00
02650d97e5
Fix specs
2017-05-10 08:26:21 -05:00
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
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 !2040
2016-12-08 21:38:35 -03:00
bea83d2579
Remove an extra leading space from diff content
2016-11-04 14:05:49 +09:00
GitLab Bot
Francisco Javier López
Douwe Maan
Phil Hughes
micael.bergeron
Jarka Kadlecova
Robert Speicher
Sean McGivern
Douwe Maan
Sean McGivern
Valery Sizov
Robert Speicher
Hiroyuki Sato