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

Merge branch 'sf-use-services' of github.com:travis-ci/travis-api into sf-use-services

Browse Source 
Conflicts:
	Gemfile.lock
This commit is contained in:
Konstantin Haase 2012-09-22 17:45:49 +02:00
commit 05c44dce44
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@ -8,6 +8,7 @@ gem 'travis-core', github: 'travis-ci/travis-core', branch: 'sf-more-services
gem 'hubble', github: 'roidrage/hubble' gem 'hubble', github: 'roidrage/hubble'
gem 'yard-sinatra', github: 'rkh/yard-sinatra' gem 'yard-sinatra', github: 'rkh/yard-sinatra'
gem 'gh', github: 'rkh/gh' gem 'gh', github: 'rkh/gh'
gem 'bunny'
group :test do group :test do
gem 'rspec', '~> 2.11' gem 'rspec', '~> 2.11'

24
Gemfile.lock
View File

@ -25,9 +25,10 @@ GIT
GIT GIT
remote: git://github.com/roidrage/hubble.git remote: git://github.com/roidrage/hubble.git
revision: 5220415d5542a2868d54f7be9f35fc1d66126b8e revision: 8972b940a4f927927d2a4bdb250b3c98c04692a6
specs: specs:
hubble (0.1.2) hubble (0.1.2)
faraday
json (~> 1.6.5) json (~> 1.6.5)
GIT GIT
@ -108,6 +109,7 @@ GEM
avl_tree (1.1.3) avl_tree (1.1.3)
backports (2.6.4) backports (2.6.4)
builder (3.0.3) builder (3.0.3)
bunny (0.8.0)
daemons (1.1.9) daemons (1.1.9)
data_migrations (0.0.1) data_migrations (0.0.1)
activerecord activerecord
@ -119,8 +121,7 @@ GEM
activesupport activesupport
faraday (0.8.4) faraday (0.8.4)
multipart-post (~> 1.1) multipart-post (~> 1.1)
ffi (1.1.0) foreman (0.59.0)
foreman (0.53.0)
thor (>= 0.13.6) thor (>= 0.13.6)
hashr (0.0.22) hashr (0.0.22)
hike (1.2.1) hike (1.2.1)
@ -128,10 +129,7 @@ GEM
i18n (0.6.1) i18n (0.6.1)
journey (1.0.4) journey (1.0.4)
json (1.6.7) json (1.6.7)
listen (0.4.7) listen (0.5.1)
rb-fchange (~> 0.0.5)
rb-fsevent (~> 0.9.1)
rb-inotify (~> 0.8.8)
mail (2.4.4) mail (2.4.4)
i18n (>= 0.4.0) i18n (>= 0.4.0)
mime-types (~> 1.16) mime-types (~> 1.16)
@ -142,7 +140,7 @@ GEM
avl_tree (~> 1.1.2) avl_tree (~> 1.1.2)
hitimes (~> 1.1) hitimes (~> 1.1)
mime-types (1.19) mime-types (1.19)
mocha (0.12.3) mocha (0.12.4)
metaclass (~> 0.0.1) metaclass (~> 0.0.1)
multi_json (1.3.6) multi_json (1.3.6)
multipart-post (1.1.5) multipart-post (1.1.5)
@ -180,11 +178,6 @@ GEM
rdoc (~> 3.4) rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0) thor (>= 0.14.6, < 2.0)
rake (0.9.2.2) rake (0.9.2.2)
rb-fchange (0.0.5)
ffi
rb-fsevent (0.9.1)
rb-inotify (0.8.8)
ffi (>= 0.5.0)
rdoc (3.12) rdoc (3.12)
json (~> 1.4) json (~> 1.4)
redcarpet (2.1.1) redcarpet (2.1.1)
@ -197,9 +190,9 @@ GEM
rspec-expectations (~> 2.11.0) rspec-expectations (~> 2.11.0)
rspec-mocks (~> 2.11.0) rspec-mocks (~> 2.11.0)
rspec-core (2.11.1) rspec-core (2.11.1)
rspec-expectations (2.11.2) rspec-expectations (2.11.3)
diff-lcs (~> 1.1.3) diff-lcs (~> 1.1.3)
rspec-mocks (2.11.1) rspec-mocks (2.11.3)
signature (0.1.4) signature (0.1.4)
simple_states (0.1.1) simple_states (0.1.1)
activesupport activesupport
@ -235,6 +228,7 @@ PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
bunny
factory_girl (~> 2.4.0) factory_girl (~> 2.4.0)
foreman foreman
gh! gh!