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
112,026 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

102 Commits

Author SHA1 Message Date
GitLab Bot 4dcdd5bebb Add latest changes from gitlab-org/gitlab@master 2024-01-24 06:07:44 +00:00
GitLab Bot 49d65a7ae2 Add latest changes from gitlab-org/gitlab@master 2023-12-13 03:11:39 +00:00
GitLab Bot 0bdb61ade7 Add latest changes from gitlab-org/gitlab@master 2023-09-22 00:11:47 +00:00
GitLab Bot 44434461b3 Add latest changes from gitlab-org/gitlab@master 2022-11-03 18:11:17 +00:00
GitLab Bot 8c2d06cba7 Add latest changes from gitlab-org/gitlab@master 2022-07-29 15:12:25 +00:00
GitLab Bot b0139a824f Add latest changes from gitlab-org/gitlab@master 2022-06-30 12:09:03 +00:00
GitLab Bot 1f6abbe6fa Add latest changes from gitlab-org/gitlab@master 2022-05-18 21:07:37 +00:00
GitLab Bot 8d9963a8e3 Add latest changes from gitlab-org/gitlab@master 2022-05-13 21:08:46 +00:00
GitLab Bot 67fa8362ae Add latest changes from gitlab-org/gitlab@master 2022-05-06 15:09:03 +00:00
GitLab Bot cd40e11c57 Add latest changes from gitlab-org/gitlab@master 2022-04-19 18:09:14 +00:00
GitLab Bot 4001deba73 Add latest changes from gitlab-org/gitlab@master 2022-04-05 15:08:37 +00:00
GitLab Bot 6ebe886c82 Add latest changes from gitlab-org/gitlab@master 2022-03-10 15:08:10 +00:00
GitLab Bot e40c68997d Add latest changes from gitlab-org/gitlab@master 2022-02-24 12:12:57 +00:00
GitLab Bot 95b9a603c3 Add latest changes from gitlab-org/gitlab@master 2022-02-22 15:18:06 +00:00
GitLab Bot ca5de52835 Add latest changes from gitlab-org/gitlab@master 2021-12-10 18:14:42 +00:00
GitLab Bot 0687020509 Add latest changes from gitlab-org/gitlab@master 2021-11-15 12:11:17 +00:00
GitLab Bot 76cbe9e688 Add latest changes from gitlab-org/gitlab@master 2021-11-12 15:12:37 +00:00
GitLab Bot f78f3d8678 Add latest changes from gitlab-org/gitlab@master 2021-11-12 03:12:11 +00:00
GitLab Bot fecccb42ab Add latest changes from gitlab-org/gitlab@master 2021-11-11 03:10:33 +00:00
GitLab Bot fe448fa0fc Add latest changes from gitlab-org/gitlab@master 2021-11-04 18:09:40 +00:00
GitLab Bot 70a50740a2 Add latest changes from gitlab-org/gitlab@master 2021-11-03 15:13:48 +00:00
GitLab Bot 024e8b496d Add latest changes from gitlab-org/gitlab@master 2021-11-01 18:12:42 +00:00
GitLab Bot d0e1da3264 Add latest changes from gitlab-org/gitlab@master 2021-10-15 03:12:17 +00:00
GitLab Bot cf98b5d69a Add latest changes from gitlab-org/gitlab@master 2021-07-05 09:07:37 +00:00
GitLab Bot f8975b16d1 Add latest changes from gitlab-org/gitlab@master 2021-07-01 21:08:38 +00:00
GitLab Bot 4c5468b408 Add latest changes from gitlab-org/gitlab@master 2020-06-24 15:08:50 +00:00
GitLab Bot 808c799a67 Add latest changes from gitlab-org/gitlab@master 2020-05-22 12:08:15 +00:00
GitLab Bot 40cdcdd45b Add latest changes from gitlab-org/gitlab@master 2020-05-18 18:08:22 +00:00
GitLab Bot c74b7b5e43 Add latest changes from gitlab-org/gitlab@master 2020-04-28 12:09:44 +00:00
GitLab Bot d466ee5042 Add latest changes from gitlab-org/gitlab@master 2020-02-13 21:08:59 +00:00
GitLab Bot 208e2e308c Add latest changes from gitlab-org/gitlab@master 2020-02-02 06:08:56 +00:00
GitLab Bot 600ca97812 Add latest changes from gitlab-org/gitlab@master 2020-01-15 21:08:48 +00:00
GitLab Bot 759cd6c298 Add latest changes from gitlab-org/gitlab@master 2019-09-26 09:06:04 +00:00
Igor db68003e8b Memoize old_blob and new_blob to improve performance 2019-03-28 12:11:37 +00:00
Mark Chao 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
Douwe Maan 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
Andrew Newdigate 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
Phil Hughes 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
Natalia Tepluhina 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
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
Oswaldo Ferreira 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
Nick Thomas 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
Oswaldo Ferreira ed3034bbb7 Allow suggesting single line changes in diffs 2018-12-13 19:17:19 +00:00
Sean Nichols 05dcb2dd76 Display empty files properly on MR diffs 2018-12-11 23:49:04 -05:00
Douwe Maan 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
Oswaldo Ferreira f9b4130bb7 Comment on any expanded diff line on MRs 2018-11-09 16:56:48 -02:00
Oswaldo Ferreira 198402b38b Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'" 
This reverts commit a82a595728, reversing
changes made to e7df959b8f.
 2018-11-07 19:57:26 -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
Oswaldo Ferreira ec66ef1b74 Comment on any expanded diff line on MRs 2018-11-06 17:39:31 -02:00
Oswaldo Ferreira 5dce096cf8 Use standalone diff stats RPC on every comparison view 2018-09-19 12:26:28 +00:00