root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
106,059 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

50 Commits

Author SHA1 Message Date
GitLab Bot a160c4b1a7 Add latest changes from gitlab-org/gitlab@master 2021-05-12 00:10:27 +00:00
GitLab Bot b4e854a900 Add latest changes from gitlab-org/gitlab@master 2021-02-16 15:09:50 +00:00
GitLab Bot a79324ad1f Add latest changes from gitlab-org/gitlab@master 2020-12-15 09:10:00 +00:00
GitLab Bot 319ac09313 Add latest changes from gitlab-org/gitlab@master 2020-12-14 18:09:48 +00:00
GitLab Bot a2f16969fa Add latest changes from gitlab-org/gitlab@master 2020-12-04 06:09:34 +00:00
GitLab Bot 2b1e7f7dac Add latest changes from gitlab-org/gitlab@master 2020-10-27 15:08:39 +00:00
GitLab Bot 6e91fbf774 Add latest changes from gitlab-org/gitlab@master 2020-10-13 12:08:41 +00:00
GitLab Bot b85aae44f9 Add latest changes from gitlab-org/gitlab@master 2020-09-21 15:09:44 +00:00
GitLab Bot 49089d4fb1 Add latest changes from gitlab-org/gitlab@master 2020-07-14 12:09:14 +00:00
GitLab Bot 840d5ecdbb Add latest changes from gitlab-org/gitlab@master 2020-07-02 15:09:08 +00:00
GitLab Bot 4c5468b408 Add latest changes from gitlab-org/gitlab@master 2020-06-24 15:08:50 +00:00
GitLab Bot 60082b335c Add latest changes from gitlab-org/gitlab@master 2020-06-19 21:08:32 +00:00
GitLab Bot 6315ed9630 Add latest changes from gitlab-org/gitlab@master 2020-01-28 18:08:35 +00:00
GitLab Bot c158fa8d69 Add latest changes from gitlab-org/gitlab@master 2020-01-16 12:08:32 +00:00
GitLab Bot 69d6d3ca20 Add latest changes from gitlab-org/gitlab@master 2019-12-16 21:08:00 +00:00
GitLab Bot d10a462fed Add latest changes from gitlab-org/gitlab@master 2019-12-16 12:07:43 +00:00
GitLab Bot 4eea104c69 Add latest changes from gitlab-org/gitlab@master 2019-12-11 15:07:38 +00:00
GitLab Bot 2349eabc1a Add latest changes from gitlab-org/gitlab@master 2019-12-06 00:07:48 +00:00
GitLab Bot 98420be3dd Add latest changes from gitlab-org/gitlab@master 2019-12-04 12:07:12 +00:00
GitLab Bot eac0da9a47 Add latest changes from gitlab-org/gitlab@master 2019-11-29 15:06:43 +00:00
GitLab Bot 308146dc39 Add latest changes from gitlab-org/gitlab@master 2019-10-10 00:06:44 +00:00
GitLab Bot 4b28d5ae77 Add latest changes from gitlab-org/gitlab@master 2019-10-09 21:06:24 +00:00
Oswaldo Ferreira 89a676019c Avoid 500's when serializing legacy diff notes 2018-12-04 13:13:22 -02:00
gfyoung 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
Stan Hu de1db4972c Avoidp loading merge request diff files when not needed 2018-11-01 07:50:39 -07:00
Oswaldo Ferreira 5dce096cf8 Use standalone diff stats RPC on every comparison view 2018-09-19 12:26:28 +00:00
Oswaldo Ferreira cd1d5b2440 Cache diff highlighting upon Merge Request creation (refactors diff caching) 2018-09-07 10:07:18 -03:00
Jan Provaznik dc551581d0 Use serialize_keys as part of highlight diff cache 
This assures that old cache is not used if we change format of
cached data.
 2018-07-04 11:34:35 +02:00
Oswaldo Ferreira be8a320bd8 Use persisted diff data instead fetching Git on discussions 
Today, when fetching diffs of a note, we always go to Gitaly in order to diff between commits and return the diff of each discussion note. With this change we avoid doing that for notes on the "current version" of the MR.
 2018-04-30 20:07:21 -03:00
Sean McGivern db90882665 Only cache MR diffs for one week 
This may lead to some being evicted and having to be cached again, but many MRs
get closed or updated in that time anyway.
 2018-03-15 11:49:53 +00:00
Sean McGivern 6cd7f679d0 Only cache highlight results for latest MR diffs 
Previously, we kept them all in the cache. We don't need the highlight results
for older diffs - if someone does view that (which is rare), we can do the
highlighting on the fly.
 2018-03-15 11:49:53 +00:00
Oswaldo Ferreira ea81c27612 Submit a single batch blob RPC to Gitaly per HTTP request when viewing diffs 2018-03-09 12:36:46 -03:00
Zeger-Jan van de Weg 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
Andrew Newdigate 64d7ec0a9e Detect n+1 issues involving Gitaly 2017-09-19 10:55:37 +00:00
Douwe Maan ffbbd4112e Move diffable? method from Repository to Diff::File 2017-06-08 09:32:57 -05:00
Douwe Maan aed0387f97 Consistent diff and blob size limit names 2017-05-29 17:02:02 -05:00
Robert Speicher 8e2fefc6c4 Merge branch 'dm-diff-cleanup' into 'master' 
Clean up diff rendering

See merge request !11390
 2017-05-25 22:15:57 +00:00
Douwe Maan d88a5c1db1 Address feedback 2017-05-25 15:17:57 -05:00
Douwe Maan ab91f76e8b Add system note with link to diff comparison when MR discussion becomes outdated 2017-05-23 16:27:30 -05:00
Douwe Maan 7c479d88a9 Pass fallback_diff_refs to Diff::File instead of using view helpers 2017-05-23 15:37:05 -05:00
Sean McGivern a0979c05fd Show correct size when MR diff overflows 
The problem is that we often go via a diff object constructed from the diffs
stored in the DB. Those diffs, by definition, don't overflow, so we don't have
access to the 'correct' `real_size` - that is stored on the MR diff object
iself.
 2017-04-25 16:54:10 +01:00
Sean McGivern 1e5e56c698 Fix MR with files hidden by .gitattributes 
Don't try to highlight and cache files hidden by .gitattributes entries.
 2016-12-26 16:25:55 +00:00
Valery Sizov f5d7a61760 Fixes ActionView::Template::Error: undefined method `text?` for nil:NilClass 2016-12-02 14:03:30 +02:00
Valery Sizov 847ada36c4 Fix: Timeout creating and viewing merge request for binary file 2016-11-25 15:25:01 +02:00
Adam Niedzielski 3fa265d195 Fix expanding a collapsed diff when converting a symlink to a regular file 
In this case comparing old_path and new_path is not enough because there
are two entires that match.
 2016-11-10 18:24:12 +01:00
Adam Niedzielski 317e48193f Fix the diff in the merge request view when converting a symlink to a regular file. 
In this specific case using file_path as a cache key is not enough,
because there are two entries with the same path.
Closes #21610.
 2016-10-17 18:09:34 +02:00
Dmitriy Zaporozhets 643a368fa4
Make merge request diff works with new FileCollection logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-08-15 17:57:19 +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 1d0c7b7492 Introduce Compare model in the codebase. 
This object will manage Gitlab::Git::Compare instances
 2016-08-03 07:00:20 +02:00
Paco Guzman 8f359ea917 Move to Gitlab::Diff::FileCollection 
Instead calling diff_collection.count use diff_collection.size which is cache on the diff_collection
 2016-08-03 07:00:20 +02:00