# HG changeset patch # User nanaya # Date 1517378643 -32400 # Node ID 950849c40d427824994a4c1d52cfaafce27078d4 # Parent 8a84441a8f552a69164d0322805a042261c9f1a6 Update all the things, including rails 5.2 diff -r 8a84441a8f55 -r 950849c40d42 Gemfile --- a/Gemfile Sat Jan 13 03:16:35 2018 +0900 +++ b/Gemfile Wed Jan 31 15:04:03 2018 +0900 @@ -1,13 +1,13 @@ source "https://rubygems.org" -rails_ver = "~> 5.1.0" +rails_ver = "~> 5.2.0.rc1" gem "actionview", rails_ver gem "railties", rails_ver gem "actionpack", rails_ver gem "redis-rails" -gem "redis", "= 3.3.5" -gem "redis-store", "= 1.3.0" +gem "redis" +gem "redis-store" gem "twitter" gem "twitter-text" diff -r 8a84441a8f55 -r 950849c40d42 Gemfile.lock --- a/Gemfile.lock Sat Jan 13 03:16:35 2018 +0900 +++ b/Gemfile.lock Wed Jan 31 15:04:03 2018 +0900 @@ -1,20 +1,20 @@ GEM remote: https://rubygems.org/ specs: - actionpack (5.1.4) - actionview (= 5.1.4) - activesupport (= 5.1.4) + actionpack (5.2.0.rc1) + actionview (= 5.2.0.rc1) + activesupport (= 5.2.0.rc1) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.4) - activesupport (= 5.1.4) + actionview (5.2.0.rc1) + activesupport (= 5.2.0.rc1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activesupport (5.1.4) + activesupport (5.2.0.rc1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) @@ -40,10 +40,10 @@ http-form_data (2.0.0) http_parser.rb (0.6.0) http_parser.rb (0.6.0-java) - i18n (0.9.1) + i18n (0.9.3) concurrent-ruby (~> 1.0) idn-ruby (0.1.0) - kgio (2.11.1) + kgio (2.11.2) loofah (2.1.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -51,18 +51,18 @@ thread_safe (~> 0.3, >= 0.3.1) method_source (0.9.0) mini_portile2 (2.3.0) - minitest (5.11.1) + minitest (5.11.3) multipart-post (2.0.0) naught (1.1.0) newrelic_rpm (4.7.1.340) - nokogiri (1.8.1) + nokogiri (1.8.2) mini_portile2 (~> 2.3.0) - nokogiri (1.8.1-java) - nokogiri (1.8.1-x86-mingw32) + nokogiri (1.8.2-java) + nokogiri (1.8.2-x86-mingw32) mini_portile2 (~> 2.3.0) public_suffix (3.0.1) - puma (3.11.0) - puma (3.11.0-java) + puma (3.11.2) + puma (3.11.2-java) rack (2.0.3) rack-test (0.8.2) rack (>= 1.0, < 3) @@ -71,15 +71,15 @@ nokogiri (>= 1.6) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (5.1.4) - actionpack (= 5.1.4) - activesupport (= 5.1.4) + railties (5.2.0.rc1) + actionpack (= 5.2.0.rc1) + activesupport (= 5.2.0.rc1) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.19.0) rake (12.3.0) - redis (3.3.5) + redis (4.0.1) redis-actionpack (5.0.2) actionpack (>= 4.0, < 6) redis-rack (>= 1, < 3) @@ -94,8 +94,8 @@ redis-actionpack (>= 5.0, < 6) redis-activesupport (>= 5.0, < 6) redis-store (>= 1.2, < 2) - redis-store (1.3.0) - redis (>= 2.2) + redis-store (1.4.1) + redis (>= 2.2, < 5) simple_oauth (0.3.1) thor (0.20.0) thread_safe (0.3.6) @@ -119,8 +119,8 @@ unf (0.1.4) unf_ext unf (0.1.4-java) - unf_ext (0.0.7.4) - unf_ext (0.0.7.4-x86-mingw32) + unf_ext (0.0.7.2) + unf_ext (0.0.7.2-x86-mingw32) unicorn (5.4.0) kgio (~> 2.6) raindrops (~> 0.7) @@ -131,17 +131,17 @@ x86-mingw32 DEPENDENCIES - actionpack (~> 5.1.0) - actionview (~> 5.1.0) + actionpack (~> 5.2.0.rc1) + actionview (~> 5.2.0.rc1) newrelic_rpm puma - railties (~> 5.1.0) - redis (= 3.3.5) + railties (~> 5.2.0.rc1) + redis redis-rails - redis-store (= 1.3.0) + redis-store twitter twitter-text unicorn BUNDLED WITH - 1.16.0 + 1.16.1 diff -r 8a84441a8f55 -r 950849c40d42 app/helpers/application_helper.rb --- a/app/helpers/application_helper.rb Sat Jan 13 03:16:35 2018 +0900 +++ b/app/helpers/application_helper.rb Wed Jan 31 15:04:03 2018 +0900 @@ -1,5 +1,5 @@ module ApplicationHelper - include Twitter::Autolink + include Twitter::TwitterText::Autolink def ellipsize(text, limit = 30) if text.length <= limit diff -r 8a84441a8f55 -r 950849c40d42 app/views/tweets/_tweet.html.erb --- a/app/views/tweets/_tweet.html.erb Sat Jan 13 03:16:35 2018 +0900 +++ b/app/views/tweets/_tweet.html.erb Wed Jan 31 15:04:03 2018 +0900 @@ -25,7 +25,7 @@

<%= link_to "https://twitter.com/#{tweet.user.screen_name}" do %> - <%= image_tag tweet.user.profile_image_url_https, :alt => "profile image for #{tweet.user.name.printable}" %> + <%= image_tag tweet.user.profile_image_url_https.to_s, :alt => "profile image for #{tweet.user.name.printable}" %> <%= tweet.user.name.printable -%> <% end %>