From 2f47b2788bf51471eee19abde280e2795b44f01e Mon Sep 17 00:00:00 2001 From: Neil Gehani Date: Sun, 6 Dec 2015 23:00:17 -0800 Subject: [PATCH] Update to Ruby 2.2.3 and Rails 4.2.5 --- Gemfile | 4 +- Gemfile.lock | 213 +++++++++++++++++++++++++++++---------------------- 2 files changed, 122 insertions(+), 95 deletions(-) diff --git a/Gemfile b/Gemfile index 49a4aaa..4a774eb 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' -ruby '2.0.0' +ruby '2.2.3' #previously 2.0.0 # Application gems -gem 'rails', '4.0.0' +gem 'rails', '4.2.5' #previously 4.0.0 gem 'jquery-rails' gem 'devise' gem 'simple_form', '~> 3.0.0.rc' diff --git a/Gemfile.lock b/Gemfile.lock index 371f50b..09a86ae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,46 +1,58 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.0.0) - actionpack (= 4.0.0) - mail (~> 2.5.3) - actionpack (4.0.0) - activesupport (= 4.0.0) - builder (~> 3.1.0) - erubis (~> 2.7.0) - rack (~> 1.5.2) + actionmailer (4.2.5) + actionpack (= 4.2.5) + actionview (= 4.2.5) + activejob (= 4.2.5) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.5) + actionview (= 4.2.5) + activesupport (= 4.2.5) + rack (~> 1.6) rack-test (~> 0.6.2) - activemodel (4.0.0) - activesupport (= 4.0.0) - builder (~> 3.1.0) - activerecord (4.0.0) - activemodel (= 4.0.0) - activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.0) - arel (~> 4.0.0) - activerecord-deprecated_finders (1.0.3) - activesupport (4.0.0) - i18n (~> 0.6, >= 0.6.4) - minitest (~> 4.2) - multi_json (~> 1.3) - thread_safe (~> 0.1) - tzinfo (~> 0.3.37) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.5) + activesupport (= 4.2.5) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (4.2.5) + activesupport (= 4.2.5) + globalid (>= 0.3.0) + activemodel (4.2.5) + activesupport (= 4.2.5) + builder (~> 3.1) + activerecord (4.2.5) + activemodel (= 4.2.5) + activesupport (= 4.2.5) + arel (~> 6.0) + activesupport (4.2.5) + i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) acts_as_follower (0.2.1) - arel (4.0.1) + arel (6.0.3) aws-sdk (1.5.8) httparty (~> 0.7) json (~> 1.4) nokogiri (>= 1.4.4) uuidtools (~> 2.1) - bcrypt-ruby (3.1.2) - better_errors (1.0.1) + bcrypt (3.1.10) + better_errors (2.1.1) coderay (>= 1.0.0) erubis (>= 2.6.6) + rack (>= 0.9.0) bootstrap-sass (3.0.3.0) sass (~> 3.2) bootstrap-will_paginate (0.0.10) will_paginate - builder (3.1.4) + builder (3.2.2) climate_control (0.0.3) activesupport (>= 3.0) cocaine (0.5.8) @@ -49,47 +61,52 @@ GEM coffee-rails (4.0.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) - coffee-script (2.2.0) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.6.3) - devise (3.1.2) - bcrypt-ruby (~> 3.0) + coffee-script-source (1.10.0) + devise (3.5.2) + bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) + responders thread_safe (~> 0.1) warden (~> 1.2.3) erubis (2.7.0) - execjs (2.0.2) + execjs (2.6.0) faker (1.2.0) i18n (~> 0.5) + globalid (0.3.6) + activesupport (>= 4.1.0) hike (1.2.3) - httparty (0.12.0) + httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) i18n (0.7.0) jbuilder (1.2.0) activesupport (>= 3.0.0) - jquery-rails (3.0.4) - railties (>= 3.0, < 5.0) + jquery-rails (4.0.5) + rails-dom-testing (~> 1.0) + railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-turbolinks (2.0.1) + jquery-turbolinks (2.1.0) railties (>= 3.1.0) turbolinks - json (1.8.1) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) - masonry-rails (0.2.1) - rails - mime-types (1.25.1) + json (1.8.3) + loofah (2.0.3) + nokogiri (>= 1.5.9) + mail (2.6.3) + mime-types (>= 1.16, < 3) + masonry-rails (0.2.4) + railties + mime-types (2.99) mimemagic (0.3.0) - mini_portile (0.5.2) - minitest (4.7.5) + mini_portile2 (2.0.0) + minitest (5.8.3) multi_json (1.11.2) multi_xml (0.5.5) - nokogiri (1.6.0) - mini_portile (~> 0.5.0) + nokogiri (1.6.7) + mini_portile2 (~> 2.0.0.rc2) orm_adapter (0.5.0) paperclip (4.3.2) activemodel (>= 3.2.0) @@ -97,71 +114,81 @@ GEM cocaine (~> 0.5.5) mime-types mimemagic (= 0.3.0) - pg (0.17.0) - polyglot (0.3.3) - protected_attributes (1.0.3) - activemodel (>= 4.0.0, < 5.0) - rack (1.5.2) - rack-test (0.6.2) + pg (0.18.4) + protected_attributes (1.1.3) + activemodel (>= 4.0.1, < 5.0) + rack (1.6.4) + rack-test (0.6.3) rack (>= 1.0) - rails (4.0.0) - actionmailer (= 4.0.0) - actionpack (= 4.0.0) - activerecord (= 4.0.0) - activesupport (= 4.0.0) + rails (4.2.5) + actionmailer (= 4.2.5) + actionpack (= 4.2.5) + actionview (= 4.2.5) + activejob (= 4.2.5) + activemodel (= 4.2.5) + activerecord (= 4.2.5) + activesupport (= 4.2.5) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.0) - sprockets-rails (~> 2.0.0) - rails_12factor (0.0.2) + railties (= 4.2.5) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.7) + activesupport (>= 4.2.0.beta, < 5.0) + nokogiri (~> 1.6.0) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.2) + loofah (~> 2.0) + rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging - rails_serve_static_assets (0.0.1) - rails_stdout_logging (0.0.3) - railties (4.0.0) - actionpack (= 4.0.0) - activesupport (= 4.0.0) + rails_serve_static_assets (0.0.4) + rails_stdout_logging (0.0.4) + railties (4.2.5) + actionpack (= 4.2.5) + activesupport (= 4.2.5) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.1.0) - rdoc (3.12.2) - json (~> 1.4) - sass (3.2.12) - sass-rails (4.0.1) + rake (10.4.2) + rdoc (4.2.0) + responders (2.1.0) + railties (>= 4.2.0, < 5) + sass (3.2.19) + sass-rails (4.0.5) railties (>= 4.0.0, < 5.0) - sass (>= 3.1.10) - sprockets-rails (~> 2.0.0) - sdoc (0.3.20) - json (>= 1.1.3) - rdoc (~> 3.10) - simple_form (3.0.1) - actionpack (>= 4.0.0, < 4.1) - activemodel (>= 4.0.0, < 4.1) - sprockets (2.10.1) + sass (~> 3.2.2) + sprockets (~> 2.8, < 3.0) + sprockets-rails (~> 2.0) + sdoc (0.4.1) + json (~> 1.7, >= 1.7.7) + rdoc (~> 4.0) + simple_form (3.0.4) + actionpack (~> 4.0) + activemodel (~> 4.0) + sprockets (2.12.4) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.0.1) + sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) - sprockets (~> 2.8) - sqlite3 (1.3.8) - thor (0.18.1) + sprockets (>= 2.8, < 4.0) + sqlite3 (1.3.11) + thor (0.19.1) thread_safe (0.3.5) tilt (1.4.1) - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) - turbolinks (2.0.0) + turbolinks (2.5.3) coffee-rails - tzinfo (0.3.46) - uglifier (2.3.2) + tzinfo (1.2.2) + thread_safe (~> 0.1) + uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) - uuidtools (2.1.4) + uuidtools (2.1.5) warden (1.2.3) rack (>= 1.0) - will_paginate (3.0.3) + will_paginate (3.0.7) PLATFORMS ruby @@ -182,7 +209,7 @@ DEPENDENCIES paperclip (~> 4.3) pg protected_attributes - rails (= 4.0.0) + rails (= 4.2.5) rails_12factor sass-rails (~> 4.0.0) sdoc