Skip to content

Commit

Permalink
chore: Update of obsolete libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
martintomas committed Jan 15, 2024
1 parent 67169fc commit 3f88f8b
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 28 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ gem 'bootsnap', '>= 1.4.2', require: false

gem 'activerecord-import'
gem 'acts_as_list'
gem 'activeadmin', '2.9.0' # TODO: update when csv export is fixed, check bom options
gem 'activeadmin'
gem 'activeadmin_addons'
gem 'devise', '>= 4.7.1'
gem 'cancancan'
Expand Down
54 changes: 27 additions & 27 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@ GEM
actionpack
addressable
active_material (1.5.2)
activeadmin (2.9.0)
activeadmin (3.2.0)
arbre (~> 1.2, >= 1.2.1)
formtastic (>= 3.1, < 5.0)
formtastic_i18n (~> 0.4)
formtastic (>= 3.1)
formtastic_i18n (>= 0.4)
inherited_resources (~> 1.7)
jquery-rails (~> 4.2)
kaminari (~> 1.0, >= 1.2.1)
railties (>= 5.2, < 6.2)
ransack (~> 2.1, >= 2.1.1)
jquery-rails (>= 4.2)
kaminari (>= 1.2.1)
railties (>= 6.1)
ransack (>= 4.0)
activeadmin_addons (1.9.0)
active_material
railties
Expand Down Expand Up @@ -97,9 +97,9 @@ GEM
rake (>= 10.4, < 14.0)
appsignal (3.4.6)
rack
arbre (1.5.0)
activesupport (>= 3.0.0, < 7.1)
ruby2_keywords (>= 0.0.2, < 1.0)
arbre (1.7.0)
activesupport (>= 3.0.0)
ruby2_keywords (>= 0.0.2)
ast (2.4.2)
attr_extras (6.2.5)
babel-source (5.8.35)
Expand Down Expand Up @@ -203,8 +203,8 @@ GEM
ffi (1.15.5)
font-awesome-rails (4.7.0.8)
railties (>= 3.2, < 8.0)
formtastic (4.0.0)
actionpack (>= 5.2.0)
formtastic (5.0.0)
actionpack (>= 6.0.0)
formtastic_i18n (0.7.0)
friendly_id (5.4.2)
activerecord (>= 4.0.0)
Expand Down Expand Up @@ -244,7 +244,7 @@ GEM
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
has_scope (0.8.0)
has_scope (0.8.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
htmlentities (4.3.4)
Expand All @@ -254,12 +254,12 @@ GEM
image_processing (1.12.2)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
inherited_resources (1.13.1)
actionpack (>= 5.2, < 7.1)
has_scope (~> 0.6)
railties (>= 5.2, < 7.1)
responders (>= 2, < 4)
jquery-rails (4.5.0)
inherited_resources (1.14.0)
actionpack (>= 6.0)
has_scope (>= 0.6)
railties (>= 6.0)
responders (>= 2)
jquery-rails (4.6.0)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
Expand Down Expand Up @@ -336,7 +336,7 @@ GEM
i18n (>= 0.5.0)
railties (>= 5.0.0)
public_suffix (4.0.7)
puma (5.6.7)
puma (5.6.8)
nio4r (~> 2.0)
racc (1.7.3)
rack (2.2.8)
Expand Down Expand Up @@ -380,9 +380,9 @@ GEM
thor (~> 1.0)
rainbow (3.1.1)
rake (13.1.0)
ransack (2.6.0)
activerecord (>= 6.0.4)
activesupport (>= 6.0.4)
ransack (4.1.1)
activerecord (>= 6.1.5)
activesupport (>= 6.1.5)
i18n
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
Expand All @@ -401,9 +401,9 @@ GEM
request_store (1.5.1)
rack (>= 1.4)
require_all (3.0.0)
responders (3.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
responders (3.1.1)
actionpack (>= 5.2)
railties (>= 5.2)
retriable (3.1.2)
rexml (3.2.6)
roo (2.10.0)
Expand Down Expand Up @@ -550,7 +550,7 @@ PLATFORMS

DEPENDENCIES
active_link_to
activeadmin (= 2.9.0)
activeadmin
activeadmin_addons
activerecord-import
acts_as_list
Expand Down
8 changes: 8 additions & 0 deletions app/models/application_record.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,12 @@ class ApplicationRecord < ActiveRecord::Base
def self.array_to_enum_hash(array)
array.map { |el| [el, el] }.to_h
end

def self.ransackable_associations(_auth_object = nil)
@ransackable_associations ||= reflect_on_all_associations.map { |a| a.name.to_s }
end

def self.ransackable_attributes(_auth_object = nil)
@ransackable_attributes ||= column_names + _ransackers.keys + _ransack_aliases.keys + attribute_aliases.keys
end
end

0 comments on commit 3f88f8b

Please sign in to comment.