diff --git a/Gemfile b/Gemfile index 8c8ea68..caec9e4 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '3.2.8' +gem 'rails', '3.2.22.5' gem 'haml-rails' gem 'jquery-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 454af32..f910005 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,35 +1,38 @@ GEM remote: http://rubygems.org/ specs: - actionmailer (3.2.8) - actionpack (= 3.2.8) - mail (~> 2.4.4) - actionpack (3.2.8) - activemodel (= 3.2.8) - activesupport (= 3.2.8) + actionmailer (3.2.22.5) + actionpack (= 3.2.22.5) + mail (~> 2.5.4) + actionpack (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) 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.1.3) - activemodel (3.2.8) - activesupport (= 3.2.8) + sprockets (~> 2.2.1) + activemodel (3.2.22.5) + activesupport (= 3.2.22.5) builder (~> 3.0.0) - activerecord (3.2.8) - activemodel (= 3.2.8) - activesupport (= 3.2.8) + activerecord (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.8) - activemodel (= 3.2.8) - activesupport (= 3.2.8) - activesupport (3.2.8) - i18n (~> 0.6) + activeresource (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) + activesupport (3.2.22.5) + i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) - arel (3.0.2) - builder (3.0.0) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + arel (3.0.3) + buftok (0.2.0) + builder (3.0.4) coderay (1.0.7) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -39,8 +42,12 @@ GEM execjs coffee-script-source (1.3.3) commonjs (0.2.6) + concurrent-ruby (1.1.5) daemons (1.1.9) diff-lcs (1.1.3) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + equalizer (0.0.11) erubis (2.7.0) eventmachine (0.12.10) execjs (1.4.0) @@ -50,8 +57,6 @@ GEM factory_girl_rails (3.5.0) factory_girl (~> 3.5.0) railties (>= 3.0.0) - faraday (0.8.1) - multipart-post (~> 1.1) geocoder (1.1.2) haml (3.1.6) haml-rails (0.3.4) @@ -60,13 +65,23 @@ GEM haml (~> 3.0) railties (~> 3.0) hashie (1.2.0) - hike (1.2.1) - i18n (0.6.0) + hike (1.2.3) + http (3.3.0) + addressable (~> 2.3) + http-cookie (~> 1.0) + http-form_data (~> 2.0) + http_parser.rb (~> 0.6.0) + http-cookie (1.0.3) + domain_name (~> 0.5) + http-form_data (2.1.1) + http_parser.rb (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) jquery-rails (2.0.2) railties (>= 3.2.0, < 5.0) thor (~> 0.14) - json (1.7.4) + json (1.8.6) less (2.2.1) commonjs (~> 0.2.6) less-rails (2.2.3) @@ -77,14 +92,16 @@ GEM less-rails-bootswatch (0.2.7) less-rails-bootstrap (~> 2.0.13) libv8 (3.3.10.4) - mail (2.4.4) - i18n (>= 0.4.0) + mail (2.5.5) mime-types (~> 1.16) treetop (~> 1.4.8) + memoizable (0.4.2) + thread_safe (~> 0.3, >= 0.3.1) method_source (0.8) - mime-types (1.19) - multi_json (1.3.6) - multipart-post (1.1.5) + mime-types (1.25.1) + multi_json (1.14.1) + multipart-post (2.1.1) + naught (1.1.0) oauth (0.4.6) omniauth (1.1.0) hashie (~> 1.2) @@ -96,39 +113,40 @@ GEM multi_json (~> 1.3) omniauth-oauth (~> 1.0) pg (0.14.0) - polyglot (0.3.3) + polyglot (0.3.5) pry (0.9.10) coderay (~> 1.0.5) method_source (~> 0.8) slop (~> 3.3.1) pry-rails (0.2.1) pry (>= 0.9.10) + public_suffix (4.0.1) quiet_assets (1.0.1) railties (~> 3.1) - rack (1.4.1) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.9.0) rack (>= 0.4) - rack-ssl (1.3.2) + rack-ssl (1.3.4) rack - rack-test (0.6.1) + rack-test (0.6.3) rack (>= 1.0) - rails (3.2.8) - actionmailer (= 3.2.8) - actionpack (= 3.2.8) - activerecord (= 3.2.8) - activeresource (= 3.2.8) - activesupport (= 3.2.8) + rails (3.2.22.5) + actionmailer (= 3.2.22.5) + actionpack (= 3.2.22.5) + activerecord (= 3.2.22.5) + activeresource (= 3.2.22.5) + activesupport (= 3.2.22.5) bundler (~> 1.0) - railties (= 3.2.8) - railties (3.2.8) - actionpack (= 3.2.8) - activesupport (= 3.2.8) + railties (= 3.2.22.5) + railties (3.2.22.5) + actionpack (= 3.2.22.5) + activesupport (= 3.2.22.5) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (0.9.2.2) - rdoc (3.12) + rake (13.0.0) + rdoc (3.12.2) json (~> 1.4) rspec (2.11.0) rspec-core (~> 2.11.0) @@ -143,14 +161,15 @@ GEM activesupport (>= 3.0) railties (>= 3.0) rspec (~> 2.11.0) - simple_oauth (0.1.9) + simple_oauth (0.3.1) simplecov (0.6.4) multi_json (~> 1.0) simplecov-html (~> 0.5.3) simplecov-html (0.5.3) slop (3.3.2) - sprockets (2.1.3) + sprockets (2.2.3) hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.6) @@ -160,19 +179,30 @@ GEM daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.15.4) - tilt (1.3.3) - treetop (1.4.10) + thor (0.20.3) + thread_safe (0.3.6) + tilt (1.4.1) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - twitter (3.5.0) - faraday (~> 0.8) - multi_json (~> 1.3) - simple_oauth (~> 0.1.6) - tzinfo (0.3.33) + twitter (6.2.0) + addressable (~> 2.3) + buftok (~> 0.2.0) + equalizer (~> 0.0.11) + http (~> 3.0) + http-form_data (~> 2.0) + http_parser.rb (~> 0.6.0) + memoizable (~> 0.4.0) + multipart-post (~> 2.0) + naught (~> 1.0) + simple_oauth (~> 0.3.0) + tzinfo (0.3.55) uglifier (1.2.7) execjs (>= 0.3.0) multi_json (~> 1.3) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.6) PLATFORMS ruby @@ -193,7 +223,7 @@ DEPENDENCIES pry pry-rails quiet_assets - rails (= 3.2.8) + rails (= 3.2.22.5) rspec-rails simplecov sqlite3