From 5fd4fd13c2e4cb577d8d28de8526811941720d76 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 13 Jul 2016 09:09:44 +0100 Subject: [PATCH] Update to rails 4.2.7 --- Gemfile | 2 +- Gemfile.lock | 109 ++++++++++++++++++++-------------------- test/lib/locale_test.rb | 2 +- 3 files changed, 56 insertions(+), 57 deletions(-) diff --git a/Gemfile b/Gemfile index dfd87eb84..ad83e3a4e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "4.2.6" +gem "rails", "4.2.7" # Require things which have moved to gems in ruby 1.9 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19 diff --git a/Gemfile.lock b/Gemfile.lock index 6a3fd950e..618af37ac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,38 +2,38 @@ GEM remote: https://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) + actionmailer (4.2.7) + actionpack (= 4.2.7) + actionview (= 4.2.7) + activejob (= 4.2.7) 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) + actionview (= 4.2.7) + activesupport (= 4.2.7) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) actionpack-page_caching (1.0.2) actionpack (>= 4.0.0, < 5) - actionview (4.2.6) - activesupport (= 4.2.6) + actionview (4.2.7) + activesupport (= 4.2.7) 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) + activesupport (= 4.2.7) globalid (>= 0.3.0) - activemodel (4.2.6) - activesupport (= 4.2.6) + activemodel (4.2.7) + activesupport (= 4.2.7) builder (~> 3.1) - activerecord (4.2.6) - activemodel (= 4.2.6) - activesupport (= 4.2.6) + activerecord (4.2.7) + activemodel (= 4.2.7) + activesupport (= 4.2.7) arel (~> 6.0) - activesupport (4.2.6) + activesupport (4.2.7) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -42,7 +42,7 @@ GEM addressable (2.4.0) arel (6.0.3) ast (2.3.0) - autoprefixer-rails (6.3.6.2) + autoprefixer-rails (6.3.7) execjs bigdecimal (1.1.0) builder (3.2.2) @@ -65,13 +65,13 @@ GEM coffee-script-source execjs coffee-script-source (1.10.0) - colorize (0.7.7) + colorize (0.8.1) composite_primary_keys (8.1.3) activerecord (~> 4.2.0) concurrent-ruby (1.0.2) - coveralls (0.8.13) - json (~> 1.8) - simplecov (~> 0.11.0) + coveralls (0.8.14) + json (>= 1.8, < 3) + simplecov (~> 0.12.0) term-ansicolor (~> 1.3) thor (~> 0.19.1) tins (~> 1.6.0) @@ -93,7 +93,7 @@ GEM http_accept_language (2.0.5) httpclient (2.8.0) i18n (0.7.0) - i18n-js (3.0.0.rc12) + i18n-js (3.0.0.rc13) i18n (~> 0.6, >= 0.6.6) image_optim (0.22.1) exifr (~> 1.2, >= 1.2.2) @@ -130,9 +130,9 @@ GEM libv8 (3.16.14.15) libxml-ruby (2.9.0) logstash-event (1.2.02) - logstasher (0.9.0) - activerecord (>= 3.0) - activesupport (>= 3.0) + logstasher (1.0.0) + activerecord (>= 4.0) + activesupport (>= 4.0) logstash-event (~> 1.2.0) request_store loofah (2.0.3) @@ -159,12 +159,12 @@ GEM oauth (~> 0.4.4) oauth2 (>= 0.5.0) rack - oauth2 (1.0.0) + oauth2 (1.2.0) faraday (>= 0.8, < 0.10) jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) - rack (~> 1.2) + rack (>= 1.2, < 3) omniauth (1.3.1) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) @@ -184,7 +184,7 @@ GEM omniauth-windowslive (0.0.9.1) multi_json (>= 1.0.3) omniauth-oauth2 (~> 1.0) - paperclip (4.3.6) + paperclip (4.3.7) activemodel (>= 3.2.0) activesupport (>= 3.2.0) cocaine (~> 0.5.5) @@ -194,14 +194,13 @@ GEM ast (~> 2.2) pg (0.18.4) 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) powerpack (0.1.1) progress (3.1.1) - psych (2.0.17) + psych (2.1.0) r2 (0.2.6) rack (1.6.4) rack-cors (0.4.0) @@ -211,16 +210,16 @@ GEM rack-test (0.6.3) rack (>= 1.0) rack-uri_sanitizer (0.0.2) - 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) + actionmailer (= 4.2.7) + actionpack (= 4.2.7) + actionview (= 4.2.7) + activejob (= 4.2.7) + activemodel (= 4.2.7) + activerecord (= 4.2.7) + activesupport (= 4.2.7) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.6) + railties (= 4.2.7) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -230,12 +229,12 @@ 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) - railties (4.2.6) - actionpack (= 4.2.6) - activesupport (= 4.2.6) + railties (4.2.7) + actionpack (= 4.2.7) + activesupport (= 4.2.7) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.1.0) @@ -244,8 +243,8 @@ GEM ref (2.0.0) request_store (1.3.1) rinku (2.0.0) - rubocop (0.40.0) - parser (>= 2.3.1.0, < 3.0) + rubocop (0.41.2) + parser (>= 2.3.1.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.7) @@ -257,22 +256,22 @@ GEM nokogiri (>= 1.4.4) nokogumbo (~> 1.4.1) sass (3.4.22) - sass-rails (5.0.4) - railties (>= 4.0.0, < 5.0) + sass-rails (5.0.5) + railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - simplecov (0.11.2) + simplecov (0.12.0) docile (~> 1.1.0) - json (~> 1.8) + json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) soap4r-ruby1.9 (2.0.5) - sprockets (3.6.1) + sprockets (3.6.3) 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) @@ -290,7 +289,7 @@ GEM thread_safe (~> 0.1) uglifier (3.0.0) execjs (>= 0.3.0, < 3) - unicode-display_width (1.0.5) + unicode-display_width (1.1.0) validates_email_format_of (1.6.3) i18n vendorer (0.1.16) @@ -342,7 +341,7 @@ DEPENDENCIES r2 rack-cors rack-uri_sanitizer - rails (= 4.2.6) + rails (= 4.2.7) rails-i18n (~> 4.0.0) redcarpet rinku (>= 1.2.2) diff --git a/test/lib/locale_test.rb b/test/lib/locale_test.rb index 3ba9b205f..a100515c8 100644 --- a/test/lib/locale_test.rb +++ b/test/lib/locale_test.rb @@ -86,7 +86,7 @@ class LocaleTest < ActiveSupport::TestCase def test_preferred assert_equal "en-GB", Locale.available.preferred(Locale.list("en-GB", "en")).to_s assert_equal "en", Locale.available.preferred(Locale.list("en")).to_s - assert_equal "fr", Locale.available.preferred(Locale.list("fr-FR", "fr", "en")).to_s + assert_equal "fr", Locale.available.preferred(Locale.list("fr-GB", "fr", "en")).to_s assert_equal "fr", Locale.available.preferred(Locale.list("fr", "en")).to_s assert_equal "de", Locale.available.preferred(Locale.list("zh-Hant", "de")).to_s assert_equal "zh-TW", Locale.available.preferred(Locale.list("zh-Hant-TW", "de")).to_s -- 2.39.5