46aea02972
Add latest changes from gitlab-org/gitlab@master
2021-06-16 00:10:15 +00:00
25db9c1230
Add latest changes from gitlab-org/gitlab@master
2021-05-06 12:10:38 +00:00
c9bef85d79
Add latest changes from gitlab-org/gitlab@master
2021-04-19 21:09:27 +00:00
4f31109a95
Add latest changes from gitlab-org/gitlab@master
2021-03-23 03:09:04 +00:00
4d16568658
Add latest changes from gitlab-org/gitlab@master
2021-03-18 06:11:52 +00:00
099333e261
Add latest changes from gitlab-org/gitlab@master
2021-03-18 00:08:58 +00:00
9c0f4306f6
Add latest changes from gitlab-org/gitlab@master
2021-03-11 15:09:10 +00:00
5d756f9966
Add latest changes from gitlab-org/gitlab@master
2021-03-10 03:09:10 +00:00
7ff2de7c12
Add latest changes from gitlab-org/gitlab@master
2021-03-05 00:09:24 +00:00
9ecdb93f4e
Add latest changes from gitlab-org/gitlab@master
2021-02-01 12:09:03 +00:00
76215aab04
Add latest changes from gitlab-org/gitlab@master
2021-01-26 00:08:57 +00:00
8f534e1e96
Add latest changes from gitlab-org/gitlab@master
2021-01-14 21:10:37 +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
408af4d5cf
Add latest changes from gitlab-org/gitlab@master
2020-12-02 03:09:38 +00:00
62f486eb35
Add latest changes from gitlab-org/gitlab@master
2020-10-02 15:08:13 +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
895ab10efa
Add latest changes from gitlab-org/gitlab@master
2020-08-10 09:09:54 +00:00
f9d0e89611
Add latest changes from gitlab-org/gitlab@master
2020-08-05 18:09:49 +00:00
5da8649911
Add latest changes from gitlab-org/gitlab@master
2020-08-04 03:09:50 +00:00
ed00b1a6a3
Add latest changes from gitlab-org/gitlab@master
2020-07-28 12:09:49 +00:00
2f47b6d8e1
Add latest changes from gitlab-org/gitlab@master
2020-06-26 09:08:59 +00:00
c59765a50a
Add latest changes from gitlab-org/gitlab@master
2020-06-24 18:09:03 +00:00
4c5468b408
Add latest changes from gitlab-org/gitlab@master
2020-06-24 15:08:50 +00:00
60082b335c
Add latest changes from gitlab-org/gitlab@master
2020-06-19 21:08:32 +00:00
908a54b624
Add latest changes from gitlab-org/gitlab@master
2020-06-05 21:08:27 +00:00
711f859532
Add latest changes from gitlab-org/gitlab@master
2020-06-01 15:08:16 +00:00
808c799a67
Add latest changes from gitlab-org/gitlab@master
2020-05-22 12:08:15 +00:00
8dc1e72e2b
Add latest changes from gitlab-org/gitlab@master
2020-05-13 00:07:50 +00:00
3795b229ab
Add latest changes from gitlab-org/gitlab@master
2020-05-01 00:09:59 +00:00
c74b7b5e43
Add latest changes from gitlab-org/gitlab@master
2020-04-28 12:09:44 +00:00
e33f87ac0f
Add latest changes from gitlab-org/gitlab@master
2020-04-21 15:21:10 +00:00
513eff6210
Add latest changes from gitlab-org/gitlab@master
2020-04-16 09:09:37 +00:00
87af6f2e05
Add latest changes from gitlab-org/gitlab@master
2020-03-16 21:09:21 +00:00
8d4aaa4dd0
Add latest changes from gitlab-org/gitlab@master
2020-03-16 15:09:27 +00:00
cd3e2c7b93
Add latest changes from gitlab-org/gitlab@master
2020-02-19 12:09:13 +00:00
eb1f5a3e08
Add latest changes from gitlab-org/gitlab@master
2020-02-17 18:09:00 +00:00
e144369009
Add latest changes from gitlab-org/gitlab@master
2020-02-14 00:09:07 +00:00
d466ee5042
Add latest changes from gitlab-org/gitlab@master
2020-02-13 21:08:59 +00:00
d87918510a
Add latest changes from gitlab-org/gitlab@master
2020-02-06 09:09:06 +00:00
ca05512007
Add latest changes from gitlab-org/gitlab@master
2020-02-04 18:08:50 +00:00
6b833f1e03
Add latest changes from gitlab-org/gitlab@master
2020-02-04 15:08:40 +00:00
208e2e308c
Add latest changes from gitlab-org/gitlab@master
2020-02-02 06:08:56 +00:00
d0356412df
Add latest changes from gitlab-org/gitlab@master
2020-02-01 03:09:04 +00:00
1d388ed855
Add latest changes from gitlab-org/gitlab@master
2020-01-30 03:08:50 +00:00
6315ed9630
Add latest changes from gitlab-org/gitlab@master
2020-01-28 18:08:35 +00:00
600ca97812
Add latest changes from gitlab-org/gitlab@master
2020-01-15 21:08:48 +00:00
d10a462fed
Add latest changes from gitlab-org/gitlab@master
2019-12-16 12:07:43 +00:00
8cc5f27909
Add latest changes from gitlab-org/gitlab@master
2019-12-13 12:07:41 +00:00
784fae4b9d
Add latest changes from gitlab-org/gitlab@master
2019-12-12 12:07:33 +00:00
4eea104c69
Add latest changes from gitlab-org/gitlab@master
2019-12-11 15:07:38 +00:00
115c8ea7af
Add latest changes from gitlab-org/gitlab@master
2019-12-10 18:08:04 +00:00
93c6764dac
Add latest changes from gitlab-org/gitlab@master
2019-12-09 12:07:58 +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
8e45d25f7d
Add latest changes from gitlab-org/gitlab@master
2019-10-16 18:08:01 +00:00
308146dc39
Add latest changes from gitlab-org/gitlab@master
2019-10-10 00:06:44 +00:00
4b28d5ae77
Add latest changes from gitlab-org/gitlab@master
2019-10-09 21:06:24 +00:00
c792263edf
Add latest changes from gitlab-org/gitlab@master
2019-09-23 18:06:14 +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
6ef6693e37
Refactor PositionTracer to support different types
...
This is to prepare for supporing image type position tracing
2019-07-05 11:03:47 +00:00
3d701a7ccc
Don't show image diff note on text file
2019-07-01 17:57:41 +08:00
b6ff5f1e14
Expose comments on Noteables in GraphQL
...
This exposes `Note`s on Issues & MergeRequests using a
`Types::Notes::NoteableType` in GraphQL.
Exposing notes on a new type can be done by implementing the
`NoteableType` interface on the type. The presented object should
be a `Noteable`.
2019-06-14 12:36:27 +02: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
e540c0d71e
Fixed test specs
...
- added suggestions to mock data
- fixed props to be not required
2019-04-04 13:08:34 +00:00
03e0604d5d
Prepare suggestion implementation for multi-line
...
Adds the groundwork needed in order to persist multi-line suggestions,
while providing the parsing strategy which will be reused for the
**Preview** as well.
2019-03-27 12:26:53 -03:00
7d3c5d882c
Merge branch '59147-duplicate-match-line' into 'master'
...
Fix duplicated bottom match line
Closes #59147
See merge request gitlab-org/gitlab-ce!26402
2019-03-21 16:43:54 +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
08f789736e
Implement suggestion diff lines parser
2019-03-18 13:21:13 -03: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
3a2abc1d50
Enable the Layout/ExtraSpacing cop
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-01-24 13:05:45 +01:00
8303eb8a9e
Adjusts duplicated line when commenting on unfolded diff lines
2019-01-08 12:45:19 -02: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
ece6df18f8
Fix redundant returns in spec file
2018-12-13 02:24:31 -05:00
4d2448e03a
Add tests and move empty file message into own component
2018-12-13 01:49:32 -05:00
89a676019c
Avoid 500's when serializing legacy diff notes
2018-12-04 13:13:22 -02:00
2bc4a17dec
Merge branch 'revert-fd6e3781' into 'master'
...
Revert "Merge branch 'revert-e2aa2177' into 'master'"
Closes #54267
See merge request gitlab-org/gitlab-ce!23237
2018-11-22 09:50:34 +00:00
e902f462c2
Eliminate duplicated words
...
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2018-11-22 01:01:23 +09: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
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
a82a595728
Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'
...
Comment on any expanded diff line on MRs
See merge request gitlab-org/gitlab-ce!22398
2018-11-07 11:56:46 +00:00
ec66ef1b74
Comment on any expanded diff line on MRs
2018-11-06 17:39:31 -02:00
733ae94921
Fix typos in comments and specs
2018-11-01 08:59:20 +02:00
14ed916cf2
Merge branch '51958-fix-mr-discussion-loading' into 'master'
...
Fix MR discussion not loaded issue
Closes #51958
See merge request gitlab-org/gitlab-ce!21982
2018-10-04 07:37:24 +00:00
c40400ceae
[master] Stored XSS in Gitlab Merge Request from imported repository
2018-10-01 16:44:30 +00:00
f09303b00a
Fix MR discussion not loaded issue
...
Display `formatter` as the sole content of `position` object.
This means `diff_file` data is not referenced, which is the
caseu of "IOError: not opened for reading".
2018-10-01 22:37:43 +08:00
5dce096cf8
Use standalone diff stats RPC on every comparison view
2018-09-19 12:26:28 +00:00
cd1d5b2440
Cache diff highlighting upon Merge Request creation (refactors diff caching)
2018-09-07 10:07:18 -03:00
0d01ac5141
Include rich_text in diff cache keys
...
Previously, this wasn't needed: text was normally set to the highlighted
contents anyway. Now, it is: we store different things in text and rich_text.
This caused https://gitlab.com/gitlab-com/production/issues/439 .
2018-08-28 15:28:47 +01:00
81a403f05f
Escaped html characters
2018-08-21 07:37:33 -07: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
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
f376347f24
Find and mark more Git disk access locations, part 2
2018-06-12 14:33:37 +02: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
GitLab Bot
Thong Kuah
Patrick Bajao
Bob Van Landuyt
Oswaldo Ferreira
Douwe Maan
Mark Chao
Phil Hughes
Rémy Coutable
Francisco Javier López
Sean Nichols
Sean McGivern
Takuya Noguchi
Zeger-Jan van de Weg
George Tsiolis
Chantal Rollison
Jan Provaznik
Jacob Vosmaer