github/diaspora
1
1
Fork 0
mirror of https://github.com/diaspora/diaspora.git synced 2026-01-09 15:18:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next-minor' into develop

Browse Source
This commit is contained in:
Dennis Schubert
2025-01-23 22:21:26 +01:00
parent e569ec72c7 c24ca7d56c
commit c2589f10cc
5 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@@ -12,6 +12,7 @@
## Bug fixes ## Bug fixes
* Fix processing for a specific set of uploaded images, like scenes full of snow, by allowing for a larger on-disk cache for ImageMagick [#8460](https://github.com/diaspora/diaspora/pull/8460) * Fix processing for a specific set of uploaded images, like scenes full of snow, by allowing for a larger on-disk cache for ImageMagick [#8460](https://github.com/diaspora/diaspora/pull/8460)
* Fix a bug with parsing certain OpenGraph metadata structures [#8463](https://github.com/diaspora/diaspora/pull/8463)
## Features ## Features

2
Gemfile
View File

@@ -110,7 +110,7 @@ gem "leaflet-rails", "1.9.4"
# Parsing # Parsing
gem "nokogiri", "1.16.5" gem "nokogiri", "1.16.5"
gem "open_graph_reader", "0.7.2" # also update User-Agent in features/support/webmock.rb and open_graph_cache_spec.rb gem "open_graph_reader", "0.8.0" # also update User-Agent in features/support/webmock.rb and open_graph_cache_spec.rb
gem "redcarpet", "3.6.0" gem "redcarpet", "3.6.0"
gem "ruby-oembed", "0.17.0" gem "ruby-oembed", "0.17.0"
gem "twitter-text", "3.1.0" gem "twitter-text", "3.1.0"

4
Gemfile.lock
View File

@@ -454,7 +454,7 @@ GEM
rack rack
omniauth-wordpress (0.2.2) omniauth-wordpress (0.2.2)
omniauth-oauth2 (>= 1.1.0) omniauth-oauth2 (>= 1.1.0)
open_graph_reader (0.7.2) open_graph_reader (0.8.0)
faraday (>= 0.9.0) faraday (>= 0.9.0)
nokogiri (~> 1.6) nokogiri (~> 1.6)
openid_connect (2.3.0) openid_connect (2.3.0)
@@ -832,7 +832,7 @@ DEPENDENCIES
omniauth-tumblr (= 1.2) omniauth-tumblr (= 1.2)
omniauth-twitter (= 1.4.0) omniauth-twitter (= 1.4.0)
omniauth-wordpress (= 0.2.2) omniauth-wordpress (= 0.2.2)
open_graph_reader (= 0.7.2) open_graph_reader (= 0.8.0)
openid_connect (= 2.3.0) openid_connect (= 2.3.0)
pg (= 1.5.6) pg (= 1.5.6)
pronto (= 0.11.2) pronto (= 0.11.2)

2
features/support/webmock.rb
View File

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

2
spec/models/open_graph_cache_spec.rb
View File

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