summaryrefslogtreecommitdiff
path: root/app/models/note.rb
Commit message (Collapse)AuthorAgeFilesLines
* More SystemNoteService cleanuprs-to_referenceRobert Speicher2015-05-261-2/+2
|
* Check if `system` is truthy in `Note.cross_reference?`Robert Speicher2015-05-111-1/+1
|
* Add a SystemNoteService classRobert Speicher2015-05-111-209/+6
| | | | | There's a lot of code in the Note model that only deals with creating system notes, so we're going to split that into its own class.
* Simplify `Note#upvote?` and `Note#downvote?`Robert Speicher2015-05-101-17/+11
|
* Fix small issues.Douwe Maan2015-04-241-4/+4
|
* Fix errors.Douwe Maan2015-04-241-2/+2
|
* Move participants method to shared Participable concern.Douwe Maan2015-04-241-0/+2
|
* Link cross-project cross-reference notes to correct project.Douwe Maan2015-04-241-35/+11
|
* Use project.commit convenience method.Douwe Maan2015-04-241-2/+2
|
* Merge branch 'rs-mentionable-examples-refactor' into 'master'Dmitriy Zaporozhets2015-04-231-2/+2
|\ | | | | | | | | | | | | | | | | | | Update mentionable shared examples to be (a bit) more understandable These shared examples were super confusing, and honestly still kind of are, but they should be a bit better now. I encountered a bunch of headaches in these examples while refactoring ReferenceExtractor, so that's how I ended up changing it. See merge request !1780
| * Note#cross_reference_exists? should be checking the noteable_type alsoRobert Speicher2015-04-161-2/+2
| |
* | Merge branch 'better-commit-mentions' into 'master'Dmitriy Zaporozhets2015-04-201-8/+0
|\ \ | |/ |/| | | | | | | | | | | Clean up code around commit mentions. Builds upon !527. See merge request !528
| * Clean up code around commit mentions.Douwe Maan2015-04-151-8/+0
| |
* | Fix merge request comments on files with multiple commitsDominik Sander2015-04-151-1/+5
|/ | | | | | | | | | | | | | | | Having a merge request with a comments on a line which is then changed in a later commit prevented new comments from properly showing up in the merge request show page. * `Note#set_diff` do not use stored the diff when creating a new note in merge requests (we can not be sure the diff did not changed since the last comment on that line) * Do not rely just on `outdated?` of the first note when displaying comments of a MR in the discussion tab, but partition the active/outdated notes and display them all * In the inline changes tab just select the active notes, so an outdated note does not prevent an active one from being rendered * Just show active comments in the side-by-side changes tab
* Support configurable attachment size via Application SettingsStan Hu2015-04-021-2/+8
| | | | | | Fix bug where error messages from Dropzone would not be displayed on the issues page Closes #1258
* Don't include system notes in issue/MR comment count.notes-count-without-systemDouwe Maan2015-03-231-0/+1
|
* Fix cross references when usernames, milestones, or project names contain ↵Stan Hu2015-03-191-10/+15
| | | | | | underscores. Remove emphasis from system notes to avoid Markdown conflicts in names.
* Revert "Note: add default_scope { order(created_at: :asc, id: :asc) }"Dmitriy Zaporozhets2015-03-181-1/+0
| | | | This reverts commit 7602cef572fd770a06eb3d94f2aef57c2693dcb6.
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-181-0/+1
|\
| * Note: add default_scope { order(created_at: :asc, id: :asc) }Samuel Bernard2015-03-181-0/+1
| |
* | Fix condensed range in MR push comment.Douwe Maan2015-03-181-2/+6
|/
* Merge branch 'condensed-mr-commits' into 'master'Dmitriy Zaporozhets2015-03-071-4/+27
|\ | | | | | | | | | | | | | | | | | | | | | | Condense commits already in target branch when updating merge request source branch. Resolves https://dev.gitlab.org/gitlab/gitlabhq/issues/2043. ![Screen_Shot_2015-03-06_at_17.17.13](https://dev.gitlab.org/gitlab/gitlabhq/uploads/8d03540b7b7294ce07005e6f3db6ed3d/Screen_Shot_2015-03-06_at_17.17.13.png) (Not shown in screenshot, but works fine with rebases as well) See merge request !1648
| * Use 2 periods instead of 3 to signify inclusive range.Douwe Maan2015-03-061-1/+1
| |
| * Condense commits already in target branch when updating merge request source ↵Douwe Maan2015-03-061-4/+27
| | | | | | | | branch.
* | Added comment notification events to HipChat and Slack services.Stan Hu2015-03-061-0/+8
|/ | | | | | | | | Supports four different event types all bundled under the "note" event type: - comments on a commit - comments on an issue - comments on a merge request - comments on a code snippet
* Fix commit comments on first line of diff not rendering in Merge Request ↵Douwe Maan2015-02-201-9/+9
| | | | Discussion view.
* Add labels notesNikita Verkhovin2015-02-081-0/+30
|
* Add index on order columnsDmitriy Zaporozhets2015-02-061-1/+1
|
* Code improvements according to styleguideDmitriy Zaporozhets2015-01-221-2/+5
|
* Merge pull request #8607 from skburgart/fix-typosDmitriy Zaporozhets2015-01-211-1/+1
|\ | | | | Fix various typos
| * Fix various typosSteven Burgart2015-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | signe-in -> signed-in go_to_gihub_for_permissions -> go_to_github_for_permissions descendand -> descendant behavour -> behaviour recepient_email -> recipient_email generate_fingerpint -> generate_fingerprint dependes -> depends Cant't -> Can't wisit -> visit notifcation -> notification sufficent_scope -> sufficient_scope? levet -> level
* | Only count the user's last voteMichael Clarke2015-01-191-0/+17
|/
* If noteable is nil - make discussion outdatedDmitriy Zaporozhets2015-01-101-0/+1
|
* Fix random Argument error when update noteDmitriy Zaporozhets2014-12-151-1/+1
| | | | | | | | In some strange cases Ruby thinks `system` is not AR field but Kernel.system call and raises exception during save. It should prevent this random wierd behaviour Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'commit-comments' of https://gitlab.com/jeroenj/gitlab-ce into ↵Dmitriy Zaporozhets2014-11-121-3/+17
|\ | | | | | | | | | | | | | | | | jeroenj/gitlab-ce-commit-comments Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
| * Adds comments to commits in the APIJeroen Jacobs2014-09-261-3/+17
| |
* | Merge pull request #7617 from pkill/issue-280-commit-note-notificationsDmitriy Zaporozhets2014-11-121-2/+2
|\ \ | | | | | | Issue-280 Send notifications when a note is added to a commit and author...
| * | Issue-280 Send notifications when a note is added to a commit and author is ↵Alex Elman2014-11-051-2/+2
| | | | | | | | | | | | | | | | | | a group member This fixes a bug where commit authors weren't receiving email notifications for notes added to their commits and their membership was in the group but not the project. The fix is to look up membership via the team object which accounts for both project and group members.
* | | Do not allow cross reference note in a mr if a mr contains mentioned commit.Marin Jankovski2014-11-051-1/+10
|/ /
* | DRY mentioned in magic note constantCiro Santilli2014-10-191-2/+14
| |
* | Prevent PG::Error exception when check commit reference on commitDmitriy Zaporozhets2014-10-061-4/+9
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Make Mentionables work for cross-project refsVinnie Okada2014-10-031-4/+69
|/ | | | | Add a note to merge requests and issues when they're mentioned by a merge request, issue, or commit in another project.
* Refactoring inside refactoring. We need to go deeperDmitriy Zaporozhets2014-09-081-4/+18
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Use new diff parsing logicDmitriy Zaporozhets2014-09-081-7/+32
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Pluralize commit text for note when push to existing MRDmitriy Zaporozhets2014-09-051-1/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add comment to merge request when new push happensDmitriy Zaporozhets2014-09-051-0/+18
| | | | | | It allows track when user added new commits to existing merge request Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Dont allow edit or remove of system notesDmitriy Zaporozhets2014-08-291-0/+4
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add search method to Note classDmitriy Zaporozhets2014-08-261-0/+4
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Moved some behaviour to one placeJeroen van Baarsen2014-07-251-3/+1
| | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Make app works with strong paramsDmitriy Zaporozhets2014-06-261-6/+6
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status