ed79d7cc5b
Add latest changes from gitlab-org/gitlab@master
2025-04-09 18:13:01 +00:00
958a674e2c
Add latest changes from gitlab-org/gitlab@master
2025-03-11 00:12:47 +00:00
8936551eb6
Add latest changes from gitlab-org/gitlab@master
2025-01-15 09:37:47 +00:00
ea36a6075d
Add latest changes from gitlab-org/gitlab@master
2024-12-19 12:32:43 +00:00
db788ce2ea
Add latest changes from gitlab-org/gitlab@master
2024-11-15 12:24:08 +00:00
9834c4f706
Add latest changes from gitlab-org/gitlab@master
2024-10-04 18:23:16 +00:00
bac22cf644
Add latest changes from gitlab-org/gitlab@master
2024-09-19 09:12:22 +00:00
f962f7d316
Add latest changes from gitlab-org/gitlab@master
2024-09-16 12:07:25 +00:00
09ea6a8776
Add latest changes from gitlab-org/gitlab@master
2024-08-08 00:08:21 +00:00
21d9258e42
Add latest changes from gitlab-org/gitlab@master
2024-06-20 15:26:53 +00:00
0517bd37f8
Add latest changes from gitlab-org/gitlab@master
2024-04-29 21:11:46 +00:00
0441cbd4d4
Add latest changes from gitlab-org/gitlab@master
2024-04-22 09:10:05 +00:00
4dcdd5bebb
Add latest changes from gitlab-org/gitlab@master
2024-01-24 06:07:44 +00:00
6323146895
Add latest changes from gitlab-org/gitlab@master
2023-12-21 15:12:00 +00:00
49d65a7ae2
Add latest changes from gitlab-org/gitlab@master
2023-12-13 03:11:39 +00:00
24ed1c84da
Add latest changes from gitlab-org/gitlab@master
2023-11-01 03:10:42 +00:00
44434461b3
Add latest changes from gitlab-org/gitlab@master
2022-11-03 18:11:17 +00:00
f6d22c8ba7
Add latest changes from gitlab-org/gitlab@master
2022-10-18 06:09:24 +00:00
b0139a824f
Add latest changes from gitlab-org/gitlab@master
2022-06-30 12:09:03 +00:00
1f6abbe6fa
Add latest changes from gitlab-org/gitlab@master
2022-05-18 21:07:37 +00:00
8d9963a8e3
Add latest changes from gitlab-org/gitlab@master
2022-05-13 21:08:46 +00:00
cd40e11c57
Add latest changes from gitlab-org/gitlab@master
2022-04-19 18:09:14 +00:00
4001deba73
Add latest changes from gitlab-org/gitlab@master
2022-04-05 15:08:37 +00:00
b72218d98e
Add latest changes from gitlab-org/gitlab@master
2022-03-30 00:09:03 +00:00
95b9a603c3
Add latest changes from gitlab-org/gitlab@master
2022-02-22 15:18:06 +00:00
4d3bbc4990
Add latest changes from gitlab-org/gitlab@master
2022-01-24 12:10:54 +00:00
0512d12bf1
Add latest changes from gitlab-org/gitlab@master
2021-11-19 12:12:41 +00:00
f78f3d8678
Add latest changes from gitlab-org/gitlab@master
2021-11-12 03:12:11 +00:00
b1159cdc7a
Add latest changes from gitlab-org/gitlab@master
2021-11-06 00:13:26 +00:00
f8975b16d1
Add latest changes from gitlab-org/gitlab@master
2021-07-01 21:08:38 +00:00
bdca097916
Add latest changes from gitlab-org/gitlab@master
2020-08-11 03:11:00 +00:00
c59765a50a
Add latest changes from gitlab-org/gitlab@master
2020-06-24 18:09:03 +00:00
808c799a67
Add latest changes from gitlab-org/gitlab@master
2020-05-22 12:08:15 +00:00
c74b7b5e43
Add latest changes from gitlab-org/gitlab@master
2020-04-28 12:09:44 +00:00
d466ee5042
Add latest changes from gitlab-org/gitlab@master
2020-02-13 21:08:59 +00:00
208e2e308c
Add latest changes from gitlab-org/gitlab@master
2020-02-02 06:08:56 +00:00
600ca97812
Add latest changes from gitlab-org/gitlab@master
2020-01-15 21:08:48 +00:00
f540ffcef6
Add frozen_string_literal to spec/lib (part 1)
...
Using the sed script from
https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
2019-07-26 13:25:07 +12:00
8723f29255
Fix diff bottom expand button appears twice
...
This is a quick fix by only append match line once
when calling diff_lines_for_serializer multiple time.
Also enable feature by default
2019-03-21 23:08:29 +08:00
b14de8e1f5
Add option to expand diff to full file
...
The user can also toggle between the diff changes and
the full file diff.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19054
2019-03-06 15:51:44 +08: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
ece6df18f8
Fix redundant returns in spec file
2018-12-13 02:24:31 -05:00
4d2448e03a
Add tests and move empty file message into own component
2018-12-13 01:49:32 -05:00
f9b4130bb7
Comment on any expanded diff line on MRs
2018-11-09 16:56:48 -02:00
198402b38b
Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"
...
This reverts commit a82a595728e7df959b8f
2018-11-07 19:57:26 -02:00
ec66ef1b74
Comment on any expanded diff line on MRs
2018-11-06 17:39:31 -02:00
5dce096cf8
Use standalone diff stats RPC on every comparison view
2018-09-19 12:26:28 +00:00
26a8472d6d
Don't add bottom 'match' line for deleted files
...
If a file is deleted, its new_pos is 0 (less than
total_blob_lines), but there is no reason to add the
bottom 'match' line in this case because there is not
extra content which could be expanded.
2018-06-28 22:53:35 +02:00
f376347f24
Find and mark more Git disk access locations, part 2
2018-06-12 14:33:37 +02:00
f46739191a
Adjust insufficient diff hunks being persisted on NoteDiffFile
...
This currently causes 500's errors when loading the MR page
(Discussion) in a few scenarios.
We were not considering detailed diff headers such as
"--- a/doc/update/mysql_to_postgresql.md\n+++ b/doc/update/mysql_to_postgresql.md"
to crop the diff. In order to address it, we're now using
Gitlab::Diff::Parser, clean the diffs and builds Gitlab::Diff::Line objects
we can iterate and filter on.
2018-06-05 01:02:30 -03:00
GitLab Bot
Thong Kuah
Mark Chao
Phil Hughes
Francisco Javier López
Sean Nichols
Oswaldo Ferreira
Jan Provaznik
Jacob Vosmaer