summaryrefslogtreecommitdiff
path: root/app/controllers/projects/notes_controller.rb
Commit message (Expand)AuthorAgeFilesLines
* Support comments for personal snippetsJarka Kadlecova2017-05-051-44/+0
* Display comments for personal snippets12910-personal-snippets-notes-showJarka Kadlecova2017-05-021-125/+14
* Remove unused codeDouwe Maan2017-04-051-2/+1
* Address review commentsDouwe Maan2017-04-051-1/+1
* Correctly display multiple separate discussions on the same diff lineDouwe Maan2017-04-051-3/+3
* Don't use original_discussion_idDouwe Maan2017-04-051-6/+1
* Add specsDouwe Maan2017-04-051-7/+7
* Fix some specsDouwe Maan2017-04-051-0/+2
* Add option to start a new discussion on an MRDouwe Maan2017-04-051-38/+48
* Remove query parameters from notes polling endpoint to make caching easierAdam Niedzielski2017-03-011-1/+6
* add /award slash commandmhasbini2017-02-281-9/+2
* Fix inconsistent naming for services that delete thingsdixpac2017-02-081-1/+1
* support `/merge` slash comand for MRsJarka Kadlecova2017-01-111-1/+2
* Merge branch 'jej-note-search-uses-finder' into 'security' Douwe Maan2016-12-151-1/+1
* Backport Note#commands_changes from EEbackport-commands-paramsDouwe Maan2016-11-241-0/+1
* Backport some changes done from Time Tracking feature in EE.ee-870-backportRuben Davila2016-11-181-12/+13
* Merge branch 'diff-line-comment-vuejs' into 'master' Douwe Maan2016-08-191-1/+33
|\
| * Address review feedbackDouwe Maan2016-08-161-2/+2
| * Add specs for NotesController and DiscussionsControllerDouwe Maan2016-08-121-1/+1
| * Actually don't send resolved notifications when deleting a noteDouwe Maan2016-08-041-0/+2
| * Don't send resolved notifications when deleting a noteDouwe Maan2016-07-281-2/+0
| * Add 'Resolved all discussions' system noteDouwe Maan2016-07-281-0/+2
| * Backend tweaksDouwe Maan2016-07-281-5/+5
| * Updates the text above discussions when resolving notes & discussionsPhil Hughes2016-07-271-2/+9
| * Added resolved by users name into tooltipPhil Hughes2016-07-261-1/+3
| * Add endpoints to resolve diff notes and discussionsDouwe Maan2016-07-251-3/+14
| * Assigns to variable rather than using VueJS methodPhil Hughes2016-07-241-2/+2
| * Resolve all endpointPhil Hughes2016-07-241-0/+5
| * Posts to rails to update note eventuallyPhil Hughes2016-07-241-0/+5
* | Support slash commands in noteable description and notesRémy Coutable2016-08-131-1/+1
|/
* Add Discussion model to represent MR/diff discussiondiscussion-modelDouwe Maan2016-07-201-29/+36
* Display new diff notes and allow creation through the web interfaceDouwe Maan2016-07-061-2/+19
* Support for rendering/redacting multiple documentsYorick Peterse2016-06-241-0/+10
* Backend awardables on commentsZJ van de Weg2016-06-061-0/+3
* Merge branch 'awardables' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-181-4/+9
|\
| * Fix latests concernsZJ van de Weg2016-05-181-4/+9
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-181-5/+5
|\ \ | |/ |/|
| * Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage'Dmitriy Zaporozhets2016-05-181-2/+2
| |\
| | * Change deprecated usage of rendering without response bodyMehmet Emin İNAÇ2016-03-161-2/+2
| * | Extract LegacyDiffNote out of NoteDouwe Maan2016-05-131-3/+3
* | | Add tests on Awardables and Award EmojiZeger-Jan van de Weg2016-05-101-2/+1
* | | Create table for award emojiZeger-Jan van de Weg2016-05-061-28/+7
|/ /
* | Fix code review issuesRobert Schilling2016-04-121-1/+1
* | Delete notes via APIRobert Schilling2016-04-121-3/+2
|/
* [WIP] Background process note logic for #3948Josh Frye2016-01-281-1/+1
* Fix diff comments loaded by AJAX to load comment with diff in discussion tabRémy Coutable2016-01-191-12/+10
* base implementation of emoji picker [ci skip]Valery Sizov2015-12-221-1/+0
* Merge remote-tracking branch 'origin/feature/update-rubocop'Dmitriy Zaporozhets2015-12-161-1/+1
|\
| * Fixed Rubocop offensesGabriel Mazetto2015-12-151-1/+1
* | Fix note pollingrs-issue-4032Robert Speicher2015-12-121-1/+2
|/