Commit 6c37171f authored by Benjamin Neff's avatar Benjamin Neff Committed by Dennis Schubert

Change last sentence and fix specs

closes #7238
parent 61300dab
......@@ -12,6 +12,7 @@
* Only require AWS-module for fog [#7201](https://github.com/diaspora/diaspora/pull/7201)
* Only show community spotlight links on the contacts page if community spotlight is enabled [#7213](https://github.com/diaspora/diaspora/pull/7213)
* Require spec\_helper in .rspec [#7223](https://github.com/diaspora/diaspora/pull/7223)
* Make the CSRF mail a bit more friendly [#7238](https://github.com/diaspora/diaspora/pull/7238)
## Bug fixes
* Fix fetching comments after fetching likes [#7167](https://github.com/diaspora/diaspora/pull/7167)
......
......@@ -721,7 +721,7 @@ en:
Don’t worry; you can safely sign in again now.
If you see this message regularly, please check your browsing settings.
If you see this message repeatedly, please check the points above, including any browser add-ons.
Thank you,
The diaspora* email robot!
......
......@@ -476,7 +476,9 @@ describe Notifier, type: :mailer do
end
it "has some informative text in the body" do
expect(email.body.encoded).to include("https://www.owasp.org/index.php/Cross-Site_Request_Forgery_(CSRF)")
email.body.parts.each do |part|
expect(part.decoded).to include("https://www.owasp.org/index.php/Cross-Site_Request_Forgery_(CSRF)")
end
end
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment