Merge branch 'stable' into develop

Changelog.md

@@ -80,6 +80,7 @@ Ruby 2.0 is no longer officially supported.
 * Only return the current_users participation for post interactions [#6007](https://github.com/diaspora/diaspora/pull/6007)
 * Fix tag rendering in emails [#6009](https://github.com/diaspora/diaspora/pull/6009)
 * Fix the logo in emails [#6013](https://github.com/diaspora/diaspora/pull/6013)
+* Disable autocorrect for username on mobile sign in [#6028](https://github.com/diaspora/diaspora/pull/6028)
 
 ## Features
 * Hide post title of limited post in comment notification email [#5843](https://github.com/diaspora/diaspora/pull/5843)

app/views/sessions/new.mobile.haml

@@ -2,47 +2,46 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-:css
-  .navbar-fixed-top{display: none;}
-
 .session_mobile
   .landing
-    %h1{:class =>"session"}
-      = "#{pod_name}"
+    %h1.session
+      = pod_name
 
   #main_stream.stream
     - flash.each do |name, msg|
-      %p{:class => "login_#{name}"}= msg
+      %p{class: "login_#{name}"}
+        = msg
       #flash_alert.expose
-        %div{:class => "message", :id => "session"}= msg
+        #session.message
+          = msg
 
     #login_form
       .login-container
-        = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
+        = form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
           %fieldset
             %legend
               = image_tag("branding/logos/header-logo2x.png", height: 40, width: 40)
-              = t('devise.sessions.new.login')
+              = t("devise.sessions.new.login")
 
             .control-group
-              = f.label :username, t('username')
+              = f.label :username, t("username")
               .controls
-                = f.text_field :username, :autofocus => true
+                = f.text_field :username, autofocus: true, autocapitalize: "none", autocorrect: "off"
 
             .control-group
-              = f.label :password , t('password')
+              = f.label :password , t("password")
               .controls
                 = f.password_field :password
 
-              = hidden_field(:user, :remember_me, :value => 1)
+              = hidden_field(:user, :remember_me, value: 1)
 
             .controls
-              = f.submit t('devise.sessions.new.sign_in'), :class => 'btn primary'
+              = f.submit t("devise.sessions.new.sign_in"), class: "btn primary"
               - if display_registration_link?
-                = link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name), :class => 'btn btn-link', :style => "float: right;"
+                = link_to t("devise.shared.links.sign_up"), new_registration_path(resource_name), class: "btn btn-link", style: "float: right;"
 
   %footer
     - if display_password_reset_link?
-      = link_to t('devise.passwords.new.forgot_password'), new_password_path(resource_name)
+      = link_to t("devise.passwords.new.forgot_password"), new_password_path(resource_name)
 
-    = link_to t('layouts.application.toggle'), toggle_mobile_path
+    = link_to t("layouts.application.toggle"), toggle_mobile_path