From 124937bc7f68f1b153f6e74667686e48fa083bb9 Mon Sep 17 00:00:00 2001 From: benji Date: Tue, 1 Dec 2015 21:54:35 +0100 Subject: [PATCH] Update to ruby 2.2.3 and rails 4.2.4 --- .ruby-version | 2 +- Gemfile | 2 +- Gemfile.lock | 259 +++++++++++++++++++++++++------------------------- 3 files changed, 133 insertions(+), 130 deletions(-) diff --git a/.ruby-version b/.ruby-version index b1b25a5..5859406 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.2.2 +2.2.3 diff --git a/Gemfile b/Gemfile index d539375..634887f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '4.2' +gem 'rails', '4.2.4' # Assets gem 'sass-rails', '~> 4.0.3' diff --git a/Gemfile.lock b/Gemfile.lock index 36375cb..810cdc3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,48 +1,48 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.0) - actionpack (= 4.2.0) - actionview (= 4.2.0) - activejob (= 4.2.0) + actionmailer (4.2.4) + actionpack (= 4.2.4) + actionview (= 4.2.4) + activejob (= 4.2.4) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.0) - actionview (= 4.2.0) - activesupport (= 4.2.0) - rack (~> 1.6.0) + actionpack (4.2.4) + actionview (= 4.2.4) + activesupport (= 4.2.4) + rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.1) - actionview (4.2.0) - activesupport (= 4.2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.4) + activesupport (= 4.2.4) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.1) - activejob (4.2.0) - activesupport (= 4.2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (4.2.4) + activesupport (= 4.2.4) globalid (>= 0.3.0) - activemodel (4.2.0) - activesupport (= 4.2.0) + activemodel (4.2.4) + activesupport (= 4.2.4) builder (~> 3.1) - activerecord (4.2.0) - activemodel (= 4.2.0) - activesupport (= 4.2.0) + activerecord (4.2.4) + activemodel (= 4.2.4) + activesupport (= 4.2.4) arel (~> 6.0) - activesupport (4.2.0) + activesupport (4.2.4) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - airbrake (4.1.0) + airbrake (4.3.4) builder multi_json - annotate (2.6.5) - activerecord (>= 2.3.0) - rake (>= 0.8.7) - arel (6.0.0) + annotate (2.6.10) + activerecord (>= 3.2, <= 4.3) + rake (~> 10.4) + arel (6.0.3) bcrypt (3.1.10) bcrypt (3.1.10-x64-mingw32) bootstrap-sass (3.2.0.0) @@ -50,18 +50,17 @@ GEM bootstrap-will_paginate (0.0.10) will_paginate builder (3.2.2) - cancancan (1.10.1) - capistrano (3.3.5) - capistrano-stats (~> 1.1.0) + cancancan (1.13.1) + capistrano (3.4.0) i18n rake (>= 10.0.0) sshkit (~> 1.3) capistrano-bundler (1.1.4) capistrano (~> 3.1) sshkit (~> 1.2) - capistrano-passenger (0.0.2) + capistrano-passenger (0.1.1) capistrano (~> 3.0) - capistrano-rails (1.1.2) + capistrano-rails (1.1.5) capistrano (~> 3.1) capistrano-bundler (~> 1.1) capistrano-rbenv (2.0.3) @@ -70,36 +69,36 @@ GEM capistrano-rvm (0.1.2) capistrano (~> 3.0) sshkit (~> 1.2) - capistrano-stats (1.1.1) - chunky_png (1.3.4) + chunky_png (1.3.5) climate_control (0.0.3) activesupport (>= 3.0) - cocaine (0.5.5) + cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) - codeclimate-test-reporter (0.4.7) + codeclimate-test-reporter (0.4.8) simplecov (>= 0.7.1, < 1.0.0) coderay (1.1.0) - coffee-rails (4.0.1) + coffee-rails (4.1.0) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) - coffee-script (2.3.0) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.0) - colorize (0.7.5) - coveralls (0.7.11) - multi_json (~> 1.10) + coffee-script-source (1.10.0) + colorize (0.7.7) + coveralls (0.8.10) + json (~> 1.8) rest-client (>= 1.6.8, < 2) - simplecov (~> 0.9.1) + simplecov (~> 0.11.0) term-ansicolor (~> 1.3) thor (~> 0.19.1) + tins (~> 1.6.0) daemons (1.2.3) - delayed_job (4.0.6) + delayed_job (4.1.1) activesupport (>= 3.0, < 5.0) - delayed_job_active_record (4.0.3) - activerecord (>= 3.0, < 5.0) - delayed_job (>= 3.0, < 4.1) - devise (3.4.1) + delayed_job_active_record (4.1.0) + activerecord (>= 3.0, < 5) + delayed_job (>= 3.0, < 5) + devise (3.5.2) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) @@ -108,8 +107,10 @@ GEM warden (~> 1.2.3) diff-lcs (1.2.5) docile (1.1.5) + domain_name (0.5.25) + unf (>= 0.0.5, < 1.0.0) erubis (2.7.0) - execjs (2.3.0) + execjs (2.6.0) factory_girl (4.5.0) activesupport (>= 3.0.0) factory_girl_rails (4.5.0) @@ -117,12 +118,12 @@ GEM railties (>= 3.0.0) faker (1.4.2) i18n (~> 0.5) - faraday (0.9.1) + faraday (0.9.2) multipart-post (>= 1.2, < 3) - ffi (1.9.6-x64-mingw32) + ffi (1.9.10-x64-mingw32) friendly_id (5.1.0) activerecord (>= 4.0.0) - globalid (0.3.2) + globalid (0.3.6) activesupport (>= 4.1.0) haml (4.0.7) tilt @@ -132,45 +133,49 @@ GEM haml (>= 4.0.6, < 5.0) html2haml (>= 1.0.1) railties (>= 4.0.1) - hashie (3.4.0) + hashie (3.4.3) hike (1.2.3) html2haml (2.0.0) erubis (~> 2.7.0) haml (~> 4.0.0) nokogiri (~> 1.6.0) ruby_parser (~> 3.5) - httparty (0.13.3) + http-cookie (1.0.2) + domain_name (~> 0.5) + httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) i18n (0.7.0) - identicon (0.0.3) + identicon (0.0.5) chunky_png - jquery-rails (4.0.3) + jquery-rails (4.0.5) rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.2) - jwt (1.4.1) - loofah (2.0.1) + json (1.8.3) + jwt (1.5.2) + loofah (2.0.3) nokogiri (>= 1.5.9) mail (2.6.3) mime-types (>= 1.16, < 3) method_source (0.8.2) - mime-types (2.4.3) - mini_portile (0.6.2) - minitest (5.5.1) - multi_json (1.10.1) + mime-types (2.99) + mimemagic (0.3.0) + mini_portile2 (2.0.0) + minitest (5.8.3) + multi_json (1.11.2) multi_xml (0.5.5) multipart-post (2.0.0) - mysql2 (0.3.17) + mysql2 (0.4.2) + mysql2 (0.4.2-x64-mingw32) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (2.9.2) - netrc (0.10.3) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) - nokogiri (1.6.6.2-x64-mingw32) - mini_portile (~> 0.6.0) + net-ssh (3.0.1) + netrc (0.11.0) + nokogiri (1.6.7) + mini_portile2 (~> 2.0.0.rc2) + nokogiri (1.6.7-x64-mingw32) + mini_portile2 (~> 2.0.0.rc2) oauth2 (1.0.0) faraday (>= 0.8, < 0.10) jwt (~> 1.0) @@ -180,85 +185,80 @@ GEM omniauth (1.2.2) hashie (>= 1.2, < 4) rack (~> 1.0) - omniauth-oauth2 (1.2.0) - faraday (>= 0.8, < 0.10) - multi_json (~> 1.3) + omniauth-oauth2 (1.4.0) oauth2 (~> 1.0) omniauth (~> 1.2) orm_adapter (0.5.0) - paperclip (4.2.1) - activemodel (>= 3.0.0) - activesupport (>= 3.0.0) - cocaine (~> 0.5.3) + paperclip (4.3.2) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + cocaine (~> 0.5.5) mime-types - pry (0.10.1) + mimemagic (= 0.3.0) + pry (0.10.3) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - pry (0.10.1-x64-mingw32) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - win32console (~> 1.3) pry-rails (0.3.4) pry (>= 0.9.10) - rack (1.6.0) + rack (1.6.4) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.0) - actionmailer (= 4.2.0) - actionpack (= 4.2.0) - actionview (= 4.2.0) - activejob (= 4.2.0) - activemodel (= 4.2.0) - activerecord (= 4.2.0) - activesupport (= 4.2.0) + rails (4.2.4) + actionmailer (= 4.2.4) + actionpack (= 4.2.4) + actionview (= 4.2.4) + activejob (= 4.2.4) + activemodel (= 4.2.4) + activerecord (= 4.2.4) + activesupport (= 4.2.4) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.0) + railties (= 4.2.4) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.5) + 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.1) + rails-html-sanitizer (1.0.2) loofah (~> 2.0) - railties (4.2.0) - actionpack (= 4.2.0) - activesupport (= 4.2.0) + railties (4.2.4) + actionpack (= 4.2.4) + activesupport (= 4.2.4) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.4.2) rdoc (4.2.0) - json (~> 1.4) responders (2.1.0) railties (>= 4.2.0, < 5) - rest-client (1.7.3) + rest-client (1.8.0) + http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) - rest-client (1.7.3-x64-mingw32) + rest-client (1.8.0-x64-mingw32) ffi (~> 1.9) + http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) - rspec-core (3.3.2) - rspec-support (~> 3.3.0) - rspec-expectations (3.3.1) + rspec-core (3.4.1) + rspec-support (~> 3.4.0) + rspec-expectations (3.4.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.3.0) - rspec-mocks (3.3.2) + rspec-support (~> 3.4.0) + rspec-mocks (3.4.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.3.0) - rspec-rails (3.3.3) + rspec-support (~> 3.4.0) + rspec-rails (3.4.0) actionpack (>= 3.0, < 4.3) activesupport (>= 3.0, < 4.3) railties (>= 3.0, < 4.3) - rspec-core (~> 3.3.0) - rspec-expectations (~> 3.3.0) - rspec-mocks (~> 3.3.0) - rspec-support (~> 3.3.0) - rspec-support (3.3.0) - ruby_parser (3.7.1) + rspec-core (~> 3.4.0) + rspec-expectations (~> 3.4.0) + rspec-mocks (~> 3.4.0) + rspec-support (~> 3.4.0) + rspec-support (3.4.1) + ruby_parser (3.7.2) sexp_processor (~> 4.1) sass (3.2.19) sass-rails (4.0.5) @@ -270,45 +270,48 @@ GEM json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) sexp_processor (4.6.0) - simplecov (0.9.2) + simplecov (0.11.0) docile (~> 1.1.0) - multi_json (~> 1.0) - simplecov-html (~> 0.9.0) - simplecov-html (0.9.0) + json (~> 1.8) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) slop (3.6.0) - spring (1.3.1) - sprockets (2.12.3) + spring (1.5.0) + sprockets (2.12.4) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.4) + sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - sqlite3 (1.3.10) - sqlite3 (1.3.10-x64-mingw32) - sshkit (1.6.1) + sqlite3 (1.3.11) + sqlite3 (1.3.11-x64-mingw32) + sshkit (1.7.1) colorize (>= 0.7.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) - term-ansicolor (1.3.0) + term-ansicolor (1.3.2) tins (~> 1.0) thor (0.19.1) - thread_safe (0.3.4) + thread_safe (0.3.5) tilt (1.4.1) - tins (1.3.5) + tins (1.6.0) turbolinks (2.5.3) coffee-rails tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.7.0) + uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.1) + unf_ext (0.0.7.1-x64-mingw32) warden (1.2.3) rack (>= 1.0) will_paginate (3.0.7) - win32console (1.3.2) PLATFORMS ruby @@ -342,7 +345,7 @@ DEPENDENCIES omniauth-oauth2 paperclip pry-rails - rails (= 4.2) + rails (= 4.2.4) rspec-rails sass-rails (~> 4.0.3) sdoc (~> 0.4.0)