a812ed8f41
Add latest changes from gitlab-org/gitlab@master
2025-06-21 09:11:09 +00:00
0c84203069
Add latest changes from gitlab-org/gitlab@master
2025-06-10 18:11:48 +00:00
074caf94a9
Add latest changes from gitlab-org/gitlab@master
2025-05-22 00:13:47 +00:00
59053c8109
Add latest changes from gitlab-org/gitlab@master
2025-04-16 06:13:29 +00:00
979f91ad68
Add latest changes from gitlab-org/gitlab@master
2025-01-08 09:30:17 +00:00
a50b8cefe8
Add latest changes from gitlab-org/gitlab@master
2024-12-16 05:01:35 +00:00
4a0d7f33e1
Add latest changes from gitlab-org/gitlab@master
2024-12-09 00:31:17 +00:00
00a46ce6b4
Add latest changes from gitlab-org/gitlab@master
2024-10-23 03:15:27 +00:00
ddcef959ce
Add latest changes from gitlab-org/gitlab@master
2024-09-27 12:16:01 +00:00
755df8c847
Add latest changes from gitlab-org/gitlab@master
2024-08-07 15:08:06 +00:00
36ab26efd2
Add latest changes from gitlab-org/gitlab@master
2024-05-22 21:19:41 +00:00
5b2beecd98
Add latest changes from gitlab-org/gitlab@master
2024-05-09 18:13:23 +00:00
eb6a6af0ae
Add latest changes from gitlab-org/gitlab@master
2024-02-19 15:11:18 +00:00
fdc2b6184d
Add latest changes from gitlab-org/gitlab@master
2023-12-12 03:16:05 +00:00
3396d8eca0
Add latest changes from gitlab-org/gitlab@master
2023-11-29 09:13:36 +00:00
f011d78ffe
Add latest changes from gitlab-org/gitlab@master
2023-09-06 18:09:15 +00:00
95b9a603c3
Add latest changes from gitlab-org/gitlab@master
2022-02-22 15:18:06 +00:00
0c51dc19cb
Add latest changes from gitlab-org/gitlab@master
2021-08-20 06:11:03 +00:00
8f534e1e96
Add latest changes from gitlab-org/gitlab@master
2021-01-14 21:10:37 +00:00
5c2568f176
Add latest changes from gitlab-org/gitlab@master
2020-11-23 21:09:19 +00:00
8132e39e1b
Add latest changes from gitlab-org/gitlab@master
2020-11-23 09:09:13 +00:00
908a54b624
Add latest changes from gitlab-org/gitlab@master
2020-06-05 21:08:27 +00:00
2fa68d3a97
Add latest changes from gitlab-org/gitlab@master
2020-05-04 06:10:10 +00:00
eb1f5a3e08
Add latest changes from gitlab-org/gitlab@master
2020-02-17 18:09:00 +00:00
79d62647bc
Add latest changes from gitlab-org/gitlab@master
2019-12-18 12:07:48 +00:00
8d3aee3636
Add latest changes from gitlab-org/gitlab@master
2019-12-04 15:11:23 +00:00
a048261403
Add latest changes from gitlab-org/gitlab@master
2019-11-21 09:06:16 +00:00
c792263edf
Add latest changes from gitlab-org/gitlab@master
2019-09-23 18:06:14 +00:00
84727c8209
Add latest changes from gitlab-org/gitlab@master
2019-09-16 15:06:26 +00:00
b7dfe2ae40
Add latest changes from gitlab-org/gitlab@master
2019-09-13 13:26:31 +00:00
70626f324b
Make diff_refs_match_commit validation reusable
...
Move it to DiffPositionableNote concern which will be re-used
in EE in DraftNote model.
2019-08-01 16:00:36 -05:00
f44eba8c0e
Lock suggestions_filter_enabled as true
...
Most/all of the work we're doing in this method is done at creation/edit
time, so do we need to also check at render? Assume if you've gotten to
this point, it's ok to enable the suggestion filter.
2019-06-05 12:09:00 -07:00
5a89bcc4da
Avoid 500's when commit is not reachable
2019-06-05 08:38:09 -03:00
7412e2fa74
Get `repository` from noteable in DiffNotes
...
Getting the `repository` directly from the noteable in DiffNotes
allows us to use a different repository when the DiffNote is not
on a project repository.
It is only the first step in decoupling the DiffNote from a project's
main repository.
2019-06-03 16:42:49 +02:00
4504959aa6
Make `resolvable_types` a class method
...
This turns Notable::RESOLVABLE_TYPES into a
`Notable.resolvable_types`. That allows us to override it in EE.
2019-06-03 16:41:05 +02: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
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
GitLab Bot
Patrick Bajao
Kerri Miller
Oswaldo Ferreira
Bob Van Landuyt
Douwe Maan
Sean McGivern
Mario de la Ossa
Michael Kozono
gfyoung