Merge branch 'master' into project_hooks_api

2012-09-10 16:47:31 +03:00 · 2012-09-10 16:47:31 +03:00 · 2e34a6d3c4
commit 2e34a6d3c4
parent fdb5c82c33 8674fba173
58 changed files with 468 additions and 335 deletions
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@ -86,7 +86,7 @@ describe Gitlab::API do
    it "should return a 404 error if not found" do
      get api("/projects/42", user)
      response.status.should == 404
-      json_response['message'].should == '404 Not found'
+      json_response['message'].should == '404 Not Found'
    end
  end