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

161 Commits

Author SHA1 Message Date
GitLab Bot cd3e2c7b93 Add latest changes from gitlab-org/gitlab@master 2020-02-19 12:09:13 +00:00
GitLab Bot eb1f5a3e08 Add latest changes from gitlab-org/gitlab@master 2020-02-17 18:09:00 +00:00
GitLab Bot e144369009 Add latest changes from gitlab-org/gitlab@master 2020-02-14 00:09:07 +00:00
GitLab Bot d466ee5042 Add latest changes from gitlab-org/gitlab@master 2020-02-13 21:08:59 +00:00
GitLab Bot d87918510a Add latest changes from gitlab-org/gitlab@master 2020-02-06 09:09:06 +00:00
GitLab Bot ca05512007 Add latest changes from gitlab-org/gitlab@master 2020-02-04 18:08:50 +00:00
GitLab Bot 6b833f1e03 Add latest changes from gitlab-org/gitlab@master 2020-02-04 15:08:40 +00:00
GitLab Bot 208e2e308c Add latest changes from gitlab-org/gitlab@master 2020-02-02 06:08:56 +00:00
GitLab Bot d0356412df Add latest changes from gitlab-org/gitlab@master 2020-02-01 03:09:04 +00:00
GitLab Bot 1d388ed855 Add latest changes from gitlab-org/gitlab@master 2020-01-30 03:08:50 +00:00
GitLab Bot 6315ed9630 Add latest changes from gitlab-org/gitlab@master 2020-01-28 18:08:35 +00:00
GitLab Bot 600ca97812 Add latest changes from gitlab-org/gitlab@master 2020-01-15 21:08:48 +00:00
GitLab Bot d10a462fed Add latest changes from gitlab-org/gitlab@master 2019-12-16 12:07:43 +00:00
GitLab Bot 8cc5f27909 Add latest changes from gitlab-org/gitlab@master 2019-12-13 12:07:41 +00:00
GitLab Bot 784fae4b9d Add latest changes from gitlab-org/gitlab@master 2019-12-12 12:07:33 +00:00
GitLab Bot 4eea104c69 Add latest changes from gitlab-org/gitlab@master 2019-12-11 15:07:38 +00:00
GitLab Bot 115c8ea7af Add latest changes from gitlab-org/gitlab@master 2019-12-10 18:08:04 +00:00
GitLab Bot 93c6764dac Add latest changes from gitlab-org/gitlab@master 2019-12-09 12:07:58 +00:00
GitLab Bot 4e375367b7 Add latest changes from gitlab-org/gitlab@master 2019-12-07 00:07:51 +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 8e45d25f7d Add latest changes from gitlab-org/gitlab@master 2019-10-16 18:08:01 +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
GitLab Bot c792263edf Add latest changes from gitlab-org/gitlab@master 2019-09-23 18:06:14 +00:00
Thong Kuah 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
Patrick Bajao 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
Patrick Bajao 3d701a7ccc Don't show image diff note on text file 2019-07-01 17:57:41 +08:00
Bob Van Landuyt 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
Thong Kuah 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
Oswaldo Ferreira e540c0d71e Fixed test specs 
- added suggestions to mock data
- fixed props to be not required
 2019-04-04 13:08:34 +00:00
Oswaldo Ferreira 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
Douwe Maan 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
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
Oswaldo Ferreira 08f789736e Implement suggestion diff lines parser 2019-03-18 13:21:13 -03: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
Rémy Coutable 3a2abc1d50
Enable the Layout/ExtraSpacing cop 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2019-01-24 13:05:45 +01:00
Oswaldo Ferreira 8303eb8a9e Adjusts duplicated line when commenting on unfolded diff lines 2019-01-08 12:45:19 -02: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
Sean Nichols ece6df18f8 Fix redundant returns in spec file 2018-12-13 02:24:31 -05:00
Sean Nichols 4d2448e03a Add tests and move empty file message into own component 2018-12-13 01:49:32 -05:00
Oswaldo Ferreira 89a676019c Avoid 500's when serializing legacy diff notes 2018-12-04 13:13:22 -02:00
Sean McGivern 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
Takuya Noguchi e902f462c2 Eliminate duplicated words 
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
 2018-11-22 01:01:23 +09:00
Zeger-Jan van de Weg 16346eb5b9 Revert "Merge branch 'revert-e2aa2177' into 'master'" 
This reverts merge request !23229
 2018-11-20 12:29:56 +00:00
Sean McGivern 2742b871fe Revert "Merge branch 'zj-improve-gitaly-pb' into 'master'" 
This reverts merge request !23140
 2018-11-20 10:36:52 +00:00
Zeger-Jan van de Weg 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
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
Douwe Maan 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