Merge branch 'front-end' of https://github.com/NARKOZ/gitlabhq into NARKOZ-front-end

Conflicts:
	app/views/issues/_form.html.haml
This commit is contained in:
randx 2012-10-27 11:24:11 +03:00
commit 3c5a3fe0ae
14 changed files with 72 additions and 96 deletions

View file

@ -239,7 +239,7 @@ describe Gitlab::API do
end
describe "GET /projects/:id/snippets" do
it "should return a project snippet" do
it "should return an array of project snippets" do
get api("/projects/#{project.code}/snippets", user)
response.status.should == 200
json_response.should be_an Array