Merge pull request #4353 from netom/oembed_to_mobile_view

Added oembed display to mobile stream view

Conflicts:
	app/views/status_messages/_status_message.mobile.haml

Changelog.md

@@ -7,6 +7,7 @@ Highlight down arrow at the user menu on hover [#4441](https://github.com/diaspo
 Make invite code input width consistent across borwsers [#4448](https://github.com/diaspora/diaspora/pull/4448)
 
 ## Features
+Add oEmbed content to the mobile view [#4343](https://github.com/diaspora/diaspora/pull/4353)
 
 # 0.2.0.0
 

app/views/shared/_stream_element.mobile.haml

@@ -10,7 +10,6 @@
         | 
         = link_to t('javascripts.stream.show_nsfw_post'), '#'
   
-
   - if post.is_a?(Reshare)
     = render 'reshares/reshare', :reshare => post, :post => post.absolute_root
 

app/views/status_messages/_status_message.mobile.haml

@@ -16,7 +16,8 @@
 
 %div{:class => direction_for(post.text)}
   != markdownify(post)
+  - if post.o_embed_cache
+    != o_embed_html post.o_embed_cache
   -if post.open_graph_cache
     .opengraph
       != og_html post.open_graph_cache
-