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

Merge branch 'sf-log-aggregation'

Browse Source 
Conflicts:
	Gemfile.lock
This commit is contained in:
Sven Fuchs 2013-01-09 12:49:34 +01:00
commit f7d9993090
2 changed files with 30 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -33,7 +33,7 @@ end
group :development do group :development do
gem 'foreman' gem 'foreman'
gem 'rerun' gem 'rerun'
gem 'debugger' # gem 'debugger'
end end
group :development, :test do group :development, :test do

67
Gemfile.lock
View File

@ -1,8 +1,8 @@
GIT GIT
remote: git://github.com/getsentry/raven-ruby.git remote: git://github.com/getsentry/raven-ruby.git
revision: fa360a9c5919c19f11552b9de6f83302060901f0 revision: 8cdccd40ddf55d3265a1ecc5e25312d49b8be44f
specs: specs:
sentry-raven (0.3.1) sentry-raven (0.4.0)
faraday (>= 0.7.6) faraday (>= 0.7.6)
hashie hashie
multi_json (~> 1.0) multi_json (~> 1.0)
@ -36,7 +36,7 @@ GIT
GIT GIT
remote: git://github.com/sinatra/sinatra-contrib.git remote: git://github.com/sinatra/sinatra-contrib.git
revision: c5c2d32e688123a1a1cab4b391447e995957c94f revision: a7a7acdcbd5c51388633a98471d6f7506cce4712
specs: specs:
sinatra-contrib (1.4.0) sinatra-contrib (1.4.0)
backports (>= 2.0) backports (>= 2.0)
@ -48,7 +48,7 @@ GIT
GIT GIT
remote: git://github.com/sinatra/sinatra.git remote: git://github.com/sinatra/sinatra.git
revision: 49eac3a645add2d1fb1698ce4a250896ff0af1b4 revision: 9984d0d2b3f1ea12273c6c25f8e102b2329f33e9
specs: specs:
sinatra (1.4.0) sinatra (1.4.0)
rack (~> 1.4) rack (~> 1.4)
@ -66,7 +66,7 @@ GIT
GIT GIT
remote: git://github.com/travis-ci/travis-core.git remote: git://github.com/travis-ci/travis-core.git
revision: 8054047f8ea52de88012c7351530b03516af5060 revision: ebcae5c92715ee494aa817be41d5fc2f3ea86353
specs: specs:
travis-core (0.0.1) travis-core (0.0.1)
actionmailer (~> 3.2.3) actionmailer (~> 3.2.3)
@ -126,12 +126,12 @@ PATH
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
actionmailer (3.2.9) actionmailer (3.2.11)
actionpack (= 3.2.9) actionpack (= 3.2.11)
mail (~> 2.4.4) mail (~> 2.4.4)
actionpack (3.2.9) actionpack (3.2.11)
activemodel (= 3.2.9) activemodel (= 3.2.11)
activesupport (= 3.2.9) activesupport (= 3.2.11)
builder (~> 3.0.0) builder (~> 3.0.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
journey (~> 1.0.4) journey (~> 1.0.4)
@ -139,15 +139,15 @@ GEM
rack-cache (~> 1.2) rack-cache (~> 1.2)
rack-test (~> 0.6.1) rack-test (~> 0.6.1)
sprockets (~> 2.2.1) sprockets (~> 2.2.1)
activemodel (3.2.9) activemodel (3.2.11)
activesupport (= 3.2.9) activesupport (= 3.2.11)
builder (~> 3.0.0) builder (~> 3.0.0)
activerecord (3.2.9) activerecord (3.2.11)
activemodel (= 3.2.9) activemodel (= 3.2.11)
activesupport (= 3.2.9) activesupport (= 3.2.11)
arel (~> 3.0.2) arel (~> 3.0.2)
tzinfo (~> 0.3.29) tzinfo (~> 0.3.29)
activesupport (3.2.9) activesupport (3.2.11)
i18n (~> 0.6) i18n (~> 0.6)
multi_json (~> 1.0) multi_json (~> 1.0)
addressable (2.3.2) addressable (2.3.2)
@ -162,25 +162,17 @@ GEM
timers (>= 1.0.0) timers (>= 1.0.0)
coder (0.3.0) coder (0.3.0)
coderay (1.0.8) coderay (1.0.8)
columnize (0.3.6) connection_pool (0.9.3)
connection_pool (0.9.2)
daemons (1.1.9) daemons (1.1.9)
dalli (2.5.0) dalli (2.6.0)
data_migrations (0.0.1) data_migrations (0.0.1)
activerecord activerecord
rake rake
database_cleaner (0.8.0) database_cleaner (0.8.0)
debugger (1.2.2)
columnize (>= 0.3.1)
debugger-linecache (~> 1.1.1)
debugger-ruby_core_source (~> 1.1.5)
debugger-linecache (1.1.2)
debugger-ruby_core_source (>= 1.1.1)
debugger-ruby_core_source (1.1.5)
diff-lcs (1.1.3) diff-lcs (1.1.3)
erubis (2.7.0) erubis (2.7.0)
eventmachine (1.0.0) eventmachine (1.0.0)
facter (1.6.16) facter (1.6.17)
factory_girl (2.4.2) factory_girl (2.4.2)
activesupport activesupport
faraday (0.8.4) faraday (0.8.4)
@ -195,9 +187,9 @@ GEM
yajl-ruby (~> 1.1) yajl-ruby (~> 1.1)
i18n (0.6.1) i18n (0.6.1)
journey (1.0.4) journey (1.0.4)
json (1.7.5) json (1.7.6)
kgio (2.7.4) kgio (2.7.4)
listen (0.6.0) listen (0.7.1)
mail (2.4.4) mail (2.4.4)
i18n (>= 0.4.0) i18n (>= 0.4.0)
mime-types (~> 1.16) mime-types (~> 1.16)
@ -232,7 +224,7 @@ GEM
pusher (0.11.2) pusher (0.11.2)
multi_json (~> 1.0) multi_json (~> 1.0)
signature (~> 0.1.6) signature (~> 0.1.6)
rack (1.4.1) rack (1.4.3)
rack-cache (1.2) rack-cache (1.2)
rack (>= 0.4) rack (>= 0.4)
rack-protection (1.3.2) rack-protection (1.3.2)
@ -241,9 +233,9 @@ GEM
rack rack
rack-test (0.6.2) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
railties (3.2.9) railties (3.2.11)
actionpack (= 3.2.9) actionpack (= 3.2.11)
activesupport (= 3.2.9) activesupport (= 3.2.11)
rack-ssl (~> 1.3.2) rack-ssl (~> 1.3.2)
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
@ -263,10 +255,10 @@ GEM
rspec-core (~> 2.12.0) rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0) rspec-expectations (~> 2.12.0)
rspec-mocks (~> 2.12.0) rspec-mocks (~> 2.12.0)
rspec-core (2.12.1) rspec-core (2.12.2)
rspec-expectations (2.12.0) rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3) diff-lcs (~> 1.1.3)
rspec-mocks (2.12.0) rspec-mocks (2.12.1)
sidekiq (2.5.4) sidekiq (2.5.4)
celluloid (~> 0.12.0) celluloid (~> 0.12.0)
connection_pool (~> 0.9.2) connection_pool (~> 0.9.2)
@ -286,7 +278,7 @@ GEM
rack (>= 1.0.0) rack (>= 1.0.0)
thor (0.14.6) thor (0.14.6)
tilt (1.3.3) tilt (1.3.3)
timers (1.0.1) timers (1.0.2)
treetop (1.4.12) treetop (1.4.12)
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
@ -306,7 +298,6 @@ DEPENDENCIES
bunny bunny
dalli dalli
database_cleaner (~> 0.8.0) database_cleaner (~> 0.8.0)
debugger
factory_girl (~> 2.4.0) factory_girl (~> 2.4.0)
foreman foreman
gh! gh!