ca5de52835
Add latest changes from gitlab-org/gitlab@master
2021-12-10 18:14:42 +00:00
0687020509
Add latest changes from gitlab-org/gitlab@master
2021-11-15 12:11:17 +00:00
76cbe9e688
Add latest changes from gitlab-org/gitlab@master
2021-11-12 15:12:37 +00:00
f78f3d8678
Add latest changes from gitlab-org/gitlab@master
2021-11-12 03:12:11 +00:00
fecccb42ab
Add latest changes from gitlab-org/gitlab@master
2021-11-11 03:10:33 +00:00
fe448fa0fc
Add latest changes from gitlab-org/gitlab@master
2021-11-04 18:09:40 +00:00
70a50740a2
Add latest changes from gitlab-org/gitlab@master
2021-11-03 15:13:48 +00:00
024e8b496d
Add latest changes from gitlab-org/gitlab@master
2021-11-01 18:12:42 +00:00
d0e1da3264
Add latest changes from gitlab-org/gitlab@master
2021-10-15 03:12:17 +00:00
cf98b5d69a
Add latest changes from gitlab-org/gitlab@master
2021-07-05 09:07:37 +00:00
f8975b16d1
Add latest changes from gitlab-org/gitlab@master
2021-07-01 21:08:38 +00:00
4c5468b408
Add latest changes from gitlab-org/gitlab@master
2020-06-24 15:08:50 +00:00
808c799a67
Add latest changes from gitlab-org/gitlab@master
2020-05-22 12:08:15 +00:00
40cdcdd45b
Add latest changes from gitlab-org/gitlab@master
2020-05-18 18:08:22 +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
759cd6c298
Add latest changes from gitlab-org/gitlab@master
2019-09-26 09:06:04 +00:00
db68003e8b
Memoize old_blob and new_blob to improve performance
2019-03-28 12:11:37 +00: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
6cfa5ee536
Merge branch 'expand-diff-to-full-file' into 'master'
...
Expand diff to entire file
Closes #19054
See merge request gitlab-org/gitlab-ce!24406
2019-03-07 11:33:15 +00:00
3288e1a874
Adds the Rubocop ReturnNil cop
...
This style change enforces `return if ...` instead of
`return nil if ...` to save maintainers a few minor review points
2019-03-06 17:51:56 +02: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
bf8f32da7f
Replaced part of diff file properties with diff viewer
...
- replaced file.too_large
- replaced file.text
- replaced file.collapsed
2019-02-15 17:56:50 +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
7cf4947792
Cache diff highlight in discussions
...
This commit handles note diffs caching, which considerably improves
the performance on merge requests with lots of comments.
Important to note that the caching approach taken here is different
from `Gitlab::Diff::HighlightCache`. We do not reset the whole cache
when a new push is sent or anything else. That's because discussions
diffs are persisted and do not change.
2018-12-21 16:59:21 -02:00
8d2e1b724b
Merge branch '54786-mr-empty-file-display' into 'master'
...
Display empty files properly on MR diffs
Closes #54786
See merge request gitlab-org/gitlab-ce!23671
2018-12-15 12:21:54 +00:00
ed3034bbb7
Allow suggesting single line changes in diffs
2018-12-13 19:17:19 +00:00
05dcb2dd76
Display empty files properly on MR diffs
2018-12-11 23:49:04 -05:00
56834e6bb2
Merge branch 'osw-comment-on-any-line-on-diffs-w-feature-flag' into 'master'
...
Comment on any expanded diff line on MRs (with feature-flag)
Closes #13950
See merge request gitlab-org/gitlab-ce!22914
2018-11-12 15:36:48 +00: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
7e6f6e1603
Enable even more frozen string in lib/gitlab
...
Enables frozens string for the following:
* lib/gitlab/conflict/**/*.rb
* lib/gitlab/cross_project_access/**/*.rb
* lib/gitlab/cycle_analytics/**/*.rb
* lib/gitlab/data_builder/**/*.rb
* lib/gitlab/database/**/*.rb
* lib/gitlab/dependency_linker/**/*.rb
* lib/gitlab/diff/**/*.rb
* lib/gitlab/downtime_check/**/*.rb
* lib/gitlab/email/**/*.rb
* lib/gitlab/etag_caching/**/*.rb
Partially addresses gitlab-org/gitlab-ce#47424 .
2018-11-06 22:47:32 -08: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
2039c8280d
Disable existing offenses for the CodeReuse cops
...
This whitelists all existing offenses for the various CodeReuse cops, of
which most are triggered by the CodeReuse/ActiveRecord cop.
2018-09-11 17:32:00 +02:00
fe695ebd24
Merge branch 'issue_48474' into 'master'
...
Fix discussion entity for legacy diff notes
Closes #48474
See merge request gitlab-org/gitlab-ce!20214
2018-07-05 10:18:53 +00:00
6d41df5071
Render LegacyDiffNote when diff_file blob is nil
2018-07-04 12:34:41 -03: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
3e66795ef1
Changes tab VUE refactoring
2018-06-21 12:22:40 +00: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
bb8f2520b4
Persist truncated note diffs on a new table
...
We request Gitaly in a N+1 manner to build discussion diffs. Once the diffs are from different revisions, it's hard to make a single request to the service in order to build the whole response.
With this change we solve this problem and simplify a lot fetching this piece of info.
2018-05-24 15:34:43 -03:00
bb226a294b
Ensure that we never assume old_blob or new_blob are nil
...
These can be a `BatchLoader` which is proxying a nil, while not being concrete
nils themselves.
2018-03-16 18:19:33 +00:00
528b5eeb76
Fix error when viewing diffs without blobs
...
Old merge requests can have diffs without corresponding blobs. (This also may be
possible for commit diffs in corrupt repositories.)
We can't use the `&.` operator on the blobs, because the blob objects are never
nil, but `BatchLoader` instances that delegate to `Blob`. We can't use
`Object#try`, because `Blob` doesn't inherit from `Object`.
`BatchLoader` provides a `__sync` method that returns the delegated object, but
using `itself` also works because it's forwarded, and will work for
non-`BatchLoader` instances too. So the simplest solution is to just use that
with the `&.` operator.
2018-01-04 14:33:12 +00:00
771bf9527f
Improve performance of DiffDiscussion#truncated_diff_lines and DiffNote#diff_line by removing expensive diff position calculation and comparison
2017-12-22 18:07:15 +01:00
f9565e3039
Batchload blobs for diff generation
...
After installing a new gem, batch-loader, a construct can be used to
queue data to be fetched in bulk. The gem was also introduced in both
gitlab-org/gitlab-ce!14680 and gitlab-org/gitlab-ce!14846 , but those mrs
are not merged yet.
For the generation of diffs, both the old blob and the new blob need to
be loaded. This for every file in the diff, too. Now we collect all
these so we do 1 fetch. Three `.allow_n_plus_1_calls` have been removed,
which I expect to be valid, but this needs to be confirmed by a full CI
run.
Possibly closes:
- https://gitlab.com/gitlab-org/gitlab-ce/issues/37445
- https://gitlab.com/gitlab-org/gitlab-ce/issues/37599
- https://gitlab.com/gitlab-org/gitlab-ce/issues/37431
2017-11-21 13:53:26 +01:00
9fdde3693b
Move line code generation into Gitlab::Git
...
Having a distinct class just for that was a bit overkill
2017-10-12 22:13:05 -03:00
faa9bd402d
Create a Gitlab::Git submodule for conlict-related files
...
Rename classes to (hopefully) clearer names while we're doing that.
2017-10-12 22:03:15 -03:00
f72598b659
Move Gitlab::Diff::LineCode to module Gitlab::Git
2017-10-12 21:45:16 -03:00
GitLab Bot
Igor
Mark Chao
Douwe Maan
Andrew Newdigate
Phil Hughes
Natalia Tepluhina
Francisco Javier López
Oswaldo Ferreira
Nick Thomas
Sean Nichols
gfyoung
Yorick Peterse
Sean McGivern
Felipe Artur
Jan Provaznik
Felipe Artur
Sean McGivern
Douwe Maan
Zeger-Jan van de Weg
Alejandro Rodríguez