Merge branch 'master' into fixes/api, code clean up and tests fixed

Conflicts:
	doc/api/projects.md
	spec/requests/api/projects_spec.rb

1 files changed, 0 insertions, 14 deletions

diff --git a/spec/requests/api/notes_spec.rb b/spec/requests/api/notes_spec.rb
index 92ac5befc3a..901640834f2 100644
--- a/spec/requests/api/notes_spec.rb
+++ b/spec/requests/api/notes_spec.rb
@@ -105,13 +105,6 @@ describe Gitlab::API do
         response.status.should == 404
       end
     end
-
-    context "when notable is invalid" do
-      it "should return a 404 error" do
-        get api("/projects/#{project.id}/unknown/#{snippet.id}/notes", user)
-        response.status.should == 404
-      end
-    end
   end
 
   describe "GET /projects/:id/noteable/:noteable_id/notes/:note_id" do
@@ -180,12 +173,5 @@ describe Gitlab::API do
         response.status.should == 401
       end
     end
-
-    context "when noteable is invalid" do
-      it "should return a 404 error" do
-        post api("/projects/#{project.id}/invalid/#{snippet.id}/notes", user)
-        response.status.should == 404
-      end
-    end
   end
 end