suzanne.soy/travis-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into rkh-metrics

Browse Source
This commit is contained in:
Mathias Meyer 2013-06-18 09:51:13 +02:00
commit 162bf4e3ef
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.lock
View File

@ -44,7 +44,7 @@ GIT
GIT
remote: git://github.com/travis-ci/travis-core.git
revision: 828858bb78f104960663e267d07f0fc93d94fd0a
revision: aa0740f536f2b84666542847328efebedb14e709
specs:
travis-core (0.0.1)
actionmailer (~> 3.2.12)

2
spec/integration/v2/repositories_spec.rb
View File

@ -9,7 +9,7 @@ describe 'Repos' do
let(:token) { Travis::Api::App::AccessToken.create(user: user, app_id: -1) }
let(:headers) { { 'HTTP_ACCEPT' => 'application/vnd.travis-ci.2+json', 'HTTP_AUTHORIZATION' => "token #{token}" } }
before { user.permissions.create!(:repository_id => repo.id, :push => true) }
before { user.permissions.create!(:repository_id => repo.id, :admin => true) }
it 'POST /repos/:id/key' do
expect {