93c6764dac
Add latest changes from gitlab-org/gitlab@master
2019-12-09 12:07:58 +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
eac0da9a47
Add latest changes from gitlab-org/gitlab@master
2019-11-29 15:06:43 +00:00
68d3f33d51
Add latest changes from gitlab-org/gitlab@master
2019-11-26 15:06:50 +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
759cd6c298
Add latest changes from gitlab-org/gitlab@master
2019-09-26 09:06:04 +00:00
c792263edf
Add latest changes from gitlab-org/gitlab@master
2019-09-23 18:06:14 +00:00
80f61b4035
Add latest changes from gitlab-org/gitlab@master
2019-09-18 14:02:45 +00:00
aef0d81792
Fixing #65389
...
Wrong format on MS Teams integration push events with multi line commit messages
2019-09-02 10:43:54 +00: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
fb3d40cb61
Extend #parse to accept a suggestions_filter_enabled param
...
This will allow the front end to specify the behavior as needed.
2019-06-05 16:19:45 -07:00
c92db3db71
Fix removing empty lines via suggestions
...
Before this fix, a suggestion which just removes
an empty line wasn't appliable
2019-05-28 07:12:29 +00:00
db68003e8b
Memoize old_blob and new_blob to improve performance
2019-03-28 12:11:37 +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
53a5960496
Implement multi-line suggestions filtering
...
Implements the filtering logic for
`suggestion:-x+y` syntax.
2019-03-20 11:30:24 -03:00
08f789736e
Implement suggestion diff lines parser
2019-03-18 13:21:13 -03:00
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
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
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
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
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
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
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
ed3034bbb7
Allow suggesting single line changes in diffs
2018-12-13 19:17:19 +00:00
05dcb2dd76
Display empty files properly on MR diffs
2018-12-11 23:49:04 -05:00
89a676019c
Avoid 500's when serializing legacy diff notes
2018-12-04 13:13:22 -02:00
4b7e9eaacd
Treat Repository instances with the same disk path as the same hash key
2018-11-26 11:15:18 +01:00
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
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
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
1bc0e9e3c5
Apply additional guard-clauses for unfold_required?
2018-11-06 17:59:09 -02:00
ec66ef1b74
Comment on any expanded diff line on MRs
2018-11-06 17:39:31 -02:00
c0d30fad97
Merge branch 'sh-optimize-reload-diffs-service' into 'master'
...
Significantly cut memory and SQL queries when reloading diffs
See merge request gitlab-org/gitlab-ce!22725
2018-11-02 10:09:50 +00:00
de1db4972c
Avoidp loading merge request diff files when not needed
2018-11-01 07:50:39 -07:00
7f47e13218
Merge branch 'gt-update-typos-in-comments-and-specs' into 'master'
...
Fix typos in comments and specs
See merge request gitlab-org/gitlab-ce!22683
2018-11-01 10:34:23 +00:00
733ae94921
Fix typos in comments and specs
2018-11-01 08:59:20 +02:00
39ae9a59a5
Make Highlight accept language param
...
This replaces the repository param.
This allows more flexiblity as sometimes we have highlight content
not related to repository. Sometimes we know ahead of time the language
of the content. Lastly language determination seems better fit as a
logic in the Blob class.
`repository` param is only used to determine the language, which seems
to be the responsiblity of Blob.
2018-10-30 15:44:55 +08: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
GitLab Bot
Massimeddu Cireddu
Patrick Bajao
Bob Van Landuyt
Kerri Miller
Igor
Oswaldo Ferreira
Douwe Maan
Mark Chao
Andrew Newdigate
Phil Hughes
Natalia Tepluhina
Francisco Javier López
Nick Thomas
Sean Nichols
Douwe Maan
gfyoung
Sean McGivern
Stan Hu
Achilleas Pipinellis
George Tsiolis