From a8b0bd2401f679b4c273e87037d874ddd3c7a452 Mon Sep 17 00:00:00 2001
From: Dimitar Dimitrov <me@ddimitrov.name>
Date: Sun, 27 Nov 2022 18:57:22 +0200
Subject: [PATCH] Update ActiveAdmin to 1.1.0 to resolve an issue with Ransack

We hit this issue when filtering: https://github.com/activeadmin/activeadmin/issues/5333

NoMethodError: undefined method `names_by_decreasing_length' for Ransack::Predicate:Class (Most recent call first)
---
 Gemfile                                  |  2 +-
 Gemfile.lock                             | 12 +++---------
 app/assets/stylesheets/active_admin.scss | 17 +++++++++++++++++
 3 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100644 app/assets/stylesheets/active_admin.scss

diff --git a/Gemfile b/Gemfile
index dac83a0..76a11ea 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,7 @@ gem 'bcrypt', '~> 3.1.7'
 gem 'rails-i18n'
 gem 'rollbar'
 gem 'devise', '~> 4.4.0'
-gem 'activeadmin', '~> 1.0.0'
+gem 'activeadmin', '~> 1.1.0'
 gem 'paperclip'
 gem 'aws-sdk', '~> 1.5'
 gem 'email_validator'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4ce52e3..942637c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -21,19 +21,17 @@ GEM
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activeadmin (1.0.0)
+    activeadmin (1.1.0)
       arbre (>= 1.1.1)
-      bourbon
       coffee-rails
       formtastic (~> 3.1)
       formtastic_i18n
       inherited_resources (~> 1.7)
       jquery-rails
-      jquery-ui-rails
       kaminari (>= 0.15, < 2.0)
       railties (>= 4.2, < 5.2)
       ransack (~> 1.3)
-      sass-rails
+      sass (~> 3.1)
       sprockets (< 4.1)
     activejob (4.2.11.3)
       activesupport (= 4.2.11.3)
@@ -69,8 +67,6 @@ GEM
     bcrypt (3.1.18)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bourbon (7.2.0)
-      thor (~> 1.0)
     builder (3.2.4)
     byebug (11.1.3)
     capistrano (3.17.1)
@@ -239,8 +235,6 @@ GEM
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (6.0.1)
-      railties (>= 3.2.16)
     json (1.8.6)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -392,7 +386,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activeadmin (~> 1.0.0)
+  activeadmin (~> 1.1.0)
   asset_sync
   aws-sdk (~> 1.5)
   bcrypt (~> 3.1.7)
diff --git a/app/assets/stylesheets/active_admin.scss b/app/assets/stylesheets/active_admin.scss
new file mode 100644
index 0000000..d3c61f3
--- /dev/null
+++ b/app/assets/stylesheets/active_admin.scss
@@ -0,0 +1,17 @@
+// SASS variable overrides must be declared before loading up Active Admin's styles.
+//
+// To view the variables that Active Admin provides, take a look at
+// `app/assets/stylesheets/active_admin/mixins/_variables.scss` in the
+// Active Admin source.
+//
+// For example, to change the sidebar width:
+// $sidebar-width: 242px;
+
+// Active Admin's got SASS!
+@import "active_admin/mixins";
+@import "active_admin/base";
+
+// Overriding any non-variable SASS must be done after the fact.
+// For example, to change the default status-tag color:
+//
+//   .status_tag { background: #6090DB; }