summaryrefslogtreecommitdiff
path: root/app/models/note.rb
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-111-22/+1
|\ \ | |/
| * Remove the annotate gem and delete old annotationsJeroen van Baarsen2016-05-091-21/+0
| * Annotate the modelsZeger-Jan van de Weg2016-05-061-4/+4
| * Remove useless require 'file_size_validator' causing warningsRémy Coutable2016-04-191-1/+0
* | Create table for award emojiZeger-Jan van de Weg2016-05-061-42/+11
|/
* Rename Note#for_project_snippet? to #for_snippet?Rémy Coutable2016-03-311-1/+1
* Merge branch 'rs-note-active-spec' into 'master'Robert Speicher2016-03-141-12/+21
|\
| * Add unit specs for `Note#active?`rs-note-active-specRobert Speicher2016-03-111-12/+21
* | Disallow blank (non-null) values for a Note's `line_code` attributers-disallow-blank-line-codeRobert Speicher2016-03-111-1/+6
|/
* Removed arel_table receiver from search methodsYorick Peterse2016-03-111-1/+1
* Use ILIKE/LIKE for searching notesYorick Peterse2016-03-111-1/+11
* Merge branch 'rs-note-delegates-mentionable'Douwe Maan2016-03-071-10/+1
|\
| * Delegate a Note's Mentionable methods to its noteable objectrs-note-delegates-mentionableRobert Speicher2016-03-051-10/+1
* | Merge branch 'rs-note-reuse-for-methods' into 'master' Douwe Maan2016-03-071-2/+2
|\ \
| * | Make better use of the `Note#for_*?` methodsrs-note-reuse-for-methodsRobert Speicher2016-03-051-2/+2
| |/
* | Remove `Note#system?` "override"rs-note-model-cleanupRobert Speicher2016-03-051-4/+0
* | Remove `Note#noteable_type_name`Robert Speicher2016-03-051-4/+0
|/
* Use Gitlab::Git::DiffCollectionsJacob Vosmaer2016-03-031-14/+12
* Rename Tasks to TodosDouglas Barbosa Alexandre2016-02-201-1/+1
* Use destroy, in case we ever have before_destroy callbacks on TaskDouglas Barbosa Alexandre2016-02-201-1/+1
* Create a pending task when a user is mentioned on a noteDouglas Barbosa Alexandre2016-02-201-0/+2
* Improve #set_award! on the Note model12792-emoji-as-text-diff-commentZeger-Jan van de Weg2016-02-191-4/+1
* Emoji reponses on diffs aren't award emojiZeger-Jan van de Weg2016-02-191-0/+4
* Make sure non-highlighted diffs are still escapedunescaped-diffsDouwe Maan2016-01-221-2/+6
* Update Issue/MR everytime a Note is saved/destroyed.Rubén Dávila2016-01-191-1/+1