Merge branch 'next-minor' into develop

.travis.yml

@@ -17,6 +17,16 @@ cache:
     - app/assets/images
     - tmp/cache/assets
 
+addons:
+  apt:
+    packages: 
+      - libidn11-dev
+      - ghostscript
+
+services:
+  - postgresql
+  - mysql
+
 branches:
   only:
     - 'master'

Changelog.md

@@ -19,6 +19,7 @@
 ## Refactor
 
 ## Bug fixes
+* Fix error while trying to fetch some sites with invalid OpenGraph data [#8049](https://github.com/diaspora/diaspora/pull/8049)
 
 ## Features
 * Add cronjob to cleanup pending photos which were never posted [#8041](https://github.com/diaspora/diaspora/pull/8041)

Gemfile

@@ -147,7 +147,7 @@ gem "leaflet-rails",       "1.5.1"
 # Parsing
 
 gem "nokogiri",          "1.10.3"
-gem "open_graph_reader", "0.6.2" # also update User-Agent in features/support/webmock.rb
+gem "open_graph_reader", "0.7.0" # also update User-Agent in features/support/webmock.rb
 gem "redcarpet",         "3.4.0"
 gem "ruby-oembed",       "0.12.0"
 gem "twitter-text",      "3.0.0"

Gemfile.lock

@@ -444,7 +444,7 @@ GEM
       rack
     omniauth-wordpress (0.2.2)
       omniauth-oauth2 (>= 1.1.0)
-    open_graph_reader (0.6.2)
+    open_graph_reader (0.7.0)
       faraday (>= 0.9.0)
       nokogiri (~> 1.6)
     openid_connect (1.1.8)
@@ -855,7 +855,7 @@ DEPENDENCIES
   omniauth-tumblr (= 1.2)
   omniauth-twitter (= 1.4.0)
   omniauth-wordpress (= 0.2.2)
-  open_graph_reader (= 0.6.2)
+  open_graph_reader (= 0.7.0)
   openid_connect (= 1.1.8)
   pg (= 1.1.4)
   poltergeist (= 1.18.1)

features/support/webmock.rb

@@ -7,7 +7,7 @@ Before do
   stub_request(:head, /.+/).with(
     headers: {
       "Accept"     => "text/html",
-      "User-Agent" => "OpenGraphReader/0.6.2 (+https://github.com/jhass/open_graph_reader)"
+      "User-Agent" => "OpenGraphReader/0.7.0 (+https://github.com/jhass/open_graph_reader)"
     }
   ).to_return(status: 200, body: "", headers: {"Content-Type" => "text/plain"})
 end

spec/models/open_graph_cache_spec.rb

@@ -63,7 +63,7 @@ describe OpenGraphCache, type: :model do
         stub_request(:head, "http:///wetter.com")
           .with(headers: {
                   "Accept"     => "text/html",
-                  "User-Agent" => "OpenGraphReader/0.6.2 (+https://github.com/jhass/open_graph_reader)"
+                  "User-Agent" => "OpenGraphReader/0.7.0 (+https://github.com/jhass/open_graph_reader)"
                 })
           .to_return(status: 200, body: "", headers:
             {"Set-Cookie" => "Dabgroup=A;path=/;Expires=Thu, 23 May 2019 16:12:01 GMT;httpOnly"})