Merge branch 'stable' into develop

Changelog.md

@@ -96,6 +96,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
 * Display original author on reshares of NSFW posts [#6270](https://github.com/diaspora/diaspora/pull/6270)
 * Use avatars in hovercards as links to the profile [#6297](https://github.com/diaspora/diaspora/pull/6297)
 * Remove avatars of ignored users from stream faces [#6320](https://github.com/diaspora/diaspora/pull/6320)
+* New /m route to force the mobile view [#6354](https://github.com/diaspora/diaspora/pull/6354)
 
 # 0.5.2.0
 

app/controllers/home_controller.rb

@@ -30,4 +30,10 @@ class HomeController < ApplicationController
 
     redirect_to :back
   end
+
+  def force_mobile
+    session[:mobile_view] = true
+
+    redirect_to stream_path
+  end
 end

config/routes.rb

@@ -229,6 +229,7 @@ Diaspora::Application.routes.draw do
   # Mobile site
 
   get 'mobile/toggle', :to => 'home#toggle_mobile', :as => 'toggle_mobile'
+  get "/m", to: "home#force_mobile", as: "force_mobile"
 
   # Help
   get 'help' => 'help#faq', :as => 'help'

features/mobile/home.feature

@@ -10,3 +10,10 @@ Feature: Visit the landing page of the pod
     When I toggle the mobile view
     And I go to the root page
     Then I should see "Welcome, friend"
+
+    When I am on the root page
+    Then I should see "Welcome, friend"
+    When I go to the mobile path
+    Then I should see "LOG IN"
+    When I go to the mobile path
+    Then I should see "LOG IN"

features/support/paths.rb

@@ -5,6 +5,8 @@ module NavigationHelpers
       person_photos_path(@me.person)
     when /^the home(?: )?page$/
       stream_path
+    when /^the mobile path$/
+      force_mobile_path
     when /^the tag page for "([^\"]*)"$/
       tag_path(Regexp.last_match(1))
     when /^its ([\w ]+) page$/