Skip to content

Commit

Permalink
update gems
Browse files Browse the repository at this point in the history
  • Loading branch information
@drhenner
drhenner committed Apr 5, 2014
1 parent 96132fd commit b648af7
Show file tree
Hide file tree
Showing 2 changed files with 80 additions and 76 deletions.
2 changes: 1 addition & 1 deletion Gemfile
View file
Expand Up @@ -2,7 +2,7 @@ source 'http://rubygems.org'
ruby "2.0.0"

## Bundle rails:
gem 'rails', '4.0.2'
gem 'rails', '4.0.4'

gem 'uglifier', '>= 1.3.0'
gem 'sass-rails', '~> 4.0.0'
Expand Down
154 changes: 79 additions & 75 deletions Gemfile.lock
View file
Expand Up @@ -9,28 +9,29 @@ GIT

GIT
remote: https://github.com/Compass/compass-rails.git
revision: e7fce026f270955a636c14e011068fc94bb6c36f
revision: ab84a09c0b84cc979e78540be7bfcb386ef5047d
specs:
compass-rails (1.1.2)
compass-rails (2.0.0.pre)
compass (>= 0.12.2)
sprockets (<= 2.11.0)

GEM
remote: http://rubygems.org/
specs:
Ascii85 (1.0.2)
RedCloth (4.2.9)
actionmailer (4.0.2)
actionpack (= 4.0.2)
actionmailer (4.0.4)
actionpack (= 4.0.4)
mail (~> 2.5.4)
actionpack (4.0.2)
activesupport (= 4.0.2)
actionpack (4.0.4)
activesupport (= 4.0.4)
builder (~> 3.1.0)
erubis (~> 2.7.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionpack-page_caching (1.0.2)
actionpack (>= 4.0.0, < 5)
active_utils (2.0.1)
active_utils (2.0.2)
activesupport (>= 2.3.11)
i18n
activemerchant (1.29.3)
Expand All @@ -41,33 +42,32 @@ GEM
json (>= 1.5.1)
money
nokogiri
activemodel (4.0.2)
activesupport (= 4.0.2)
activemodel (4.0.4)
activesupport (= 4.0.4)
builder (~> 3.1.0)
activerecord (4.0.2)
activemodel (= 4.0.2)
activerecord (4.0.4)
activemodel (= 4.0.4)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.2)
activesupport (= 4.0.4)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.2)
i18n (~> 0.6, >= 0.6.4)
activesupport (4.0.4)
i18n (~> 0.6, >= 0.6.9)
minitest (~> 4.2)
multi_json (~> 1.3)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
addressable (2.3.5)
addressable (2.3.6)
afm (0.2.0)
american_date (1.1.0)
arel (4.0.1)
arel (4.0.2)
asset_sync (1.0.0)
activemodel
fog (>= 1.8.0)
atomic (1.1.14)
autotest-rails-pure (4.1.2)
awesome_nested_set (3.0.0.rc.3)
activerecord (>= 4.0.0, < 5)
aws-sdk (1.32.0)
aws-sdk (1.38.0)
json (~> 1.4)
nokogiri (>= 1.4.4)
uuidtools (~> 2.1)
Expand All @@ -86,94 +86,99 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
childprocess (0.4.0)
childprocess (0.5.2)
ffi (~> 1.0, >= 1.0.11)
choice (0.1.6)
chronic (0.10.2)
chunky_png (1.2.9)
chunky_png (1.3.0)
climate_control (0.0.3)
activesupport (>= 3.0)
cocaine (0.5.3)
cocaine (0.5.4)
climate_control (>= 0.0.3, < 1.0)
coderay (1.1.0)
columnize (0.3.6)
compass (0.12.2)
compass (0.12.4)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
sass (~> 3.2.17)
database_cleaner (1.2.0)
debug_inspector (0.0.2)
debugger (1.6.5)
debugger (1.6.6)
columnize (>= 0.3.1)
debugger-linecache (~> 1.2.0)
debugger-ruby_core_source (~> 1.3.1)
debugger-ruby_core_source (~> 1.3.2)
debugger-linecache (1.2.0)
debugger-ruby_core_source (1.3.1)
debugger-ruby_core_source (1.3.2)
diff-lcs (1.1.3)
dynamic_form (1.1.4)
email_spec (1.5.0)
launchy (~> 2.1)
mail (~> 2.2)
erubis (2.7.0)
excon (0.31.0)
excon (0.32.1)
execjs (2.0.2)
factory_girl (3.3.0)
activesupport (>= 3.0.0)
factory_girl_rails (3.3.0)
factory_girl (~> 3.3.0)
railties (>= 3.0.0)
faker (1.2.0)
faker (1.3.0)
i18n (~> 0.5)
ffi (1.9.3)
fog (1.19.0)
fog (1.21.0)
fog-brightbox
fog-core (~> 1.21, >= 1.21.1)
fog-json
nokogiri (~> 1.5, >= 1.5.11)
fog-brightbox (0.0.1)
fog-core
fog-json
fog-core (1.21.1)
builder
excon (~> 0.31.0)
excon (~> 0.32)
formatador (~> 0.2.0)
mime-types
multi_json (~> 1.0)
net-scp (~> 1.1)
net-ssh (>= 2.1.3)
nokogiri (~> 1.5)
ruby-hmac
fog-json (1.0.0)
multi_json (~> 1.0)
formatador (0.2.4)
friendly_id (5.0.2)
activerecord (~> 4.0.0)
friendly_id (5.0.3)
activerecord (>= 4.0.0)
fssm (0.2.10)
hashery (2.1.1)
hike (1.2.3)
i18n (0.6.9)
jbuilder (2.0.2)
jbuilder (2.0.5)
activesupport (>= 3.0.0)
multi_json (>= 1.2.0)
jquery-rails (3.0.4)
jquery-rails (3.1.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (4.1.1)
railties (>= 3.1.0)
jquery-ui-rails (4.2.0)
railties (>= 3.2.16)
json (1.8.1)
launchy (2.4.2)
addressable (~> 2.3)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.2)
metaclass (0.0.4)
mime-types (1.25.1)
mini_portile (0.5.2)
mini_portile (0.5.3)
minitest (4.7.5)
mocha (0.13.3)
metaclass (~> 0.0.1)
monetize (0.1.3)
money (6.0.1)
money (6.1.1)
i18n (~> 0.6.4)
monetize (~> 0.1.3)
multi_json (1.8.4)
multi_json (1.9.2)
mysql2 (0.3.15)
net-scp (1.1.2)
net-ssh (>= 2.6.5)
net-ssh (2.7.0)
net-ssh (2.8.0)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
paperclip (3.5.3)
paperclip (3.5.4)
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
cocaine (~> 0.5.3)
Expand All @@ -185,21 +190,21 @@ GEM
ruby-rc4
ttfunk
pg (0.17.1)
polyglot (0.3.3)
polyglot (0.3.4)
prawn (0.12.0)
pdf-reader (>= 0.9.0)
ttfunk (~> 1.0.2)
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
railroady (1.1.1)
rails (4.0.2)
actionmailer (= 4.0.2)
actionpack (= 4.0.2)
activerecord (= 4.0.2)
activesupport (= 4.0.2)
rails (4.0.4)
actionmailer (= 4.0.4)
actionpack (= 4.0.4)
activerecord (= 4.0.4)
activesupport (= 4.0.4)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.2)
railties (= 4.0.4)
sprockets-rails (~> 2.0.0)
rails-erd (1.1.0)
activerecord (>= 3.0)
Expand All @@ -215,12 +220,12 @@ GEM
activesupport (>= 3.0)
rails_serve_static_assets (0.0.2)
rails_stdout_logging (0.0.3)
railties (4.0.2)
actionpack (= 4.0.2)
activesupport (= 4.0.2)
railties (4.0.4)
actionpack (= 4.0.4)
activesupport (= 4.0.4)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.1.1)
rake (10.2.2)
rmagick (2.13.2)
rspec-core (2.12.2)
rspec-expectations (2.12.1)
Expand All @@ -237,20 +242,20 @@ GEM
mocha (>= 0.9.8)
rspec-rails (>= 2.0.0)
ruby-graphviz (1.0.9)
ruby-hmac (0.4.0)
ruby-rc4 (0.1.5)
rubyzip (1.1.0)
sass (3.2.14)
sass-rails (4.0.1)
rubyzip (1.1.2)
sass (3.2.18)
sass-rails (4.0.3)
railties (>= 4.0.0, < 5.0)
sass (>= 3.1.10)
sprockets-rails (~> 2.0.0)
selenium-webdriver (2.39.0)
childprocess (>= 0.2.5)
sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0)
selenium-webdriver (2.41.0)
childprocess (>= 0.5.0)
multi_json (~> 1.0)
rubyzip (~> 1.0)
websocket (~> 1.0.4)
sprockets (2.10.1)
sprockets (2.11.0)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
Expand All @@ -259,26 +264,25 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
sqlite3 (1.3.8)
sqlite3 (1.3.9)
state_machine (1.2.0)
thor (0.18.1)
thread_safe (0.1.3)
atomic
thor (0.19.1)
thread_safe (0.3.2)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
ttfunk (1.0.3)
tzinfo (0.3.38)
uglifier (2.4.0)
tzinfo (0.3.39)
uglifier (2.5.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
uuidtools (2.1.4)
websocket (1.0.7)
will_paginate (3.0.5)
xpath (0.1.4)
nokogiri (~> 1.3)
yard (0.8.7.3)
yard (0.8.7.4)
zurb-foundation (4.3.2)
sass (>= 3.2.0)

Expand Down Expand Up @@ -322,7 +326,7 @@ DEPENDENCIES
pg
prawn (~> 0.12.0)
railroady
rails (= 4.0.2)
rails (= 4.0.4)
rails-erd
rails3-generators (~> 1.0.0)
rails_12factor
Expand Down

0 comments on commit b648af7

Please sign in to comment.