From 244462f805a7b60e099a379d7214907f728a6e00 Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 15 Aug 2016 11:57:14 +0200 Subject: upgrade: rails to latest 4.2 series version --- Gemfile.lock | 82 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ff69a08..88be79b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -26,36 +26,36 @@ GEM remote: https://rubygems.org/ specs: SyslogLogger (2.0) - actionmailer (4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) + actionmailer (4.2.7.1) + actionpack (= 4.2.7.1) + actionview (= 4.2.7.1) + activejob (= 4.2.7.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.6) - actionview (= 4.2.6) - activesupport (= 4.2.6) + actionpack (4.2.7.1) + actionview (= 4.2.7.1) + activesupport (= 4.2.7.1) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.6) - activesupport (= 4.2.6) + actionview (4.2.7.1) + activesupport (= 4.2.7.1) 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.6) - activesupport (= 4.2.6) + activejob (4.2.7.1) + activesupport (= 4.2.7.1) globalid (>= 0.3.0) - activemodel (4.2.6) - activesupport (= 4.2.6) + activemodel (4.2.7.1) + activesupport (= 4.2.7.1) builder (~> 3.1) - activerecord (4.2.6) - activemodel (= 4.2.6) - activesupport (= 4.2.6) + activerecord (4.2.7.1) + activemodel (= 4.2.7.1) + activesupport (= 4.2.7.1) arel (~> 6.0) - activesupport (4.2.6) + activesupport (4.2.7.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -94,7 +94,7 @@ GEM simple_form (~> 3.2) cliver (0.3.2) coderay (1.1.1) - concurrent-ruby (1.0.1) + concurrent-ruby (1.0.2) couchrest (2.0.0.rc3) httpclient (~> 2.7) mime-types (>= 1.15) @@ -142,7 +142,7 @@ GEM i18n (~> 0.5) ffi (1.9.10) gherkin (3.2.0) - globalid (0.3.6) + globalid (0.3.7) activesupport (>= 4.1.0) haml (4.0.7) tilt @@ -180,20 +180,22 @@ GEM mime-types (>= 1.16, < 4) metaclass (0.0.4) method_source (0.8.2) - mime-types (3.0) + mime-types (3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0221) - mini_portile2 (2.0.0) - minitest (5.8.4) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + minitest (5.9.0) minitest-stub-const (0.5) mocha (1.1.0) metaclass (~> 0.0.1) multi_json (1.11.3) multi_test (0.1.2) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) phantomjs-binaries (2.1.1.0) sys-uname (= 0.9.0) + pkg-config (1.1.7) poltergeist (1.9.0) capybara (~> 2.1) cliver (~> 0.3.1) @@ -208,16 +210,16 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.6) - actionmailer (= 4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) - activemodel (= 4.2.6) - activerecord (= 4.2.6) - activesupport (= 4.2.6) + rails (4.2.7.1) + actionmailer (= 4.2.7.1) + actionpack (= 4.2.7.1) + actionview (= 4.2.7.1) + activejob (= 4.2.7.1) + activemodel (= 4.2.7.1) + activerecord (= 4.2.7.1) + activesupport (= 4.2.7.1) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.6) + railties (= 4.2.7.1) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -232,12 +234,12 @@ GEM railties (~> 4.0) rails_warden (0.5.8) warden (>= 1.0.0) - railties (4.2.6) - actionpack (= 4.2.6) - activesupport (= 4.2.6) + railties (4.2.7.1) + actionpack (= 4.2.7.1) + activesupport (= 4.2.7.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (11.1.2) + rake (11.2.2) rdiscount (2.1.8) ref (2.0.0) regexp_parser (0.3.3) @@ -262,10 +264,10 @@ GEM rack-protection (~> 1.4) tilt (>= 1.3, < 3) slop (3.6.0) - sprockets (3.6.0) + sprockets (3.7.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.0.4) + sprockets-rails (3.1.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) -- cgit v1.2.3 From 3c6347de6b8dfa86fb4ae23bd07ae4b77db1742c Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 15 Aug 2016 12:02:06 +0200 Subject: upgrade: everything but rails (upgraded before) --- Gemfile | 2 +- Gemfile.lock | 79 ++++++++++++++++++++++++++++++------------------------------ 2 files changed, 40 insertions(+), 41 deletions(-) diff --git a/Gemfile b/Gemfile index 9689a94..1e82977 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ require File.expand_path('../lib/gemfile_tools.rb', __FILE__) ## CORE # rake 11.x throws lots of warnings about rails 3.2 code gem "rake" -gem "rails", "~> 4.2.6" +gem "rails", "~> 4.2.7" # TODO: drop this and the respond_with usage gem 'responders', '~> 2.0' gem "couchrest", "~> 2.0.0.rc3" diff --git a/Gemfile.lock b/Gemfile.lock index 88be79b..ab97719 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -63,7 +63,7 @@ GEM tzinfo (~> 1.1) addressable (2.4.0) arel (6.0.3) - autoprefixer-rails (6.3.6) + autoprefixer-rails (6.4.0.2) execjs better_errors (2.1.1) coderay (>= 1.0.0) @@ -71,13 +71,13 @@ GEM rack (>= 0.9.0) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootstrap-sass (3.3.6) + bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) - braintree (2.60.0) + braintree (2.65.0) builder (>= 2.0.0) builder (3.2.2) - byebug (8.2.5) + byebug (9.0.5) capybara (2.7.1) addressable mime-types (>= 1.16) @@ -85,49 +85,49 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - client_side_validations (4.2.3) + client_side_validations (4.2.5) jquery-rails (>= 3.1.2, < 5.0.0) js_regex (~> 1.0, >= 1.0.9) rails (>= 4.0.0, < 4.3.0) - client_side_validations-simple_form (3.2.3) + client_side_validations-simple_form (3.2.4) client_side_validations (~> 4.2.3) simple_form (~> 3.2) cliver (0.3.2) coderay (1.1.1) concurrent-ruby (1.0.2) - couchrest (2.0.0.rc3) - httpclient (~> 2.7) + couchrest (2.0.0) + httpclient (~> 2.8) mime-types (>= 1.15) multi_json (~> 1.7) - couchrest_model (2.1.0.beta2) + couchrest_model (2.1.0.rc1) activemodel (~> 4.0) - couchrest (= 2.0.0.rc3) + couchrest (= 2.0.0) tzinfo (>= 0.3.22) couchrest_session_store (0.4.2) actionpack (~> 4.0) couchrest (~> 2.0.0.rc3) couchrest_model (~> 2.1.0.beta2) - cucumber (2.3.3) + cucumber (2.4.0) builder (>= 2.1.2) - cucumber-core (~> 1.4.0) + cucumber-core (~> 1.5.0) cucumber-wire (~> 0.0.1) diff-lcs (>= 1.1.3) - gherkin (~> 3.2.0) + gherkin (~> 4.0) multi_json (>= 1.7.5, < 2.0) multi_test (>= 0.1.2) - cucumber-core (1.4.0) - gherkin (~> 3.2.0) - cucumber-rails (1.4.3) + cucumber-core (1.5.0) + gherkin (~> 4.0) + cucumber-rails (1.4.4) capybara (>= 1.1.2, < 3) cucumber (>= 1.3.8, < 3) mime-types (>= 1.16, < 4) nokogiri (~> 1.5) - railties (>= 3, < 5) + railties (>= 3, < 5.1) cucumber-wire (0.0.1) debug_inspector (0.0.2) diff-lcs (1.2.5) erubis (2.7.0) - execjs (2.6.0) + execjs (2.7.0) factory_girl (4.7.0) activesupport (>= 3.0.0) factory_girl_rails (4.7.0) @@ -138,10 +138,10 @@ GEM braintree (~> 2.32) capybara (>= 2.2.0) sinatra - faker (1.6.3) + faker (1.6.6) i18n (~> 0.5) - ffi (1.9.10) - gherkin (3.2.0) + ffi (1.9.14) + gherkin (4.0.0) globalid (0.3.7) activesupport (>= 4.1.0) haml (4.0.7) @@ -158,17 +158,17 @@ GEM nokogiri (~> 1.6.0) ruby_parser (~> 3.5) http_accept_language (2.0.5) - httpclient (2.8.0) + httpclient (2.8.1) i18n (0.7.0) i18n-missing_translations (0.0.1) jquery-rails (4.1.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - js_regex (1.0.14) - regexp_parser (= 0.3.3) + js_regex (1.0.17) + regexp_parser (= 0.3.6) json (1.8.3) - kaminari (0.16.3) + kaminari (0.17.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) launchy (2.4.3) @@ -188,7 +188,7 @@ GEM minitest-stub-const (0.5) mocha (1.1.0) metaclass (~> 0.0.1) - multi_json (1.11.3) + multi_json (1.12.1) multi_test (0.1.2) nokogiri (1.6.8) mini_portile2 (~> 2.1.0) @@ -196,12 +196,11 @@ GEM phantomjs-binaries (2.1.1.0) sys-uname (= 0.9.0) pkg-config (1.1.7) - poltergeist (1.9.0) + poltergeist (1.10.0) capybara (~> 2.1) cliver (~> 0.3.1) - multi_json (~> 1.0) websocket-driver (>= 0.2.0) - pry (0.10.3) + pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) @@ -229,7 +228,7 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - rails-i18n (4.0.8) + rails-i18n (4.0.9) i18n (~> 0.7) railties (~> 4.0) rails_warden (0.5.8) @@ -240,17 +239,17 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (11.2.2) - rdiscount (2.1.8) + rdiscount (2.2.0.1) ref (2.0.0) - regexp_parser (0.3.3) - responders (2.1.2) + regexp_parser (0.3.6) + responders (2.2.0) railties (>= 4.2.0, < 5.1) ruby-srp (0.2.1) - ruby_parser (3.8.1) + ruby_parser (3.8.2) sexp_processor (~> 4.1) sass (3.4.22) - sass-rails (5.0.4) - railties (>= 4.0.0, < 5.0) + sass-rails (5.0.6) + railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) @@ -278,17 +277,17 @@ GEM ref thor (0.19.1) thread_safe (0.3.5) - tilt (2.0.2) + tilt (2.0.5) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (3.0.0) + uglifier (3.0.1) execjs (>= 0.3.0, < 3) valid_email (0.0.13) activemodel mail (~> 2.6.1) warden (1.2.6) rack (>= 1.0) - websocket-driver (0.6.3) + websocket-driver (0.6.4) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) xpath (2.0.0) @@ -328,7 +327,7 @@ DEPENDENCIES phantomjs-binaries poltergeist pry - rails (~> 4.2.6) + rails (~> 4.2.7) rails-i18n rails_warden rake -- cgit v1.2.3