From: Tom Hughes Date: Thu, 8 Jan 2015 10:06:22 +0000 (+0000) Subject: Update to rails 4.1.9 X-Git-Tag: live~4255 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/3058135d9af967f9df542d5a87dfc26877948534 Update to rails 4.1.9 --- diff --git a/Gemfile b/Gemfile index 7da558d10..51e8b49a4 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' # Require rails -gem 'rails', '4.1.8' +gem 'rails', '4.1.9' # 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 8b0f5cefc..6a23c766c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,36 +2,36 @@ GEM remote: https://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (4.1.8) - actionpack (= 4.1.8) - actionview (= 4.1.8) + actionmailer (4.1.9) + actionpack (= 4.1.9) + actionview (= 4.1.9) mail (~> 2.5, >= 2.5.4) - actionpack (4.1.8) - actionview (= 4.1.8) - activesupport (= 4.1.8) + actionpack (4.1.9) + actionview (= 4.1.9) + activesupport (= 4.1.9) rack (~> 1.5.2) rack-test (~> 0.6.2) actionpack-page_caching (1.0.2) actionpack (>= 4.0.0, < 5) - actionview (4.1.8) - activesupport (= 4.1.8) + actionview (4.1.9) + activesupport (= 4.1.9) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.8) - activesupport (= 4.1.8) + activemodel (4.1.9) + activesupport (= 4.1.9) builder (~> 3.1) - activerecord (4.1.8) - activemodel (= 4.1.8) - activesupport (= 4.1.8) + activerecord (4.1.9) + activemodel (= 4.1.9) + activesupport (= 4.1.9) arel (~> 5.0.0) - activesupport (4.1.8) + activesupport (4.1.9) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) arel (5.0.1.20140414130214) - autoprefixer-rails (4.0.1.1) + autoprefixer-rails (4.0.2.2) execjs bigdecimal (1.1.0) builder (3.2.2) @@ -44,7 +44,7 @@ GEM climate_control (0.0.3) activesupport (>= 3.0) cliver (0.3.2) - cocaine (0.5.4) + cocaine (0.5.5) climate_control (>= 0.0.3, < 1.0) coffee-rails (4.0.1) coffee-script (>= 2.2.0) @@ -53,22 +53,22 @@ GEM coffee-script-source execjs coffee-script-source (1.8.0) - colorize (0.7.3) + colorize (0.7.5) composite_primary_keys (7.0.12) activerecord (~> 4.1.7) - crass (0.2.1) + crass (1.0.1) dalli (2.7.2) deadlock_retry (1.2.0) dynamic_form (1.1.4) erubis (2.7.0) execjs (2.2.2) - faraday (0.9.0) + faraday (0.9.1) multipart-post (>= 1.2, < 3) hike (1.2.3) - htmlentities (4.3.2) + htmlentities (4.3.3) http_accept_language (2.0.2) - httpclient (2.5.3.3) - i18n (0.6.11) + httpclient (2.6.0.1) + i18n (0.7.0) iconv (0.1) jquery-rails (3.1.2) railties (>= 3.0, < 5.0) @@ -91,14 +91,14 @@ GEM mail (2.6.3) mime-types (>= 1.16, < 3) mime-types (2.4.3) - mini_portile (0.6.1) - minitest (5.4.3) + mini_portile (0.6.2) + minitest (5.5.0) multi_json (1.10.1) multi_xml (0.5.5) multipart-post (2.0.0) nokogiri (1.6.5) mini_portile (~> 0.6.0) - nokogumbo (1.1.12) + nokogumbo (1.2.0) nokogiri oauth (0.4.7) oauth-plugin (0.5.1) @@ -116,12 +116,12 @@ GEM rack-openid (~> 1.3) openstreetmap-i18n-js (3.0.0.rc5.3) i18n - paperclip (4.2.0) + paperclip (4.2.1) activemodel (>= 3.0.0) activesupport (>= 3.0.0) cocaine (~> 0.5.3) mime-types - pg (0.17.1) + pg (0.18.1) poltergeist (1.5.1) capybara (~> 2.1) cliver (~> 0.3.1) @@ -130,38 +130,38 @@ GEM psych (2.0.8) r2 (0.2.5) rack (1.5.2) - rack-cors (0.2.9) + rack-cors (0.3.1) rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) rack-test (0.6.2) rack (>= 1.0) - rails (4.1.8) - actionmailer (= 4.1.8) - actionpack (= 4.1.8) - actionview (= 4.1.8) - activemodel (= 4.1.8) - activerecord (= 4.1.8) - activesupport (= 4.1.8) + rails (4.1.9) + actionmailer (= 4.1.9) + actionpack (= 4.1.9) + actionview (= 4.1.9) + activemodel (= 4.1.9) + activerecord (= 4.1.9) + activesupport (= 4.1.9) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.8) + railties (= 4.1.9) sprockets-rails (~> 2.0) rails-i18n (4.0.3) i18n (~> 0.6) railties (~> 4.0) - railties (4.1.8) - actionpack (= 4.1.8) - activesupport (= 4.1.8) + railties (4.1.9) + actionpack (= 4.1.9) + activesupport (= 4.1.9) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.4.2) - redcarpet (3.2.1) + redcarpet (3.2.2) rinku (1.7.3) ruby-openid (2.6.0) - sanitize (3.0.3) - crass (~> 0.2.0) + sanitize (3.1.0) + crass (~> 1.0.1) nokogiri (>= 1.4.4) - nokogumbo (= 1.1.12) + nokogumbo (= 1.2.0) sass (3.2.19) sass-rails (4.0.5) railties (>= 4.0.0, < 5.0) @@ -184,13 +184,15 @@ GEM timecop (0.7.1) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.5.3) + uglifier (2.6.1) execjs (>= 0.3.0) json (>= 1.8.0) validates_email_format_of (1.6.1) i18n vendorer (0.1.16) - websocket-driver (0.4.0) + websocket-driver (0.5.1) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.1) xpath (2.0.0) nokogiri (~> 1.3) @@ -227,7 +229,7 @@ DEPENDENCIES psych r2 rack-cors - rails (= 4.1.8) + rails (= 4.1.9) rails-i18n (~> 4.0.0) redcarpet rinku (>= 1.2.2) diff --git a/test/fixtures/current_node_tags.yml b/test/fixtures/current_node_tags.yml index 9c41a375e..38b941e3c 100644 --- a/test/fixtures/current_node_tags.yml +++ b/test/fixtures/current_node_tags.yml @@ -38,10 +38,10 @@ nwn_name: k: 'name' v: 'Test Node' -nwn_name_ru: +nwn_name_pt: node_id: 18 - k: 'name:ru' - v: 'проверки узла' + k: 'name:pt' + v: 'Nó teste' nwn_building: node_id: 18 diff --git a/test/fixtures/node_tags.yml b/test/fixtures/node_tags.yml index 21a63f5b1..d9001b720 100644 --- a/test/fixtures/node_tags.yml +++ b/test/fixtures/node_tags.yml @@ -58,10 +58,10 @@ nwnv1_name: v: 'Test Node' version: 1 -nwnv1_name_ru: +nwnv1_name_pt: node_id: 18 - k: 'name:ru' - v: 'проверки узла' + k: 'name:pt' + v: 'Nó teste' version: 1 nwnv1_building: @@ -88,10 +88,10 @@ nwnv2_name: v: 'Test Node' version: 2 -nwnv2_name_ru: +nwnv2_name_pt: node_id: 18 - k: 'name:ru' - v: 'проверки узла' + k: 'name:pt' + v: 'Nó teste' version: 2 nwnv2_building: diff --git a/test/helpers/browse_helper_test.rb b/test/helpers/browse_helper_test.rb index d3ed3a826..871c1bcae 100644 --- a/test/helpers/browse_helper_test.rb +++ b/test/helpers/browse_helper_test.rb @@ -24,22 +24,22 @@ class BrowseHelperTest < ActionView::TestCase assert_equal "Test Node (18, v2)", printable_name(nodes(:node_with_name_current_version), true) assert_equal "18, v1", printable_name(nodes(:node_with_name_redacted_version), true) - I18n.locale = "ru" + I18n.locale = "pt" assert_equal "17", printable_name(current_nodes(:redacted_node)) - assert_equal "проверки узла (18)", printable_name(current_nodes(:node_with_name)) - assert_equal "проверки узла (18)", printable_name(nodes(:node_with_name_current_version)) + assert_equal "Nó teste (18)", printable_name(current_nodes(:node_with_name)) + assert_equal "Nó teste (18)", printable_name(nodes(:node_with_name_current_version)) assert_equal "18", printable_name(nodes(:node_with_name_redacted_version)) - assert_equal "проверки узла (18, v2)", printable_name(nodes(:node_with_name_current_version), true) + assert_equal "Nó teste (18, v2)", printable_name(nodes(:node_with_name_current_version), true) assert_equal "18, v1", printable_name(nodes(:node_with_name_redacted_version), true) - I18n.locale = "ru-RU" + I18n.locale = "pt-BR" assert_equal "17", printable_name(current_nodes(:redacted_node)) - assert_equal "проверки узла (18)", printable_name(current_nodes(:node_with_name)) - assert_equal "проверки узла (18)", printable_name(nodes(:node_with_name_current_version)) + assert_equal "Nó teste (18)", printable_name(current_nodes(:node_with_name)) + assert_equal "Nó teste (18)", printable_name(nodes(:node_with_name_current_version)) assert_equal "18", printable_name(nodes(:node_with_name_redacted_version)) - assert_equal "проверки узла (18, v2)", printable_name(nodes(:node_with_name_current_version), true) + assert_equal "Nó teste (18, v2)", printable_name(nodes(:node_with_name_current_version), true) assert_equal "18, v1", printable_name(nodes(:node_with_name_redacted_version), true) I18n.locale = "de"