gitlab/app/controllers/projects
Marin Jankovski 66fa4b09ed Merge branch 'fix-edit-note-with-votes' into 'master'
Fix server error when editing a note to "+1" or "-1"

### Summary

If a user edits a comment with "+1" or "-1" in the beginning, the POST returns an Internal Server error. (issue #1151). This merge request resolves that error.

### Steps to reproduce

1. Comment on an issue with "Test comment".
2. Edit the issue.
3. Write "+1" and click "Save Comment".

### Expected behavior

The edited note should be saved and refreshed. Any previous upvotes/downvotes from the user should contain a strikethrough.

### Observed behavior

Internal Error

### Relevant logs

```
Started PUT "/avocode/avocode-manager/notes/4996" for 185.33.136.107 at 2015-02-28 17:11:53 +0100
Processing by Projects::NotesController#update as JS
Parameters: {"utf8"=>"✓", "authenticity_token"=>"*removed*", "note"=>{"note"=>"+1\r\n\r\nYes"}, "commit"=>"Save Comment", "project_id"=>"avocode/avocode-manager", "id"=>"4996"}
Completed 500 Internal Server Error in 86ms
ActionView::Template::Error (undefined method `each' for nil:NilClass):
28: %span.note-last-update
29: = note_timestamp(note)
30:
31: - if note.superceded?(@notes)
32: - if note.upvote?
33: %span.vote.upvote.label.label-gray.strikethrough
34: %i.fa.fa-thumbs-up
app/models/note.rb:495:in `superceded?'
app/views/projects/notes/_note.html.haml:31:in `_app_views_projects_notes__note_html_haml___812277000516355462_69988235638820'
app/controllers/projects/notes_controller.rb:71:in `note_to_html'
app/controllers/projects/notes_controller.rb:103:in `render_note_json'
app/controllers/projects/notes_controller.rb:39:in `block (2 levels) in update'
app/controllers/projects/notes_controller.rb:38:in `update'
```

### Fix

It turns out no tests were present for the "Edit Issue" functionality. I added spinach tests to exercise this and reproduced the error.

Most of the routes in `notes_controller.rb` appear to render all notes for the given discussion. `_form.html.haml` needs the full list of notes commented by the user to add strikethroughs for older upvotes/downvotes. However, only the `index` route appeared to obtain this information. The fix is to add a `before_filter` to obtain all the user's notes beforehand, except in the delete case where this information is not needed.

Things to watch: `NotesFinder` needs `target_type` and `target_id` to determine what to do. I'm not sure if there is a conscious effort to phase these keywords out in favor of `noteable_type` and `noteable_id`.

See merge request !360
2015-03-03 21:57:00 +00:00
..
application_controller.rb Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00
avatars_controller.rb Introduce shortcuts for routing helpers 2015-02-25 19:34:16 -08:00
blame_controller.rb Move 'require_non_empty_project' filter to front so 'assign_ref_vars' doesn't 404. 2015-02-20 17:20:03 +01:00
blob_controller.rb Web Editor: save to new branch 2015-02-24 11:43:20 +02:00
branches_controller.rb Merge branch 'master' into rails-4.1.9 2015-02-21 12:55:28 -07:00
commit_controller.rb Move 'require_non_empty_project' filter to front so 'assign_ref_vars' doesn't 404. 2015-02-20 17:20:03 +01:00
commits_controller.rb Move 'require_non_empty_project' filter to front so 'assign_ref_vars' doesn't 404. 2015-02-20 17:20:03 +01:00
compare_controller.rb Merge branch 'master' into rails-4.1.9 2015-02-21 12:55:28 -07:00
deploy_keys_controller.rb Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00
forks_controller.rb Merge branch 'master' into rails-4.1.9 2015-02-21 12:55:28 -07:00
graphs_controller.rb Move 'require_non_empty_project' filter to front so 'assign_ref_vars' doesn't 404. 2015-02-20 17:20:03 +01:00
hooks_controller.rb Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00
imports_controller.rb Add brakeman rake task and improve code security 2015-03-02 18:11:50 -08:00
issues_controller.rb More use of shortcut routes 2015-02-25 19:50:01 -08:00
labels_controller.rb Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00
merge_requests_controller.rb Fix syntax issue 2015-02-26 16:44:52 -08:00
milestones_controller.rb Update project_milestone_path update route. 2015-02-26 16:03:42 -08:00
network_controller.rb Move 'require_non_empty_project' filter to front so 'assign_ref_vars' doesn't 404. 2015-02-20 17:20:03 +01:00
notes_controller.rb Fix bug where editing a comment with "+1" or "-1" would cause a server error 2015-03-02 15:26:00 -08:00
protected_branches_controller.rb Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00
raw_controller.rb Move 'require_non_empty_project' filter to front so 'assign_ref_vars' doesn't 404. 2015-02-20 17:20:03 +01:00
refs_controller.rb Merge branch 'master' into rails-4.1.9 2015-02-21 12:55:28 -07:00
repositories_controller.rb Introduce shortcuts for routing helpers 2015-02-25 19:34:16 -08:00
services_controller.rb Merge branch 'add-irker-service' of https://github.com/Aorimn/gitlabhq into Aorimn-add-irker-service 2015-03-02 15:22:31 -08:00
snippets_controller.rb Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00
tags_controller.rb Merge branch 'master' into rails-4.1.9 2015-02-19 20:53:05 -07:00
team_members_controller.rb Add brakeman rake task and improve code security 2015-03-02 18:11:50 -08:00
tree_controller.rb Merge branch 'master' into rails-4.1.9 2015-02-21 12:55:28 -07:00
uploads_controller.rb Satisfy Rubocop. 2015-02-20 16:04:03 +01:00
wikis_controller.rb Add brakeman rake task and improve code security 2015-03-02 18:11:50 -08:00