Merge branch 'master' into fixes/api

diff --cc config/routes.rb
Simple merge

diff --cc doc/api/notes.md
Simple merge

diff --cc doc/api/projects.md
Simple merge

diff --cc lib/api.rb
Simple merge

diff --cc lib/api/notes.rb
Simple merge

diff --cc lib/api/projects.rb
Simple merge

diff --cc spec/requests/api/notes_spec.rb
index a4abbd9,ee99d85..d382d7d
--- 1/spec/requests/api/notes_spec.rb
--- 2/spec/requests/api/notes_spec.rb
+++ b/spec/requests/api/notes_spec.rb
@@@ -78,12 -65,16 +80,21 @@@ describe Gitlab::API d
          json_response.should be_an Array
          json_response.first['body'].should == snippet_note.note
        end
 +
 +      it "should return a 404 error when snippet id not found" do
 +        get api("/projects/#{project.id}/snippets/42/notes", user)
 +        response.status.should == 404
 +      end
      end
+ 
+     context "when noteable is a Merge Request" do
+       it "should return an array of merge_requests notes" do
+         get api("/projects/#{project.id}/merge_requests/#{merge_request.id}/notes", user)
+         response.status.should == 200
+         json_response.should be_an Array
+         json_response.first['body'].should == merge_request_note.note
+       end
+     end
    end
  
    describe "GET /projects/:id/noteable/:noteable_id/notes/:note_id" do

diff --cc spec/requests/api/projects_spec.rb
Simple merge