Merge pull request #4309 from jflemingprod/feature/4068-logout-delete-request

Log out should be a DELETE request

Changelog.md

@@ -3,6 +3,7 @@
 ## Refactor
 * Background actual mailing when sending invitations [#4069](https://github.com/diaspora/diaspora/issues/4069)
 * Set the current user on the client side through gon [#4028](https://github.com/diaspora/diaspora/issues/4028)
+* Update sign out route to a DELETE request [#4068](https://github.com/diaspora/diaspora/issues/4068)
 
 ## Bug fixes
 * Don't focus comment form on 'show n more comments' [#4265](https://github.com/diaspora/diaspora/issues/4265)

app/assets/templates/header_tpl.jst.hbs

@@ -98,7 +98,7 @@
     {{#if current_user.admin}}
       <li><a href="/admins/user_search">{{t "header.admin"}}</a></li>
     {{/if}}
-    <li><a href="/users/sign_out">{{t "header.log_out"}}</a></li>
+    <li><a href="/users/sign_out" data-method="delete">{{t "header.log_out"}}</a></li>
   </ul>
 
 

app/assets/templates/stream_tpl.jst.hbs

@@ -27,7 +27,7 @@
                     </span>
                 </a>
 
-                <a href="/users/sign_out" title="Log out" id="logout-button">
+                <a href="/users/sign_out" data-method="delete" title="Log out" id="logout-button">
                     <span class="label label-inverse">
                         <i class="icon-off icon-white"></i>
                     </span>
@@ -72,4 +72,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>

app/views/shared/_footer.mobile.haml

@@ -3,4 +3,4 @@
     = link_to current_user.name, current_user.person
   = link_to t('layouts.header.settings'), users_edit_path
   = link_to t('layouts.application.toggle'), toggle_mobile_path
-  = link_to t('layouts.header.logout'), destroy_user_session_path
+  = link_to t('layouts.header.logout'), destroy_user_session_path, method: :delete

config/initializers/devise.rb

@@ -159,5 +159,8 @@ Devise.setup do |config|
   #   end
   #   manager.default_strategies(:scope => :user).unshift :twitter_oauth
   # end
+  
+  # Sign out via a DELETE request
+  config.sign_out_via = :delete
 end