diff options
| author | Benjamin Neff <benjamin@coding4coffee.ch> | 2022-07-14 00:29:33 +0300 |
|---|---|---|
| committer | Benjamin Neff <benjamin@coding4coffee.ch> | 2022-07-16 05:44:17 +0300 |
| commit | a5e5c7f3782e83d527b9b28a0e8f46fb1f83389b (patch) | |
| tree | 7e7a88b1c58fd106a85bf35fbb713bc7bacc174b | |
| parent | dd3bc39c97e6b6d17646c8cbf33e13c252e0c2e4 (diff) | |
Fix Link to OWASP CSRF more information page
closes #8365
| -rw-r--r-- | Changelog.md | 4 | ||||
| -rw-r--r-- | app/views/notifier/csrf_token_fail.html.haml | 2 | ||||
| -rw-r--r-- | app/views/notifier/csrf_token_fail.text.erb | 2 | ||||
| -rw-r--r-- | spec/mailers/notifier_spec.rb | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/Changelog.md b/Changelog.md index cc24c6d4b..629559d2a 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,10 +6,14 @@ * Fix deprecation warnings for sidekiq 7.0 [#8359](https://github.com/diaspora/diaspora/pull/8359) * Remove entypo-rails dependency to prepare for rails 6 [#8361](https://github.com/diaspora/diaspora/pull/8361) * Remove compass-rails dependency which is not supported anymore [#8362](https://github.com/diaspora/diaspora/pull/8362) +* Remove markerb dependency which doesn't exist anymore [#8365](https://github.com/diaspora/diaspora/pull/8365) ## Bug fixes +* Fix that no mails were sent after photo export [#8365](https://github.com/diaspora/diaspora/pull/8365) +* Fix people with quotes in the name causing issues with mail sender [#8365](https://github.com/diaspora/diaspora/pull/8365) ## Features +* Render posts and comments as HTML in HTML mails [#8365](https://github.com/diaspora/diaspora/pull/8365) # 0.7.17.0 diff --git a/app/views/notifier/csrf_token_fail.html.haml b/app/views/notifier/csrf_token_fail.html.haml index aa8b3d80e..08c27d4b9 100644 --- a/app/views/notifier/csrf_token_fail.html.haml +++ b/app/views/notifier/csrf_token_fail.html.haml @@ -1,4 +1,4 @@ - message = t("notifier.csrf_token_fail.body", name: @notification.recipient_first_name, - link: "https://www.owasp.org/index.php/Cross-Site_Request_Forgery_(CSRF)") + link: "https://owasp.org/www-community/attacks/csrf") != Redcarpet::Markdown.new(Diaspora::Markdownify::Email).render(message) diff --git a/app/views/notifier/csrf_token_fail.text.erb b/app/views/notifier/csrf_token_fail.text.erb index 413b61f97..ef034ed02 100644 --- a/app/views/notifier/csrf_token_fail.text.erb +++ b/app/views/notifier/csrf_token_fail.text.erb @@ -1,3 +1,3 @@ <%= t("notifier.csrf_token_fail.body", name: @notification.recipient_first_name, - link: "https://www.owasp.org/index.php/Cross-Site_Request_Forgery_(CSRF)") %> + link: "https://owasp.org/www-community/attacks/csrf") %> diff --git a/spec/mailers/notifier_spec.rb b/spec/mailers/notifier_spec.rb index 8129b1d36..4cdc3c319 100644 --- a/spec/mailers/notifier_spec.rb +++ b/spec/mailers/notifier_spec.rb @@ -548,7 +548,7 @@ describe Notifier, type: :mailer do it "has some informative text in the body" do email.body.parts.each do |part| - expect(part.decoded).to include("https://www.owasp.org/index.php/Cross-Site_Request_Forgery_(CSRF)") + expect(part.decoded).to include("https://owasp.org/www-community/attacks/csrf") end end end |