Merge branch 'next-minor' into develop

Changelog.md

@@ -15,6 +15,7 @@
 * Invalidate sessions with invalid CSRF tokens [#7050](https://github.com/diaspora/diaspora/pull/7050)
 * Liking a post will no longer update its interacted timestamp [#7030](https://github.com/diaspora/diaspora/pull/7030)
 * Improve W3C compliance [#7068](https://github.com/diaspora/diaspora/pull/7068)
+* Load jQuery in the head on mobile [#7086](https://github.com/diaspora/diaspora/pull/7086)
 
 ## Bug fixes
 * Post comments no longer get collapsed when interacting with a post [#7040](https://github.com/diaspora/diaspora/pull/7040)

app/views/conversations/new.mobile.haml

@@ -2,8 +2,6 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-= javascript_include_tag :jquery
-
 :javascript
   $(document).ready(function () {
     var data = $.parseJSON( "#{escape_javascript(@contacts_json)}" ),

app/views/layouts/application.mobile.haml

@@ -48,6 +48,8 @@
     - if Rails.env.test?
       = stylesheet_link_tag :poltergeist_disable_transition, media: "all"
 
+    = jquery_include_tag
+
     = yield(:head)
 
     = include_gon(:camel_case => true)
@@ -64,7 +66,6 @@
         = yield
 
     / javascripts at the bottom
-    = jquery_include_tag
     = javascript_include_tag "mobile/mobile"
     = load_javascript_locales
     = include_chartbeat

app/views/profiles/_edit_public.haml

 - content_for :head do
-  - if mobile
-    = javascript_include_tag :jquery
   :javascript
     $(document).ready(function () {
       var data = $.parseJSON( '#{@tags_array.to_json.gsub("'", "\\\\'")}' ),

app/views/status_messages/bookmarklet.mobile.haml

@@ -19,6 +19,3 @@
       $("#status_message_text").val(contents);
     }
   });
-
-- content_for(:head) do
-  = javascript_include_tag :jquery

app/views/users/getting_started.mobile.haml

@@ -3,8 +3,6 @@
 -#   the COPYRIGHT file.
 
 - content_for :head do
-  = javascript_include_tag :jquery
-
   :javascript
     $(document).ready(function () {
       var data = $.parseJSON( '#{@tags_array.to_json.gsub("'", "\\\\'")}' ),