summaryrefslogtreecommitdiff
path: root/app/models/note.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'and-you-get-awards' into 'master' Rémy Coutable2016-09-211-4/+0
* prevent authored awardable thumbs votesbarthc2016-08-281-0/+4
* Fix Error 500 resulting when loading network graphfix-network-graph-error-500Stan Hu2016-08-201-0/+2
* Improve performance of MR show pageDouwe Maan2016-08-181-1/+4
* Fix MR note discussion IDDouwe Maan2016-08-181-1/+3
* Fix class method definitionDouwe Maan2016-08-171-1/+1
* Store discussion_id on Note for faster discussion lookup.Douwe Maan2016-08-171-9/+26
* Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-121-0/+1
|\
| * Added concern for a faster "cache_key" methodfaster-cache-keysYorick Peterse2016-08-081-0/+1
* | Show existing discussion when adding new comment on line with a hidden resolv...Douwe Maan2016-07-281-1/+0
* | Use sha1 of discussion ID.Douwe Maan2016-07-251-2/+2
* | Collapse/hide resolved discussionsDouwe Maan2016-07-251-2/+4
* | Add resolved_at and resolved_by_id to DiffNoteDouwe Maan2016-07-251-0/+12
|/
* Fix bug where replies to commit notes displayed in the MR discussion tab woul...Douwe Maan2016-07-231-5/+9
* Add Discussion model to represent MR/diff discussiondiscussion-modelDouwe Maan2016-07-201-3/+4
* Fix not normalized emoji pathsdixpac2016-07-141-2/+1
* Optimize system note visibility checking by hiding notes thatStan Hu2016-07-111-1/+13
* Add DiffNote modelDouwe Maan2016-07-061-2/+6
* Extract parts of LegacyDiffNote into DiffOnNote concern and move part of resp...Douwe Maan2016-07-061-2/+2
* Don't garbage collect commits that have related DB records like commentsDouwe Maan2016-07-041-0/+7
* use has_many relationship with eventsJames Lopez2016-07-011-1/+1
* fixing events for import/exportJames Lopez2016-06-291-0/+1
* Support for rendering/redacting multiple documentsYorick Peterse2016-06-241-0/+4
* Preload notes/discussions associations (award_emoji: :user)optimize-award-emojiPaco Guzman2016-06-231-1/+3
* Eager load award emoji on notesZ.J. van de Weg2016-06-231-1/+1
* fixed merge conflictsJames Lopez2016-06-161-16/+7
|\
| * Award Emoji can't be awarded on system notes backendzj-system-notes-not-awardableZ.J. van de Weg2016-06-151-0/+4
| * Use Issue.visible_to_user in Notes.search to avoid query duplicationDouglas Barbosa Alexandre2016-06-131-16/+3
| * Project members with guest role can't access confidential issuesDouglas Barbosa Alexandre2016-06-131-1/+1
* | fixed specs and refactored a few things due to recent model changes and merge...James Lopez2016-06-131-2/+3
|/
* Backend awardables on commentsZJ van de Weg2016-06-061-0/+1
* Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-031-4/+20
|\
| * Merge branch 'separate-banzai-references' into 'master' Douwe Maan2016-06-011-1/+1
| |\
| | * Refactor ParticipableYorick Peterse2016-06-011-1/+1
| * | Merge branch 'data_leak' into 'master' Robert Speicher2016-05-311-3/+19
| |\ \
| | * | Confidential notes data leakValery Sizov2016-05-311-3/+19
| | |/
* | | Incorportate feedbackZ.J. van de Weg2016-06-011-14/+2
* | | Merge branch 'master' into awardablesZJ van de Weg2016-05-301-2/+9
|\ \ \ | |/ /
| * | Validate presence of noteable_type in note modelGrzegorz Bizon2016-05-291-0/+1
| * | Do not override foreign attributes in note factoryGrzegorz Bizon2016-05-291-1/+1
| * | Remove redundant `with_options` from note validatorsGrzegorz Bizon2016-05-291-5/+3
| * | Improve note validation for project mismatchGrzegorz Bizon2016-05-291-5/+7
| * | Make note invalid if noteable project is differentGrzegorz Bizon2016-05-291-0/+6
| |/
* | Fix backend merge mistakesZJ van de Weg2016-05-191-1/+1
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-181-172/+31
|\ \ | |/
| * Add an Event's target's title to its reference linkRobert Speicher2016-05-161-0/+1
| * Clean up LegacyDiffNote somewhatDouwe Maan2016-05-131-0/+4
| * Extract LegacyDiffNote out of NoteDouwe Maan2016-05-131-184/+30
* | Fix tests and wrong choices during mergeZeger-Jan van de Weg2016-05-121-1/+1
* | Incorporate feedbackZeger-Jan van de Weg2016-05-111-4/+0