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

Bump travis-core

Browse Source
This commit is contained in:
Piotr Sarnacki 2013-11-04 13:22:50 +01:00
parent 62a5e602c5
commit 33264e11f4
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Gemfile.lock
View File

@ -23,7 +23,7 @@ GIT
GIT GIT
remote: git://github.com/travis-ci/travis-core.git remote: git://github.com/travis-ci/travis-core.git
revision: 6a5b230b06e927cf953a1b7bb20dcf7fd45ee978 revision: 12e52ccefa2b54e2dfdef1350c28df01397e1104
branch: repository-settings branch: repository-settings
specs: specs:
travis-core (0.0.1) travis-core (0.0.1)
@ -154,8 +154,8 @@ GEM
i18n (0.6.5) i18n (0.6.5)
journey (1.0.4) journey (1.0.4)
json (1.8.1) json (1.8.1)
kgio (2.8.1) kgio (2.8.0)
listen (1.0.3) listen (1.2.2)
rb-fsevent (>= 0.9.3) rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9) rb-inotify (>= 0.9)
rb-kqueue (>= 0.2) rb-kqueue (>= 0.2)
@ -215,11 +215,19 @@ GEM
rdoc (3.12.2) rdoc (3.12.2)
json (~> 1.4) json (~> 1.4)
redcarpet (2.3.0) redcarpet (2.3.0)
<<<<<<< HEAD
redis (3.0.6) redis (3.0.6)
redis-namespace (1.3.2) redis-namespace (1.3.2)
redis (~> 3.0.4) redis (~> 3.0.4)
rerun (0.8.2) rerun (0.8.2)
listen (~> 1.0.3) listen (~> 1.0.3)
=======
redis (3.0.5)
redis-namespace (1.3.0)
redis (~> 3.0.0)
rerun (0.8.1)
listen (>= 1.0.3)
>>>>>>> Bump travis-core
rollout (1.1.0) rollout (1.1.0)
rspec (2.14.1) rspec (2.14.1)
rspec-core (~> 2.14.0) rspec-core (~> 2.14.0)
@ -269,7 +277,11 @@ GEM
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
tzinfo (0.3.38) tzinfo (0.3.38)
<<<<<<< HEAD
unicorn (4.7.0) unicorn (4.7.0)
=======
unicorn (4.6.3)
>>>>>>> Bump travis-core
kgio (~> 2.6) kgio (~> 2.6)
rack rack
raindrops (~> 0.7) raindrops (~> 0.7)