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
53a5960496
Implement multi-line suggestions filtering
...
Implements the filtering logic for
`suggestion:-x+y` syntax.
2019-03-20 11:30:24 -03:00
6fc010bb39
Use shorthand version of method call
2019-02-26 17:19:18 -03:00
e116fcab41
Always fetch MR latest version when creating suggestions
...
This is an issue that can only be seen through EE. Further
details can be seen on
https://gitlab.com/gitlab-org/gitlab-ee/issues/9876 . In general
we should always use the latest diff version of a file in order
to both create and apply suggestions.
2019-02-26 17:19:17 -03:00
ed3034bbb7
Allow suggesting single line changes in diffs
2018-12-13 19:17:19 +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
ec66ef1b74
Comment on any expanded diff line on MRs
2018-11-06 17:39:31 -02:00
93d0bacfe5
Remove EE-specific code from DiscussionNote
2018-10-26 14:23:58 +01:00
d7fa6679cb
Backport CE changes from draft_notes addition in EE
2018-10-04 15:45:00 -06:00
5dce096cf8
Use standalone diff stats RPC on every comparison view
2018-09-19 12:26:28 +00:00
a9c4dec537
Backport Repository#keep_around changes from EE to CE
2018-08-27 16:10:27 +02:00
50abbd3e53
Enable frozen string in app/models/*.rb
...
Partially addresses #47424 .
2018-07-26 16:55:41 -07:00
bb8f2520b4
Persist truncated note diffs on a new table
...
We request Gitaly in a N+1 manner to build discussion diffs. Once the diffs are from different revisions, it's hard to make a single request to the service in order to build the whole response.
With this change we solve this problem and simplify a lot fetching this piece of info.
2018-05-24 15:34:43 -03:00
be8a320bd8
Use persisted diff data instead fetching Git on discussions
...
Today, when fetching diffs of a note, we always go to Gitaly in order to diff between commits and return the diff of each discussion note. With this change we avoid doing that for notes on the "current version" of the MR.
2018-04-30 20:07:21 -03:00
771bf9527f
Improve performance of DiffDiscussion#truncated_diff_lines and DiffNote#diff_line by removing expensive diff position calculation and comparison
2017-12-22 18:07:15 +01:00
e4eba908cd
Allow commenting on individual commits inside an MR
2017-12-07 09:01:19 -05:00
aefefbf117
Prevents position update for image diff notes
2017-11-13 16:40:54 -02:00
b54203f0ad
Commenting on image diffs
2017-10-07 04:25:17 +00:00
e1a3bf30b6
Rename ActiverecordSerialize cop
...
This cop has been renamed to ActiveRecordSerialize to match the way
"ActiveRecord" is usually written.
2017-07-06 12:01:36 +02:00
0218a0bd23
Merge branch 'dm-update-discussion-diff-position' into 'master'
...
Update diff discussion position per discussion instead of per note
Closes #33157
See merge request !11833
2017-06-01 14:00:00 +00:00
09838ac626
Update diff discussion position per discussion instead of per note
2017-05-31 14:34:56 -05:00
cd74c1434e
Added Cop to blacklist the use of serialize
...
This Cop blacklists the use of ActiveRecord's "serialize" method, except
for cases where we already use this.
2017-05-31 14:03:37 +02:00
8e2fefc6c4
Merge branch 'dm-diff-cleanup' into 'master'
...
Clean up diff rendering
See merge request !11390
2017-05-25 22:15:57 +00:00
ab91f76e8b
Add system note with link to diff comparison when MR discussion becomes outdated
2017-05-23 16:27:30 -05:00
7c479d88a9
Pass fallback_diff_refs to Diff::File instead of using view helpers
2017-05-23 15:37:05 -05:00
f8fabfcc6f
Allow commenting on older versions of the diff and comparisons between diff versions
2017-05-03 14:47:21 -05:00
b202b42cfe
Link to outdated diff in older MR version from outdated diff discussion
2017-04-08 14:37:46 -05:00
cc656a1199
Refactor resolvability checks based on type
2017-04-06 10:51:45 -05:00
21e10888c3
Address review comments
2017-04-05 17:44:14 +01:00
bb8cc94668
Don't use original_discussion_id
2017-04-05 17:44:14 +01:00
2058e71e63
Extract commonalities between DiffDiscussion and LegacyDiffDiscussion
2017-04-05 17:44:14 +01:00
79889a6aa3
Add specs
2017-04-05 17:44:14 +01:00
08bbb9fce6
Add option to start a new discussion on an MR
2017-04-05 17:44:14 +01:00
7d4b52b27d
Enable Style/WordArray
2017-02-23 09:32:41 -06:00
ea155ccc3e
Optimize discussion notes resolving and unresolving
...
Use `update_all` to only require one query per discussion to
update the notes resolved status. Some changes had to be made to
the discussion spec to accout for the fact that notes are not
individually updated now
2016-09-06 12:14:09 -03:00
9b57ad382e
Move #to_discussion to NoteOnDiff
2016-08-30 16:30:42 +01:00
d741303a59
Call `set_discussion_id` again in DiffNote `before_validation` because the order is important
2016-08-19 18:24:12 -05:00
080924f979
Fix bug where notes weren’t shown in discussion when the code had changed after creation
2016-08-19 12:38:40 -05:00
6a355d451e
Improve performance of MR show page
2016-08-18 19:08:59 -05:00
2df34c20cb
Fix a lingering conflict.
2016-08-17 12:29:05 -06:00
d8654744cd
Merge branch 'master' into diff-line-comment-vuejs
2016-08-17 12:10:09 -06:00
4a13aa9f34
Store discussion_id on Note for faster discussion lookup.
2016-08-17 12:16:46 -05:00
41007f6d3c
Address review feedback
2016-08-16 11:04:26 -05:00
427e724698
Don't allow resolving invalid conflicts
...
An MR can only be resolved in the UI if:
- It has conflicts.
- It has valid diff_refs (in other words, it supports new diff notes).
- It has no conflicts with one side missing.
- It has no conflicts in binary files.
- It has no conflicts in files too large to display.
- It has no conflicts containing invalid conflict markers.
2016-08-12 23:24:48 +03:00
c80f5e0a1c
Add specs for new Note and DiffNote methods.
2016-08-12 00:16:38 -05:00
538e66d71c
Merge branch 'master' into diff-line-comment-vuejs
...
# Conflicts:
# app/models/discussion.rb
# db/schema.rb
2016-08-03 15:32:00 -07:00
8716ff7f63
Speedup DiffNote#active? on discussions, preloading noteables and avoid touching git repository to return diff_refs when possible
...
- Preloading noteable we share the same noteable instance when more than one
discussion refers to the same noteable.
- Any other call to that object that is cached in that object will be for any
discussion.
- In those cases where merge_request_diff has all the sha stored to build a diff_refs get that
diff_refs using directly those sha instead accessing to the git repository to first get the
commits and later the sha.
2016-08-02 16:04:15 +02:00
1c2eefef3f
Backend tweaks
2016-07-28 20:09:36 -06:00
Oswaldo Ferreira
Douwe Maan
Sean McGivern
Mario de la Ossa
Michael Kozono
gfyoung
Douwe Maan
Felipe Artur
Felipe Artur
Yorick Peterse
Grzegorz Bizon
Robert Speicher
Alejandro Rodríguez
Connor Shea
Paco Guzman