diff --git a/Gemfile b/Gemfile index 3a64dab..a1197f4 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '3.2.11' +gem 'rails', '3.2.17' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' diff --git a/Gemfile.lock b/Gemfile.lock index 6906f7f..f959450 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,32 +1,32 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.11) - actionpack (= 3.2.11) - mail (~> 2.4.4) - actionpack (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) + actionmailer (3.2.17) + actionpack (= 3.2.17) + mail (~> 2.5.4) + actionpack (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) - rack (~> 1.4.0) + rack (~> 1.4.5) rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.11) - activesupport (= 3.2.11) + activemodel (3.2.17) + activesupport (= 3.2.17) builder (~> 3.0.0) - activerecord (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) + activerecord (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) - activesupport (3.2.11) - i18n (~> 0.6) + activeresource (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) + activesupport (3.2.17) + i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) arel (3.0.3) builder (3.0.4) @@ -54,6 +54,7 @@ GEM coffee-script-source (1.7.0) colorize (0.7.3) commonjs (0.2.7) + concurrent-ruby (1.1.5) dalli (2.7.2) erubis (2.7.0) execjs (2.2.0) @@ -61,12 +62,13 @@ GEM httparty (0.13.1) json (~> 1.8) multi_xml (>= 0.5.2) - i18n (0.6.9) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) jquery-rails (3.1.0) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.1) + json (1.8.6) kgio (2.9.2) less (2.5.1) commonjs (~> 0.2.7) @@ -74,13 +76,12 @@ GEM actionpack (>= 3.1) less (~> 2.5.0) libv8 (3.16.14.3) - mail (2.4.4) - i18n (>= 0.4.0) + mail (2.5.5) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25.1) mini_portile (0.6.0) - multi_json (1.10.1) + multi_json (1.14.1) multi_xml (0.5.5) net-scp (1.2.1) net-ssh (>= 2.6.5) @@ -88,30 +89,30 @@ GEM nokogiri (1.6.2.1) mini_portile (= 0.6.0) polyglot (0.3.5) - rack (1.4.5) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.9.0) rack (>= 0.4) rack-ssl (1.3.4) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) - rails (3.2.11) - actionmailer (= 3.2.11) - actionpack (= 3.2.11) - activerecord (= 3.2.11) - activeresource (= 3.2.11) - activesupport (= 3.2.11) + rails (3.2.17) + actionmailer (= 3.2.17) + actionpack (= 3.2.17) + activerecord (= 3.2.17) + activeresource (= 3.2.17) + activesupport (= 3.2.17) bundler (~> 1.0) - railties (= 3.2.11) - railties (3.2.11) - actionpack (= 3.2.11) - activesupport (= 3.2.11) + railties (= 3.2.17) + railties (3.2.17) + actionpack (= 3.2.17) + activesupport (= 3.2.17) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) raindrops (0.13.0) - rake (10.3.2) + rake (13.0.0) rdoc (3.12.2) json (~> 1.4) ref (1.0.5) @@ -120,7 +121,7 @@ GEM railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - sprockets (2.2.2) + sprockets (2.2.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -133,7 +134,7 @@ GEM therubyracer (0.12.1) libv8 (~> 3.16.14.0) ref - thor (0.19.1) + thor (0.20.3) tilt (1.4.1) treetop (1.4.15) polyglot @@ -143,7 +144,7 @@ GEM execjs rails (>= 3.1) railties (>= 3.1) - tzinfo (0.3.39) + tzinfo (0.3.55) uglifier (2.5.1) execjs (>= 0.3.0) json (>= 1.8.0) @@ -166,7 +167,7 @@ DEPENDENCIES jquery-rails less-rails nokogiri - rails (= 3.2.11) + rails (= 3.2.17) sass-rails (~> 3.2.3) sqlite3 therubyracer