Merge branch 'rails-5.1'

2018-04-11 11:40:36 -07:00
parent a25629bff9 abce4d2551
commit d9d98f05c2
361 changed files with 4795 additions and 4798 deletions
--- a/app/logical/sources/strategies/twitter.rb
+++ b/app/logical/sources/strategies/twitter.rb
@@ -69,7 +69,7 @@ module Sources::Strategies
    # https://twitter.com/motty08111213/status/943446161586733056
    def self.status_id_from_url(url)
      if url =~ %r{\Ahttps?://(?:mobile\.)?twitter\.com/(?:i/web|\w+)/status/(\d+)}i
-        $1.to_i
+        $1
      else
        nil
      end