Fix Link to OWASP CSRF more information page

closes #8365

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
 

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)

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") %>

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