bac22cf644
Add latest changes from gitlab-org/gitlab@master
2024-09-19 09:12:22 +00:00
852aade153
Add latest changes from gitlab-org/gitlab@master
2024-05-24 09:18:22 +00:00
72026950b2
Add latest changes from gitlab-org/gitlab@master
2024-04-08 09:09:32 +00:00
4dcdd5bebb
Add latest changes from gitlab-org/gitlab@master
2024-01-24 06:07:44 +00:00
a29eae68f4
Add latest changes from gitlab-org/gitlab@master
2024-01-15 15:08:13 +00:00
24ed1c84da
Add latest changes from gitlab-org/gitlab@master
2023-11-01 03:10:42 +00:00
d4b2ad25a5
Add latest changes from gitlab-org/gitlab@master
2023-01-09 21:08:39 +00:00
8915297703
Add latest changes from gitlab-org/gitlab@master
2022-12-28 18:07:22 +00:00
787981be19
Add latest changes from gitlab-org/gitlab@master
2022-11-28 06:10:35 +00:00
01ef10900a
Add latest changes from gitlab-org/gitlab@master
2021-07-15 06:09:39 +00:00
f8975b16d1
Add latest changes from gitlab-org/gitlab@master
2021-07-01 21:08:38 +00:00
79659fe1fe
Add latest changes from gitlab-org/gitlab@master
2021-06-28 09:08:19 +00:00
6047d21a89
Add latest changes from gitlab-org/gitlab@master
2021-06-28 06:07:45 +00:00
cb0a625459
Add latest changes from gitlab-org/gitlab@master
2021-06-18 21:10:06 +00:00
a79324ad1f
Add latest changes from gitlab-org/gitlab@master
2020-12-15 09:10:00 +00:00
f68b31bd2c
Add latest changes from gitlab-org/gitlab@master
2020-12-15 00:10:07 +00:00
a2f16969fa
Add latest changes from gitlab-org/gitlab@master
2020-12-04 06:09:34 +00:00
a27b8a5c10
Add latest changes from gitlab-org/gitlab@master
2020-10-01 12:10:14 +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
6315ed9630
Add latest changes from gitlab-org/gitlab@master
2020-01-28 18:08:35 +00:00
4e375367b7
Add latest changes from gitlab-org/gitlab@master
2019-12-07 00:07:51 +00:00
2349eabc1a
Add latest changes from gitlab-org/gitlab@master
2019-12-06 00:07:48 +00:00
98420be3dd
Add latest changes from gitlab-org/gitlab@master
2019-12-04 12:07:12 +00:00
4b28d5ae77
Add latest changes from gitlab-org/gitlab@master
2019-10-09 21:06:24 +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
4ec16912b8
Autocorrect with RSpec/ExampleWording cop
...
- rewords examples starting with 'should'
- rewords examples starting with 'it'
Note: I had to manually fixup "onlies" to "only"
2019-04-05 08:43:27 +00:00
89a676019c
Avoid 500's when serializing legacy diff notes
2018-12-04 13:13:22 -02:00
16346eb5b9
Revert "Merge branch 'revert-e2aa2177' into 'master'"
...
This reverts merge request !23229
2018-11-20 12:29:56 +00:00
2742b871fe
Revert "Merge branch 'zj-improve-gitaly-pb' into 'master'"
...
This reverts merge request !23140
2018-11-20 10:36:52 +00:00
4ca5eadddb
Remove duplicate tests for Gitaly
...
The disabling of Gitaly was basically stubbing `Feature.enabled?` call,
which was never triggered.
2018-11-19 14:40:53 +01:00
5dce096cf8
Use standalone diff stats RPC on every comparison view
2018-09-19 12:26:28 +00:00
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
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
c2b7147c2f
Fix error 500 when viewing commit and merge request diffs
...
Due to the refactoring in !16082 , `Blob#batch` no longer falls back
to a default `blob_size_limit`. Since `Repository#batch_blobs` was using
a default `nil` value, this would cause issues in the `Blob#find_by_rugged`
method.
This fix here is to be consistent and use a non-nil default value in
`Repository#batch_blobs`.
The problem was masked in development and tests because Gitaly is always
enabled by default for all features.
Closes #41735
2018-01-07 04:49:07 -08:00
ffbbd4112e
Move diffable? method from Repository to Diff::File
2017-06-08 09:32:57 -05:00
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
f5d7a61760
Fixes ActionView::Template::Error: undefined method `text?` for nil:NilClass
2016-12-02 14:03:30 +02:00
847ada36c4
Fix: Timeout creating and viewing merge request for binary file
2016-11-25 15:25:01 +02:00
GitLab Bot
Thong Kuah
Oswaldo Ferreira
Zeger-Jan van de Weg
Sean McGivern
Jan Provaznik
Stan Hu
Douwe Maan
Valery Sizov