Merge pull request #1551 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

1 files changed, 13 insertions, 0 deletions

diff --git a/app/controllers/settings/login_activities_controller.rb b/app/controllers/settings/login_activities_controller.rb
new file mode 100644
index 000000000..ee77524b1
--- /dev/null
+++ b/app/controllers/settings/login_activities_controller.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class Settings::LoginActivitiesController < Settings::BaseController
+  def index
+    @login_activities = LoginActivity.where(user: current_user).order(id: :desc).page(params[:page])
+  end
+
+  private
+
+  def set_pack
+    use_pack 'settings'
+  end
+end