nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change last sentence and fix specs

Browse source 
closes #7238
This commit is contained in:
Benjamin Neff 2016-12-04 18:51:50 +01:00 committed by Dennis Schubert
parent 61300dab59
commit 6c37171f9f
No known key found for this signature in database
GPG key ID: 5A0304BEA7966D7E
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -12,6 +12,7 @@
* Only require AWS-module for fog [#7201](https://github.com/diaspora/diaspora/pull/7201) * 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) * 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) * 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 ## Bug fixes
* Fix fetching comments after fetching likes [#7167](https://github.com/diaspora/diaspora/pull/7167) * Fix fetching comments after fetching likes [#7167](https://github.com/diaspora/diaspora/pull/7167)

2
config/locales/diaspora/en.yml
View file

@ -721,7 +721,7 @@ en:
Don’t worry; you can safely sign in again now. 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, Thank you,
The diaspora* email robot! The diaspora* email robot!

4
spec/mailers/notifier_spec.rb
View file

@ -476,7 +476,9 @@ describe Notifier, type: :mailer do
end end
it "has some informative text in the body" do 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
end end