Merge branch 'master' into fixes/api

Conflicts:
	spec/requests/api/projects_spec.rb
This commit is contained in:
Sebastian Ziebell 2013-02-20 12:43:32 +01:00
commit eefb27f5ae
134 changed files with 1116 additions and 859 deletions

View file

@ -23,7 +23,7 @@ GET /projects
"blocked": false,
"created_at": "2012-05-23T08:00:58Z"
},
"private": true,
"public": true,
"path": "rails",
"path_with_namespace": "rails/rails",
"issues_enabled": false,
@ -45,7 +45,7 @@ GET /projects
"blocked": false,
"created_at": "2012-05-23T08:00:58Z"
},
"private": true,
"public": true,
"path": "gitlab",
"path_with_namespace": "randx/gitlab",
"issues_enabled": true,
@ -89,7 +89,7 @@ Parameters:
"blocked": false,
"created_at": "2012-05-23T08:00:58Z"
},
"private": true,
"public": true,
"path": "gitlab",
"path_with_namespace": "randx/gitlab",
"issues_enabled": true,