Merge branch 'next-minor' into develop

Changelog.md

@@ -19,6 +19,7 @@
 * Fix jasmine tests in firefox [#7246](https://github.com/diaspora/diaspora/pull/7246)
 * Prevent scroll to top when clicking 'mark all as read' in the notification dropdown [#7253](https://github.com/diaspora/diaspora/pull/7253)
 * Update existing notifications in dropdown on fetch [#7270](https://github.com/diaspora/diaspora/pull/7270)
+* Fix link to post on mobile photo page [#7274](https://github.com/diaspora/diaspora/pull/7274)
 
 ## Features
 * Add links to the aspects and followed tags pages on mobile [#7265](https://github.com/diaspora/diaspora/pull/7265)

app/views/photos/show.mobile.haml

@@ -17,7 +17,10 @@
           = person_link(photo.author)
           .info
             %span
-              = link_to(post_path(photo)) do
+              - if photo.status_message
+                = link_to(post_path(photo.status_message)) do
+                  = timeago(photo.created_at)
+              - else
                 = timeago(photo.created_at)
 
 -if additional_photos && additional_photos.length > 1