Merge branch 'master' into ssh_keys_api

This commit is contained in:
Alex Denisov 2012-09-16 22:37:50 +03:00
commit b6c6a5b159
29 changed files with 886 additions and 172 deletions

View file

@ -70,7 +70,7 @@ describe "Application access" do
end
describe "GET /project_code/team" do
subject { team_project_path(@project) }
subject { project_team_index_path(@project) }
it { should be_allowed_for @u1 }
it { should be_allowed_for @u3 }