diff --git a/app/assets/templates/header_tpl.jst.hbs b/app/assets/templates/header_tpl.jst.hbs index dc713f535695e85eaeabf6f3d7f4ecca6fa0680f..9733982ed1a60934451208caea433afb0f254adc 100644 --- a/app/assets/templates/header_tpl.jst.hbs +++ b/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> diff --git a/app/assets/templates/stream_tpl.jst.hbs b/app/assets/templates/stream_tpl.jst.hbs index cccb849a1c6940d096d066fcb134d42e4daef839..c3fb636a8ec7539b8dd1488b2b9103d734d0797c 100644 --- a/app/assets/templates/stream_tpl.jst.hbs +++ b/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> \ No newline at end of file +</div> diff --git a/app/views/shared/_footer.mobile.haml b/app/views/shared/_footer.mobile.haml index a35b88cdffb30d1846df81c0d4a4bb6eaac56094..a6cb9e83fcee5820ed848c9c138bd1eeba83aab9 100644 --- a/app/views/shared/_footer.mobile.haml +++ b/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 diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 0ce5acae5e3fe4036344bd84f3740f2d6479dfdb..0f238c1d15afa9e76117c1262d7aaf510d25e622 100644 --- a/config/initializers/devise.rb +++ b/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