Commit graph

19 commits

Author SHA1 Message Date
GitLab Bot
09093c1278 Add latest changes from gitlab-org/gitlab@master 2020-04-15 18:09:36 +00:00
gfyoung
50abbd3e53 Enable frozen string in app/models/*.rb
Partially addresses #47424.
2018-07-26 16:55:41 -07:00
Jarka Kadlecová
c1ea4afad7 Fix links to old commits in merge requests 2017-12-29 14:44:39 +01:00
Micaël Bergeron
a794b161cd rework the merge_request_version_params to use Object#tap 2017-12-18 12:02:45 -05:00
Micaël Bergeron
c77083a493 fix the commit diff discussion sending the wrong url
it should now send you to the merge request diff path scoped to the commit.
2017-12-18 10:21:33 -05:00
Douwe Maan
e4eba908cd Allow commenting on individual commits inside an MR 2017-12-07 09:01:19 -05:00
Felipe Artur
b54203f0ad Commenting on image diffs 2017-10-07 04:25:17 +00:00
Douwe Maan
09838ac626 Update diff discussion position per discussion instead of per note 2017-05-31 14:34:56 -05:00
Douwe Maan
ab91f76e8b Add system note with link to diff comparison when MR discussion becomes outdated 2017-05-23 16:27:30 -05:00
Rémy Coutable
3db37e0562 Enable the Style/TrailingCommaInArguments cop
Use the EnforcedStyleForMultiline: no_comma option.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-05-10 18:25:45 +02:00
Douwe Maan
f8fabfcc6f Allow commenting on older versions of the diff and comparisons between diff versions 2017-05-03 14:47:21 -05:00
Douwe Maan
b202b42cfe Link to outdated diff in older MR version from outdated diff discussion 2017-04-08 14:37:46 -05:00
Douwe Maan
cc656a1199 Refactor resolvability checks based on type 2017-04-06 10:51:45 -05:00
Douwe Maan
c319f21141
Address review comments 2017-04-05 17:44:14 +01:00
Douwe Maan
21e10888c3
Address review comments 2017-04-05 17:44:14 +01:00
Douwe Maan
bb8cc94668
Don't use original_discussion_id 2017-04-05 17:44:14 +01:00
Douwe Maan
2058e71e63
Extract commonalities between DiffDiscussion and LegacyDiffDiscussion 2017-04-05 17:44:14 +01:00
Douwe Maan
f6f6aaf593
Better notification emails for notes and (diff) discussions 2017-04-05 17:44:14 +01:00
Douwe Maan
08bbb9fce6
Add option to start a new discussion on an MR 2017-04-05 17:44:14 +01:00