Merge remote-tracking branch 'ups/master'

DreamHackers · Sep 12, 2015 · 8ff775a · 8ff775a
2 parents 1336d5d + d9f34ec
commit 8ff775a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -20,7 +20,7 @@
           deviseにより自動で作成されてますので、rake routesで確認できます -->
         Logged in as <strong><%=link_to current_user.username, bots_path(current_user.username)%></strong>|
              <%= link_to 'HashTagの登録', hash_tags_path %> |
-        <%= link_to "ログアウト", destroy_user_session_path, method: :delete %>
+        <%= link_to "ログアウト", destroy_user_session_path, method: :get %>
       <% else %>
         <span>
           <%= link_to image_tag("signin_with_twitter_logo.png", :size => "188x30", :class => "twitter_layout"), user_omniauth_authorize_path(:twitter) %>

diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
@@ -220,7 +220,7 @@
 
   # Set this configuration to false if you want /users/sign_out to sign out
   # only the current scope. By default, Devise signs out all scopes.
-  # config.sign_out_all_scopes = true
+  config.sign_out_all_scopes = false
 
   # ==> Navigation configuration
   # Lists the formats that should be treated as navigational. Formats like