Skip to content

Commit

Permalink
Merge pull request #147 from fluent/bundle_update
Browse files Browse the repository at this point in the history
bundle update
  • Loading branch information
uu59 committed Jan 28, 2015
2 parents db79a91 + ba6957e commit f7abfb2
Showing 1 changed file with 45 additions and 43 deletions.
88 changes: 45 additions & 43 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,27 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.1.8)
actionpack (= 4.1.8)
actionview (= 4.1.8)
actionmailer (4.1.9)
actionpack (= 4.1.9)
actionview (= 4.1.9)
mail (~> 2.5, >= 2.5.4)
actionpack (4.1.8)
actionview (= 4.1.8)
activesupport (= 4.1.8)
actionpack (4.1.9)
actionview (= 4.1.9)
activesupport (= 4.1.9)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionview (4.1.8)
activesupport (= 4.1.8)
actionview (4.1.9)
activesupport (= 4.1.9)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.8)
activesupport (= 4.1.8)
activemodel (4.1.9)
activesupport (= 4.1.9)
builder (~> 3.1)
activerecord (4.1.8)
activemodel (= 4.1.8)
activesupport (= 4.1.8)
activerecord (4.1.9)
activemodel (= 4.1.9)
activesupport (= 4.1.9)
arel (~> 5.0.0)
activesupport (4.1.8)
activesupport (4.1.9)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
Expand All @@ -59,7 +59,7 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
capybara-screenshot (1.0.3)
capybara-screenshot (1.0.4)
capybara (>= 1.0, < 3)
colored
launchy
Expand All @@ -68,12 +68,12 @@ GEM
cliver (0.3.2)
coderay (1.1.0)
colored (1.2)
cool.io (1.2.4)
cool.io (1.3.0)
crack (0.4.2)
safe_yaml (~> 1.0.0)
database_cleaner (1.2.0)
diff-lcs (1.2.5)
domain_name (0.5.22)
domain_name (0.5.23)
unf (>= 0.0.5, < 1.0.0)
draper (1.4.0)
actionpack (>= 3.0)
Expand All @@ -86,7 +86,7 @@ GEM
factory_girl_rails (4.5.0)
factory_girl (~> 4.5.0)
railties (>= 3.0.0)
fluentd (0.10.57)
fluentd (0.10.59)
cool.io (>= 1.1.1, < 2.0.0, != 1.2.0)
http_parser.rb (>= 0.5.1, < 0.7.0)
json (>= 1.4.3)
Expand All @@ -95,7 +95,7 @@ GEM
tzinfo (>= 1.0.0)
tzinfo-data (>= 1.0.0)
yajl-ruby (~> 1.0)
font-awesome-rails (4.2.0.0)
font-awesome-rails (4.3.0.0)
railties (>= 3.2, < 5.0)
haml (4.0.6)
tilt
Expand All @@ -109,17 +109,17 @@ GEM
domain_name (~> 0.5)
http_parser.rb (0.6.0)
httpclient (2.4.0)
i18n (0.6.11)
i18n (0.7.0)
i18n_generators (1.2.1)
mechanize
rails (>= 3.0.0)
jbuilder (2.2.5)
jbuilder (2.2.6)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
json (1.8.2)
kramdown (1.5.0)
kramdown-haml (0.0.3)
haml
Expand All @@ -138,13 +138,13 @@ GEM
webrobots (>= 0.0.9, < 0.2)
method_source (0.8.2)
mime-types (2.4.3)
mini_portile (0.6.1)
minitest (5.4.3)
msgpack (0.5.9)
mini_portile (0.6.2)
minitest (5.5.1)
msgpack (0.5.10)
multi_json (1.10.1)
net-http-digest_auth (1.4)
net-http-persistent (2.9.4)
nokogiri (1.6.5)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
ntlm-http (0.1.1)
poltergeist (1.5.1)
Expand All @@ -158,27 +158,27 @@ GEM
slop (~> 3.4)
pry-rails (0.3.2)
pry (>= 0.9.10)
puma (2.10.2)
puma (2.11.0)
rack (>= 1.1, < 2.0)
rack (1.5.2)
rack-test (0.6.2)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.1.8)
actionmailer (= 4.1.8)
actionpack (= 4.1.8)
actionview (= 4.1.8)
activemodel (= 4.1.8)
activerecord (= 4.1.8)
activesupport (= 4.1.8)
rails (4.1.9)
actionmailer (= 4.1.9)
actionpack (= 4.1.9)
actionview (= 4.1.9)
activemodel (= 4.1.9)
activerecord (= 4.1.9)
activesupport (= 4.1.9)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.8)
railties (= 4.1.9)
sprockets-rails (~> 2.0)
railties (4.1.8)
actionpack (= 4.1.8)
activesupport (= 4.1.8)
railties (4.1.9)
actionpack (= 4.1.9)
activesupport (= 4.1.9)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.1)
rake (10.4.2)
request_store (1.1.0)
rspec-collection_matchers (1.1.2)
rspec-expectations (>= 2.99.0.beta1)
Expand All @@ -188,7 +188,7 @@ GEM
rspec-its (1.0.1)
rspec-core (>= 2.99.0.beta1)
rspec-expectations (>= 2.99.0.beta1)
rspec-mocks (2.99.2)
rspec-mocks (2.99.3)
rspec-rails (2.99.0)
actionpack (>= 3.0)
activemodel (>= 3.0)
Expand Down Expand Up @@ -218,7 +218,7 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.2.2)
sprockets-rails (2.2.4)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
Expand All @@ -240,7 +240,9 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
webrobots (0.1.1)
websocket-driver (0.4.0)
websocket-driver (0.5.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.1)
xpath (2.0.0)
nokogiri (~> 1.3)
yajl-ruby (1.2.1)
Expand Down

0 comments on commit f7abfb2

Please sign in to comment.