Merge branch 'WebSpider-develop' into develop

Changelog.md

@@ -11,6 +11,7 @@
 * Fix profile mobile when logged out [#4464](https://github.com/diaspora/pull/4464)
 * Fix preview with more than one mention [#4450](https://github.com/diaspora/diaspora/issues/4450)
 * Fix size of images in the SPV [#4471](https://github.com/diaspora/diaspora/pull/4471)
+* Adjust 404 message description to not leak logged out users if a post exists or not [#4477](https://github.com/diaspora/diaspora/pull/4477)
 
 ## Features
 * Add oEmbed content to the mobile view [#4343](https://github.com/diaspora/diaspora/pull/4353)

app/views/errors/not_public.haml

@@ -9,6 +9,6 @@
     404
 
   #content
-    = t('error_messages.post_not_public')
+    = t('error_messages.post_not_public_or_not_exist')
     %br
     = t('error_messages.login_try_again', :login_link => new_user_session_path).html_safe

config/locales/diaspora/en.yml

@@ -81,6 +81,7 @@ en:
       invalid_fields: "Invalid Fields"
       correct_the_following_errors_and_try_again: "Correct the following errors and try again."
     post_not_public: "The post you are trying to view is not public!"
+    post_not_public_or_not_exist: "The post you are trying to view is not public, or does not exist!"
     login_try_again: "Please <a href='%{login_link}'>login</a> and try again."
 
   admins:

features/step_definitions/message_steps.rb

@@ -10,7 +10,7 @@ Then /^I should see the "(.*)" message$/ do |message|
            when 'you are nsfw'
              I18n.translate('profiles.edit.you_are_nsfw')
            when 'post not public'
-             I18n.translate('error_messages.post_not_public')
+             I18n.translate('error_messages.post_not_public_or_not_exist')
            else
              raise "muriel, you don't have that message key, add one here"
            end