Commit Graph

190 Commits

Author SHA1 Message Date
GitLab Bot 806b829e76 Add latest changes from gitlab-org/gitlab@master 2021-05-06 03:10:25 +00:00
GitLab Bot c5e4f06c59 Add latest changes from gitlab-org/gitlab@master 2021-04-29 15:10:07 +00:00
GitLab Bot b4e854a900 Add latest changes from gitlab-org/gitlab@master 2021-02-16 15:09:50 +00:00
GitLab Bot 874d5e8019 Add latest changes from gitlab-org/gitlab@master 2021-01-27 18:09:08 +00:00
GitLab Bot a79324ad1f Add latest changes from gitlab-org/gitlab@master 2020-12-15 09:10:00 +00:00
GitLab Bot f68b31bd2c Add latest changes from gitlab-org/gitlab@master 2020-12-15 00:10:07 +00:00
GitLab Bot 376ae6f3b3 Add latest changes from gitlab-org/gitlab@master 2020-10-19 21:09:06 +00:00
GitLab Bot 1086ac5177 Add latest changes from gitlab-org/gitlab@master 2020-09-22 09:09:43 +00:00
GitLab Bot b85aae44f9 Add latest changes from gitlab-org/gitlab@master 2020-09-21 15:09:44 +00:00
GitLab Bot 5ec9ab0e8c Add latest changes from gitlab-org/gitlab@master 2020-09-10 21:08:28 +00:00
GitLab Bot ff579119e2 Add latest changes from gitlab-org/gitlab@master 2020-08-26 12:10:53 +00:00
GitLab Bot 85f7fa54f4 Add latest changes from gitlab-org/gitlab@master 2020-08-18 18:10:10 +00:00
GitLab Bot 6df7943512 Add latest changes from gitlab-org/gitlab@master 2020-08-13 15:10:03 +00:00
GitLab Bot 90156f527b Add latest changes from gitlab-org/gitlab@master 2020-08-12 06:09:53 +00:00
GitLab Bot 37419c44f0 Add latest changes from gitlab-org/gitlab@master 2020-08-06 18:09:41 +00:00
GitLab Bot 631ed6dcca Add latest changes from gitlab-org/gitlab@master 2020-08-06 00:09:53 +00:00
GitLab Bot e49bd57279 Add latest changes from gitlab-org/gitlab@master 2020-07-07 21:09:13 +00:00
GitLab Bot e173695d9b Add latest changes from gitlab-org/gitlab@master 2020-07-03 21:09:31 +00:00
GitLab Bot 86e1f47cd1 Add latest changes from gitlab-org/gitlab@master 2020-06-05 15:08:23 +00:00
GitLab Bot f35a7a3b8e Add latest changes from gitlab-org/gitlab@master 2020-05-07 15:09:29 +00:00
GitLab Bot 5f0e3773e9 Add latest changes from gitlab-org/gitlab@master 2020-05-06 21:10:00 +00:00
GitLab Bot e33f87ac0f Add latest changes from gitlab-org/gitlab@master 2020-04-21 15:21:10 +00:00
GitLab Bot 68f1860e6f Add latest changes from gitlab-org/gitlab@master 2020-03-20 21:09:17 +00:00
GitLab Bot 996d54a81d Add latest changes from gitlab-org/gitlab@master 2020-03-07 18:08:21 +00:00
GitLab Bot 23288f62da Add latest changes from gitlab-org/gitlab@master 2020-01-29 15:08:59 +00:00
GitLab Bot 85e494935a Add latest changes from gitlab-org/gitlab@master 2020-01-14 15:07:55 +00:00
GitLab Bot 4eea104c69 Add latest changes from gitlab-org/gitlab@master 2019-12-11 15:07:38 +00:00
GitLab Bot 8d3aee3636 Add latest changes from gitlab-org/gitlab@master 2019-12-04 15:11:23 +00:00
GitLab Bot 3269a20692 Add latest changes from gitlab-org/gitlab@master 2019-11-27 12:06:30 +00:00
GitLab Bot 0ecdcf59f4 Add latest changes from gitlab-org/gitlab@master 2019-11-20 03:06:28 +00:00
GitLab Bot 6e81d7f628 Add latest changes from gitlab-org/gitlab@master 2019-11-15 15:06:12 +00:00
GitLab Bot d8c06be498 Add latest changes from gitlab-org/gitlab@master 2019-11-14 12:06:30 +00:00
GitLab Bot 25989ab7ef Add latest changes from gitlab-org/gitlab@master 2019-10-18 11:11:44 +00:00
GitLab Bot 6b75320f52 Add latest changes from gitlab-org/gitlab@master 2019-10-17 12:07:33 +00:00
GitLab Bot f607152a08 Add latest changes from gitlab-org/gitlab@master 2019-10-10 21:06:01 +00:00
GitLab Bot 4b28d5ae77 Add latest changes from gitlab-org/gitlab@master 2019-10-09 21:06:24 +00:00
GitLab Bot 80f61b4035 Add latest changes from gitlab-org/gitlab@master 2019-09-18 14:02:45 +00:00
Pavel Shutsin f089a23015 Backport EE changes for productivity analytics
Improve diff lines count efficiency
2019-09-04 13:01:55 +03:00
dineshpanda fa6f19d1f8 Remove dependency on IgnorableColumn concern 2019-08-30 02:09:13 +05:30
Pavel Shutsin 5b70ffcf14 Add MergeRequestDiff#lines_count convenience method 2019-08-06 11:38:50 +03:00
Nick Thomas 8973f32d42
Remove cleaned up OIDs from database and cache 2019-05-06 11:35:03 +01:00
Heinrich Lee Yu fc22626f45 Remove deprecated uses of attribute_changed?
Prepares us for upgrade to Rails 5.2
2019-04-30 15:24:25 +08:00
Kamil Trzciński 650f40865e Forbid the use of `#reload` and prefer `#reset`
The `#reload` makes to load all objects into memory,
and the main purpose of `#reload` is to drop the association cache.

The `#reset` seems to solve exactly that case.
2019-04-15 13:05:14 +02:00
Nick Thomas 013f7cd24c
Inherit from ApplicationRecord instead of ActiveRecord::Base 2019-03-28 16:18:23 +00:00
Nick Thomas 0e831b0b69
Allow external diffs to be used conditionally
Since external diffs are likely to be a bit slower than in-database
ones, add a mode that makes diffs external after they've been obsoleted
by events. This should strike a balance between performance and disk
space.

A background cron drives the majority of migrations, since diffs become
outdated through user actions.
2019-03-27 16:51:33 +00:00
Stan Hu 6552197eec Fix error creating a merge request when diff includes a null byte
If a diff happened to include a single null byte anywhere, insertion
into the database would fail with an Error 500 since the column is text
and not a byte array. To fix this, we mark the diff as binary if we
detect a single null byte and Base64-encode it.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57710
2019-03-14 12:55:45 -07:00
Nick Thomas 9f05e97aad
Run rubocop -a 2019-03-13 13:42:43 +00:00
Francisco Javier López ebf16ada85 Arbitrary file read via MergeRequestDiff 2019-03-04 18:36:34 +00:00
Nick Thomas a6891eb8ec
Remove two ignored columns 2019-02-14 14:30:47 +00:00
Nick Thomas f9e41d0d85
Allow MR diffs to be placed into an object store 2019-02-05 14:12:48 +00:00