Commit graph

14 commits

Author SHA1 Message Date
Douwe Maan
95f9d6d83b Merge branch 'master' into issue-discussions-refactor
# Conflicts:
#	app/controllers/concerns/notes_actions.rb
#	spec/features/task_lists_spec.rb
#	spec/support/features/issuable_slash_commands_shared_examples.rb
2017-07-31 10:23:50 +02:00
Douwe Maan
76c3d2d434 Add full JSON endpoints for issue notes and discussions 2017-07-21 22:35:24 +03:00
Sean McGivern
1df696f5a6 Move duplicate issue management to a service 2017-07-21 12:53:56 +01: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
blackst0ne
323596f68e Add system note on description change of issue/merge request 2017-05-04 12:58:41 +11:00
Annabel Dunstone Gray
c025a0ebcb Update MR title change icon 2017-04-07 16:00:15 -05:00
Annabel Dunstone Gray
31672df34e Fix icon name error 2017-04-06 19:22:33 -04:00
Annabel Dunstone Gray
25faa06060 Rewrite system note helper 2017-04-06 19:22:33 -04:00
Annabel Dunstone Gray
2c9239fb66 Change edit icon 2017-04-06 19:22:33 -04:00
Annabel Dunstone Gray
5c7953fb82 Leave icon area blank if legacy note; remove diamond icon 2017-04-06 19:22:33 -04:00
Annabel Dunstone Gray
087e83287f Fix positioning of note icons 2017-04-06 19:22:33 -04:00
Annabel Dunstone Gray
f3a39afc37 Fix newline errors 2017-04-06 19:22:33 -04:00
Annabel Dunstone Gray
6f7deb482a Add remaining system note icons 2017-04-06 19:22:33 -04:00
Annabel Dunstone Gray
32e4a0f351 Add system notes icon helper; add icons 2017-04-06 19:22:33 -04:00