From 6d4f1a1b69278d88f7b0210691104a676f378c9c Mon Sep 17 00:00:00 2001 From: Bruno Casali Date: Wed, 1 Sep 2021 09:07:00 -0300 Subject: [PATCH 1/2] Remove deprecated gem devise_lastseenable & Add devise_last_seen Closes #4807 https://github.com/diaspora/diaspora/issues/4807 --- Gemfile | 2 +- Gemfile.lock | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 59739ec97e4..09fd7ccfedb 100644 --- a/Gemfile +++ b/Gemfile @@ -28,7 +28,7 @@ gem "yajl-ruby", "1.4.1" # Authentication gem "devise", "4.8.0" -gem "devise_lastseenable", "0.0.6" +gem "devise_last_seen", "0.2.1" gem "devise-two-factor", "4.0.0" gem "rqrcode", "2.0.0" diff --git a/Gemfile.lock b/Gemfile.lock index 1bf8afb66dc..a675ed3c089 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -205,9 +205,8 @@ GEM devise (~> 4.0) railties (< 6.2) rotp (~> 6.0) - devise_lastseenable (0.0.6) + devise_last_seen (0.2.1) devise - rails (>= 3.0.4) diaspora_federation (0.2.6) faraday (>= 0.9.0, < 0.16.0) faraday_middleware (>= 0.10.0, < 0.14.0) @@ -814,7 +813,7 @@ DEPENDENCIES database_cleaner-active_record (= 1.8.0) devise (= 4.8.0) devise-two-factor (= 4.0.0) - devise_lastseenable (= 0.0.6) + devise_last_seen (= 0.2.1) diaspora_federation-json_schema (= 0.2.6) diaspora_federation-rails (= 0.2.6) diaspora_federation-test (= 0.2.6) From e3ddecb62982b7a7710920626666cd3b3454aa65 Mon Sep 17 00:00:00 2001 From: Thorsten Claus Date: Sat, 4 Sep 2021 18:43:18 +0200 Subject: [PATCH 2/2] ensure ./log folder exists --- log/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 log/.gitkeep diff --git a/log/.gitkeep b/log/.gitkeep new file mode 100644 index 00000000000..e69de29bb2d