Merge branch 'milestone_api' of https://github.com/tsigo/gitlabhq into tsigo-milestone_api

Conflicts:
	spec/requests/api/issues_spec.rb

spec/requests/api/issues_spec.rb

@@ -65,9 +65,8 @@ describe Gitlab::API do
 
   describe "DELETE /projects/:id/issues/:issue_id" do
     it "should delete a project issue" do
-      expect {
-        delete api("/projects/#{project.code}/issues/#{issue.id}", user)
-      }.to change { Issue.count }.by(-1)
+      delete "#{api_prefix}/projects/#{project.code}/issues/#{issue.id}?private_token=#{user.private_token}"
+      response.status.should == 405
     end
   end
 end