Merge branch 'master' into api

2012-07-24 05:46:36 -07:00 · 2012-07-24 05:46:36 -07:00 · eca823c1c7
commit eca823c1c7
parent 024e034890 8b7e404b5b
124 changed files with 1743 additions and 657 deletions
--- a/spec/api/projects_spec.rb
+++ b/spec/api/projects_spec.rb
@ -78,7 +78,7 @@ describe Gitlab::API do
  end

  describe "DELETE /projects/:id/snippets/:snippet_id" do
-    it "should create a new project snippet" do
+    it "should delete existing project snippet" do
      expect {
        delete "#{api_prefix}/projects/#{project.code}/snippets/#{snippet.id}?private_token=#{user.private_token}"
      }.should change { Snippet.count }.by(-1)