diff --git a/Gemfile b/Gemfile index c471a1a..307730a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -RAILS_VERSION = '~> 3.2.17' +RAILS_VERSION = '~> 3.2.18' gem 'actionmailer', RAILS_VERSION gem 'actionpack', RAILS_VERSION diff --git a/Gemfile.lock b/Gemfile.lock index 6c48733..9625a89 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,16 +1,16 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.17) - actionpack (= 3.2.17) + actionmailer (3.2.18) + actionpack (= 3.2.18) mail (~> 2.5.4) actionmailer_inline_css (1.5.3) actionmailer (>= 3.0.0) nokogiri (>= 1.4.4) premailer (>= 1.7.1) - actionpack (3.2.17) - activemodel (= 3.2.17) - activesupport (= 3.2.17) + actionpack (3.2.18) + activemodel (= 3.2.18) + activesupport (= 3.2.18) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -18,18 +18,18 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.17) - activesupport (= 3.2.17) + activemodel (3.2.18) + activesupport (= 3.2.18) builder (~> 3.0.0) - activerecord (3.2.17) - activemodel (= 3.2.17) - activesupport (= 3.2.17) + activerecord (3.2.18) + activemodel (= 3.2.18) + activesupport (= 3.2.18) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.17) - activemodel (= 3.2.17) - activesupport (= 3.2.17) - activesupport (3.2.17) + activeresource (3.2.18) + activemodel (= 3.2.18) + activesupport (= 3.2.18) + activesupport (3.2.18) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) addressable (2.3.5) @@ -183,7 +183,7 @@ GEM rails (>= 3.2.0) railties (>= 3.2.0) moped (1.5.1) - multi_json (1.9.2) + multi_json (1.10.0) multi_xml (0.5.5) multipart-post (1.2.0) net-scp (1.1.2) @@ -250,30 +250,30 @@ GEM rack (>= 0.4) rack-contrib (1.1.0) rack (>= 0.9.1) - rack-ssl (1.3.3) + rack-ssl (1.3.4) rack rack-ssl-enforcer (0.2.6) rack-test (0.6.2) rack (>= 1.0) - rails (3.2.17) - actionmailer (= 3.2.17) - actionpack (= 3.2.17) - activerecord (= 3.2.17) - activeresource (= 3.2.17) - activesupport (= 3.2.17) + rails (3.2.18) + actionmailer (= 3.2.18) + actionpack (= 3.2.18) + activerecord (= 3.2.18) + activeresource (= 3.2.18) + activesupport (= 3.2.18) bundler (~> 1.0) - railties (= 3.2.17) + railties (= 3.2.18) rails_autolink (1.1.4) rails (> 3.1) - railties (3.2.17) - actionpack (= 3.2.17) - activesupport (= 3.2.17) + railties (3.2.18) + actionpack (= 3.2.18) + activesupport (= 3.2.18) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) raindrops (0.12.0) - rake (10.1.1) + rake (10.3.1) rbx-require-relative (0.0.9) rdoc (3.12.2) json (~> 1.4) @@ -330,7 +330,7 @@ GEM therubyracer (0.12.0) libv8 (~> 3.16.14.0) ref - thor (0.18.1) + thor (0.19.1) thread_safe (0.1.3) atomic tilt (1.4.1) @@ -342,7 +342,7 @@ GEM turbo-sprockets-rails3 (0.3.10) railties (> 3.2.8, < 4.0.0) sprockets (>= 2.0.0) - tzinfo (0.3.38) + tzinfo (0.3.39) uglifier (2.2.1) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) @@ -366,9 +366,9 @@ PLATFORMS ruby DEPENDENCIES - actionmailer (~> 3.2.17) + actionmailer (~> 3.2.18) actionmailer_inline_css - actionpack (~> 3.2.17) + actionpack (~> 3.2.18) airbrake better_errors binding_of_caller @@ -413,7 +413,7 @@ DEPENDENCIES rack-ssl rack-ssl-enforcer rails_autolink - railties (~> 3.2.17) + railties (~> 3.2.18) ri_cal rspec-rails ruby-debug -- libgit2 0.21.2