Merge branch 'dev' into post-comments

2026-05-14 03:05:59 -04:00 · 2019-09-26 21:51:17 +12:00
parent 685fddb2be 5072353293
commit e08daa0b2b
2 changed files with 2 additions and 2 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -197,7 +197,7 @@ GEM
    flickraw (0.9.10)
    font-awesome-sass (5.11.2)
      sassc (>= 1.11)
-    friendly_id (5.2.5)
+    friendly_id (5.3.0)
      activerecord (>= 4.0.0)
    geocoder (1.4.9)
    gibbon (1.2.1)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -15,7 +15,7 @@ class ApplicationController < ActionController::Base
                             "/members/password/edit",
                             "/members/confirmation",
                             "/members/sign_out"]) || request.xhr?
-      store_location_for(:member, request.fullpath)
+      store_location_for(:member, request.fullpath) if request.format == :html
    end
  end