From bcb2464b531bf7fd4a3631d7ef485b4761558636 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 25 Sep 2019 09:34:45 +0000
Subject: [PATCH 1/2] Bump friendly_id from 5.2.5 to 5.3.0

Bumps [friendly_id](https://github.com/norman/friendly_id) from 5.2.5 to 5.3.0.
- [Release notes](https://github.com/norman/friendly_id/releases)
- [Changelog](https://github.com/norman/friendly_id/blob/master/Changelog.md)
- [Commits](https://github.com/norman/friendly_id/compare/5.2.5...5.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c015705df..9b5773e1e 100644
--- 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)

From 50723532933e4fdc0bee1df35b330f09d1931a79 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Tue, 24 Sep 2019 14:56:40 +1200
Subject: [PATCH 2/2] Only save location (used for post-signin redirect) if
 this is a format html page

---
 app/controllers/application_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 023603b33..e30fe25b1 100644
--- 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