activeadmin-rb 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a41a8ee3cc7e2785ddb82d531a92b44f96bd93228384fcf5641872ca9dbe482
-  data.tar.gz: e3ed462ae8748510d698ac1b79499ac295f8bc4b9667da0324e0e92c3d5df4d0
+  metadata.gz: 5ced5dec79ddb057e1fc140d5eba3046d2b16462252732ae69fbbd1df9b13fda
+  data.tar.gz: 8a4c7165581418d169b8b621e2441bfe459650918d19a625b40834fbe8c2e126
 SHA512:
-  metadata.gz: d7ab0bc94e0895c641b3b64ffd687e0783e9ffcd3cda1a4da783683934939e41a0bea6ba3a2d06e0f61ae5aacb121d3baadfd9726b10cb13caae29536ab50f2c
-  data.tar.gz: 0a0900dba255ecae449f82b5813dc0614a8b57f5b937b6fc94b784bf0d991dc13a7b88d9253c26e7d21064355ba52c7a3ae6c46c422ddc445739498f5b867135
+  metadata.gz: 6ad1faa5eb2118b68378c42b4e6c32a2d56f3ad6e2491212ced8ef74bbb0a13da3ea8aebe9556358761f343bd80f9b2a5ca1ae1d16efbad42a6ac848f11ed08f
+  data.tar.gz: f8214d1c7f9eb277cd14f5c719feb9d3b163d52c621ebb809e42bec70565633bbc35431d730f376f50d052d6ce80cd6b1a433497781b34d85894a679d7e1b031

data/.travis.yml

@@ -30,11 +30,10 @@ rvm:
   - 2.6
 
 gemfile:
-  - gemfiles/rails_42.gemfile
+  - gemfiles/rails_60.gemfile
   - gemfiles/rails_50.gemfile
   - gemfiles/rails_51.gemfile
   - gemfiles/rails_52.gemfile
-  - gemfiles/rails_60.gemfile
 
 env:
   global:

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.5.1 [☰](https://github.com/varyonic/activeadmin-rb/compare/v1.5.0...v1.5.1)
+
+* More fixes to support final release of Rails 6.0.
+
 ## 1.5.0 [☰](https://github.com/varyonic/activeadmin-rb/compare/v1.4.0...v1.5.0)
 
 ### Enhancements
@@ -47,6 +51,10 @@
 
 * gemspec should have more permissive ransack dependency. [#5448] by [@varyonic]
 
+### Removals
+
+* Rails 4.2 support has been dropped. [#5104][] by [@javierjulio][] and [@deivid-rodriguez][]
+
 ## 1.3.0 [☰](https://github.com/activeadmin/activeadmin/compare/v1.2.1...v1.3.0)
 
 ### Enhancements
@@ -292,6 +300,7 @@ Please check [0-6-stable] for previous changes.
 [#5069]: https://github.com/activeadmin/activeadmin/pull/5069
 [#5088]: https://github.com/activeadmin/activeadmin/pull/5088
 [#5093]: https://github.com/activeadmin/activeadmin/pull/5093
+[#5104]: https://github.com/activeadmin/activeadmin/pull/5104
 [#5119]: https://github.com/activeadmin/activeadmin/pull/5119
 [#5120]: https://github.com/activeadmin/activeadmin/pull/5120
 [#5125]: https://github.com/activeadmin/activeadmin/pull/5125

data/Gemfile

@@ -24,7 +24,7 @@ gem 'yard'                        # Documentation generator
 gem 'redcarpet', platforms: :mri  # Markdown implementation (for yard)
 gem 'kramdown', platforms: :jruby # Markdown implementation (for yard)
 
-group :development do
+group :development, :test do
   # Debugging
   gem 'better_errors' # Web UI to debug exceptions. Go to /__better_errors to access the latest one
 
@@ -45,6 +45,5 @@ group :test do
   gem 'launchy'
   gem 'rspec-rails'
   gem 'i18n-spec'
-  gem 'sqlite3', '< 1.4', platforms: :mri
   gem 'poltergeist'
 end

data/activeadmin-rb.gemspec

@@ -25,9 +25,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'inherited_resources', '>= 1.9.0'
   s.add_dependency 'jquery-rails', '>= 4.2.0'
   s.add_dependency 'jquery-ui-rails', '~> 6.0'
-  s.add_dependency 'kaminari', '>= 0.15'
-  s.add_dependency 'railties', '>= 4.2'
+  s.add_dependency 'kaminari', '>= 1.0.1'
+  s.add_dependency 'railties', '>= 5.0'
   s.add_dependency 'ransack', '>= 1.8.7'
-  s.add_dependency 'sass', '~> 3.1'
-  s.add_dependency 'sprockets', '< 4.1'
+  s.add_dependency 'sass-rails'
+  s.add_dependency 'sprockets'
 end

data/gemfiles/rails_50.gemfile

@@ -3,10 +3,12 @@ source "https://rubygems.org"
 eval_gemfile(File.expand_path(File.join("..", "Gemfile"), __dir__))
 
 gem "rails", "5.0.7"
+gem "sprockets", "< 4"
 gem "devise", "~> 4.0"
 gem "draper", "~> 3.0"
 gem "ransack", "~> 1.8.7" # 2.x for Rails 5.2+ only.
 gem "rails-i18n"
+gem 'sqlite3', '< 1.4', platforms: :mri
 gem "activerecord-jdbcsqlite3-adapter", "~> 50.0", platforms: :jruby
 
 gemspec path: "../"

data/gemfiles/rails_51.gemfile

@@ -3,10 +3,12 @@ source "https://rubygems.org"
 eval_gemfile(File.expand_path(File.join("..", "Gemfile"), __dir__))
 
 gem "rails", "5.1.6"
+gem "sprockets", "< 4"
 gem "devise", "~> 4.3"
 gem "draper", "~> 3.0"
 gem "ransack", "~> 1.8.7" # 2.x for Rails 5.2+ only.
 gem "rails-i18n"
+gem 'sqlite3', '< 1.4', platforms: :mri
 gem "activerecord-jdbcsqlite3-adapter", "~> 51.0", platforms: :jruby
 
 gemspec path: "../"

data/gemfiles/rails_52.gemfile

@@ -3,11 +3,13 @@ source "https://rubygems.org"
 eval_gemfile(File.expand_path(File.join("..", "Gemfile"), __dir__))
 
 gem "rails", "5.2.1"
+gem "sprockets", "< 4"
 gem "bootsnap"
 gem "devise", "~> 4.4"
 gem "draper", "~> 3.0"
 gem "ransack", "2.0" # 2.x for Rails 5.2+ only.
 gem "rails-i18n"
+gem 'sqlite3', '< 1.4', platforms: :mri
 gem "activerecord-jdbcsqlite3-adapter", ">= 52.0", platforms: :jruby
 
 gemspec path: "../"

data/gemfiles/rails_60.gemfile

@@ -4,10 +4,13 @@ eval_gemfile(File.expand_path(File.join("..", "Gemfile"), __dir__))
 
 gem "rails", ">= 6.0.x"
 gem "rails-i18n", ">= 6.0.x"
+gem "sass-rails", ">= 6.0.x"
+gem "sprockets", ">= 4.0.x"
 gem "bootsnap"
 gem "devise", "~> 4.4"
 gem "draper", "~> 3.0"
 gem "ransack", ">= 2.0" # 2.x for Rails 5.2+ only.
-gem "activerecord-jdbcsqlite3-adapter", ">= 52.0", platforms: :jruby
+gem 'sqlite3', platforms: :mri
+gem "activerecord-jdbcsqlite3-adapter", ">= 60.0.x", platform: :jruby
 
 gemspec path: "../"

data/lib/active_admin.rb

@@ -6,6 +6,7 @@ require 'ransack_ext'
 require 'kaminari'
 require 'formtastic'
 require 'formtastic_i18n'
+require 'sass-rails'
 require 'inherited_resources'
 require 'jquery-rails'
 require 'jquery-ui-rails'

data/lib/active_admin/application.rb

@@ -1,5 +1,4 @@
 require 'active_admin/router'
-require 'active_admin/reloader'
 require 'active_admin/application_settings'
 require 'active_admin/namespace_settings'
 
@@ -201,11 +200,11 @@ module ActiveAdmin
           # Rails is about to unload all the app files (e.g. models), so we
           # should first unload the classes generated by Active Admin, otherwise
           # they will contain references to the stale (unloaded) classes.
-          Reloader.to_prepare(prepend: true, &unload_active_admin)
+          ActiveSupport::Reloader.to_prepare(prepend: true, &unload_active_admin)
         else
           # If the user has configured the app to always reload app files after
           # each request, so we should unload the generated classes too.
-          Reloader.to_complete(&unload_active_admin)
+          ActiveSupport::Reloader.to_complete(&unload_active_admin)
         end
 
         admin_dirs = {}
@@ -220,7 +219,7 @@ module ActiveAdmin
 
         app.reloaders << routes_reloader
 
-        Reloader.to_prepare do
+        ActiveSupport::Reloader.to_prepare do
           # Rails might have reloaded the routes for other reasons (e.g.
           # routes.rb has changed), in which case Active Admin would have been
           # loaded via the `ActiveAdmin.routes` call in `routes.rb`.

data/lib/active_admin/base_controller/authorization.rb

@@ -111,16 +111,14 @@ module ActiveAdmin
             redirect_backwards_or_to_root
           end
 
-          body = ActiveAdmin::Dependency.rails.render_key
-
-          format.csv  { render body =>        error,           status: :unauthorized }
+          format.csv  { render body:          error,           status: :unauthorized }
           format.json { render json: { error: error },         status: :unauthorized }
           format.xml  { render xml: "<error>#{error}</error>", status: :unauthorized }
         end
       end
 
       def redirect_backwards_or_to_root
-        ActiveAdmin::Dependency.rails.redirect_back self, active_admin_root
+        redirect_back fallback_location: active_admin_root
       end
 
     end

data/lib/active_admin/dependency.rb

@@ -55,10 +55,6 @@ module ActiveAdmin
       Matcher.new name.to_s
     end
 
-    def self.rails5?
-      rails >= '5.x'
-    end
-
     class Matcher
       attr_reader :name
 
@@ -94,78 +90,6 @@ module ActiveAdmin
         info = spec ? "#{spec.name} #{spec.version}" : '(missing)'
         "<ActiveAdmin::Dependency::Matcher for #{info}>"
       end
-
-      def adapter
-        @adapter ||= Adapter.const_get(@name.camelize).new self
-      end
-
-      def method_missing(method, *args, &block)
-        if respond_to_missing?(method)
-          adapter.send method, *args, &block
-        else
-          super
-        end
-      end
-
-      def respond_to_missing?(method, include_private = false)
-        adapter.respond_to?(method) || super
-      rescue NameError
-        # 🐾
-      end
-    end
-
-    # Dependency adapters provide an easy way to wrap the conditional logic
-    # necessary to support multiple versions of a gem.
-    #
-    # ActiveAdmin::Dependency.rails.adapter.parameterize 'a b'
-    # => 'a_b'
-    #
-    # ActiveAdmin::Dependency.rails.parameterize 'a b'
-    # => 'a_b'
-    #
-    # ActiveAdmin::Dependency.devise.adapter
-    # -> NameError: uninitialized constant ActiveAdmin::Dependency::Adapter::Devise
-    #
-    module Adapter
-      class Base
-        def initialize(version)
-          @version = version
-        end
-      end
-
-      class Rails < Base
-        def optional_belongs_to_flag
-          if Dependency.rails5?
-            { optional: true }
-          else
-            { required: false }
-          end
-        end
-
-        def parameterize(string)
-          if Dependency.rails5?
-            string.parameterize separator: '_'
-          else
-            string.parameterize '_'
-          end
-        end
-
-        def redirect_back(controller, fallback_location)
-          controller.instance_exec do
-            if Dependency.rails5?
-              redirect_back fallback_location: fallback_location
-            elsif controller.request.headers.key? 'HTTP_REFERER'
-              redirect_to :back
-            else
-              redirect_to fallback_location
-            end
-          end
-        end
-
-        def render_key
-          Dependency.rails5? ? :body : :text
-        end
-      end
     end
 
   end

data/lib/active_admin/orm/active_record/comments.rb

@@ -64,21 +64,21 @@ ActiveAdmin.after_load do |app|
         def create
           create! do |success, failure|
             success.html do
-              ActiveAdmin::Dependency.rails.redirect_back self, active_admin_root
+              redirect_back fallback_location: active_admin_root
             end
             failure.html do
               flash[:error] = I18n.t 'active_admin.comments.errors.empty_text'
-              ActiveAdmin::Dependency.rails.redirect_back self, active_admin_root
+              redirect_back fallback_location: active_admin_root
             end
           end
 
           def destroy
             destroy! do |success, failure|
               success.html do
-                ActiveAdmin::Dependency.rails.redirect_back self, active_admin_root
+                redirect_back fallback_location: active_admin_root
               end
               failure.html do
-                ActiveAdmin::Dependency.rails.redirect_back self, active_admin_root
+                redirect_back fallback_location: active_admin_root
               end
             end
           end

data/lib/active_admin/orm/active_record/comments/comment.rb

@@ -3,7 +3,7 @@ module ActiveAdmin
 
     self.table_name = "#{table_name_prefix}active_admin_comments#{table_name_suffix}"
 
-    belongs_to :resource, { polymorphic: true }.merge(ActiveAdmin::Dependency.rails.optional_belongs_to_flag)
+    belongs_to :resource, polymorphic: true, optional: true
     belongs_to :author,   polymorphic: true
 
     validates_presence_of :body, :namespace, :resource

data/lib/active_admin/resource_dsl.rb

@@ -187,7 +187,7 @@ module ActiveAdmin
     delegate :before_save,    :after_save,    to: :controller
     delegate :before_destroy, :after_destroy, to: :controller
 
-    # This code defines both *_filter and *_action for Rails 4.0 to Rails 5 and  *_action for Rails >= 5.1
+    # This code defines both *_filter and *_action for Rails 5.0 and  *_action for Rails >= 5.1
     phases = [
       :before, :skip_before,
       :after,  :skip_after,

data/lib/active_admin/scope.rb

@@ -32,10 +32,10 @@ module ActiveAdmin
 
       if name.is_a? Proc
         raise "A string/symbol is required as the second argument if your label is a proc." unless method
-        @id = ActiveAdmin::Dependency.rails.parameterize method.to_s
+        @id = method.to_s.parameterize(separator: "_")
       else
         @scope_method ||= name.to_sym
-        @id = ActiveAdmin::Dependency.rails.parameterize name.to_s
+        @id = name.to_s.parameterize(separator: "_")
       end
 
       @scope_method               = nil        if @scope_method == :all

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '1.5.0'
+  VERSION = '1.5.1'
 end

data/lib/active_admin/views/components/attributes_table.rb

@@ -26,7 +26,7 @@ module ActiveAdmin
         if options[:class]
           classes << options[:class]
         elsif title.present?
-          classes << "row-#{ActiveAdmin::Dependency.rails.parameterize(title.to_s)}"
+          classes << "row-#{title.to_s.parameterize(separator: "_")}"
         end
         options[:class] = classes.join(' ')
 

data/lib/active_admin/views/components/sidebar_section.rb

@@ -1,11 +1,8 @@
-require 'active_admin/helpers/output_safety_helper'
-
 module ActiveAdmin
   module Views
 
     class SidebarSection < Panel
       builder_method :sidebar_section
-      include OutputSafetyHelper
 
       # Takes a ActiveAdmin::SidebarSection instance
       def build(section)

data/lib/active_admin/views/components/table_for.rb

@@ -147,7 +147,7 @@ module ActiveAdmin
           if @options.has_key?(:class)
             html_classes << @options.delete(:class)
           elsif @title.present?
-            html_classes << "col-#{ActiveAdmin::Dependency.rails.parameterize(@title.to_s)}"
+            html_classes << "col-#{@title.to_s.parameterize(separator: "_")}"
           end
           @html_class = html_classes.join(' ')
           @data = args[1] || args[0]

data/lib/bug_report_templates/active_admin_master.rb

@@ -18,7 +18,6 @@ gemfile(true) do
   # Change Rails version if necessary.
   gem 'rails', '~> 5.1.0'
 
-  gem 'sass-rails'
   gem 'sqlite3', '< 1.4', platform: :mri
   gem 'activerecord-jdbcsqlite3-adapter', "~> 51.0", platform: :jruby
   gem 'jruby-openssl', '~> 0.10.1', platforms: :jruby

data/lib/generators/active_admin/install/templates/migrations/create_active_admin_comments.rb.erb

@@ -1,27 +1,13 @@
-<%
-  parent_class = ActiveRecord::Migration
-  parent_class = parent_class[parent_class.current_version] if Rails::VERSION::MAJOR >= 5
--%>
-class CreateActiveAdminComments < <%= parent_class.to_s %>
+class CreateActiveAdminComments < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version.to_s %>]
   def self.up
     create_table :active_admin_comments do |t|
       t.string :namespace
       t.text   :body
       t.references :resource, polymorphic: true
       t.references :author, polymorphic: true
-      <%- if Rails::VERSION::MAJOR >= 5 -%>
       t.timestamps
-      <%- else -%>
-      t.timestamps null: false
-      <%- end -%>
     end
     add_index :active_admin_comments, [:namespace]
-    <%- unless Rails::VERSION::MAJOR >= 5 -%>
-
-    add_index :active_admin_comments, [:author_type, :author_id]
-    add_index :active_admin_comments, [:resource_type, :resource_id]
-    <%- end -%>
-
   end
 
   def self.down

data/spec/support/rails_template.rb

@@ -6,19 +6,13 @@ create_file 'app/assets/stylesheets/some-random-css.css'
 create_file 'app/assets/javascripts/some-random-js.js'
 create_file 'app/assets/images/a/favicon.ico'
 
-belongs_to_optional_flag = if Rails::VERSION::MAJOR < 5
-                             "required: false"
-                           else
-                             "optional: true"
-                           end
-
 generate :model, 'post title:string body:text published_date:date author_id:integer ' +
   'position:integer custom_category_id:integer starred:boolean foo_id:integer'
 
 create_file 'app/models/post.rb', <<-RUBY.strip_heredoc, force: true
   class Post < ActiveRecord::Base
-    belongs_to :category, foreign_key: :custom_category_id, #{belongs_to_optional_flag}
-    belongs_to :author, class_name: 'User', #{belongs_to_optional_flag}
+    belongs_to :category, foreign_key: :custom_category_id, optional: true
+    belongs_to :author, class_name: 'User', optional: true
     has_many :taggings
     accepts_nested_attributes_for :author
     accepts_nested_attributes_for :taggings, allow_destroy: true
@@ -102,14 +96,14 @@ RUBY
 generate :model, 'tagging post_id:integer tag_id:integer position:integer'
 create_file 'app/models/tagging.rb', <<-RUBY.strip_heredoc, force: true
   class Tagging < ActiveRecord::Base
-    belongs_to :post, #{belongs_to_optional_flag}
-    belongs_to :tag, #{belongs_to_optional_flag}
+    belongs_to :post, optional: true
+    belongs_to :tag, optional: true
 
     delegate :name, to: :tag, prefix: true
   end
 RUBY
 
-gsub_file 'config/environments/test.rb', /  config.cache_classes = true/, <<-RUBY
+gsub_file 'config/environments/test.rb', /  config.cache_classes = .*$/, <<-RUBY
 
   config.cache_classes = !ENV['CLASS_RELOADING']
   config.action_mailer.default_url_options = {host: 'example.com'}
@@ -117,6 +111,14 @@ gsub_file 'config/environments/test.rb', /  config.cache_classes = true/, <<-RUB
 
   config.active_record.maintain_test_schema = false
 
+  if Rails::VERSION::MAJOR >= 6
+    config.hosts = [
+      IPAddr.new("0.0.0.0/0"), # All IPv4 addresses.
+      IPAddr.new("::/0"),      # All IPv6 addresses.
+      "www.example.com",
+      "localhost"              # The localhost reserved domain.
+    ]
+  end
 RUBY
 
 # TODO: remove this line after the STI pre-loading is fixed

data/spec/unit/action_builder_spec.rb

@@ -58,9 +58,7 @@ RSpec.describe 'defining actions from registration blocks', type: :controller do
       end
 
       it 'sets the page title' do
-        params = {id: 1}
-        params = {params: params} if ActiveAdmin::Dependency.rails5?
-        get :comment, params
+        get :comment, params: { id: 1 }
 
         expect(controller.instance_variable_get(:@page_title)).to eq 'My Awesome Comment'
       end

data/spec/unit/authorization/index_overriding_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe 'Index overriding', type: :controller do
     @controller.instance_eval do
       def index
         super do
-          render ActiveAdmin::Dependency.rails.render_key => 'Rendered from passed block'
+          render body: 'Rendered from passed block'
           return
         end
       end

data/tasks/local.rake

@@ -12,7 +12,7 @@ task :local do
   # If it's a rails command, or we're using Rails 5, auto add the rails script
   rails_commands = %w(generate console server db dbconsole g c s runner)
 
-  if Rails::VERSION::MAJOR >= 5 || rails_commands.include?(argv[0])
+  if rails_commands.include?(argv[0])
     argv.unshift('rails')
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-rb
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Greg Bell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-15 00:00:00.000000000 Z
+date: 2020-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -151,33 +151,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.8.7
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '0'
 description: The administration framework for Ruby on Rails.
 email:
 - gregdbell@gmail.com
@@ -504,7 +504,6 @@ files:
 - lib/active_admin/helpers/collection.rb
 - lib/active_admin/helpers/i18n.rb
 - lib/active_admin/helpers/optional_display.rb
-- lib/active_admin/helpers/output_safety_helper.rb
 - lib/active_admin/helpers/routes/url_helpers.rb
 - lib/active_admin/helpers/scope_chain.rb
 - lib/active_admin/inputs.rb
@@ -542,7 +541,6 @@ files:
 - lib/active_admin/page_dsl.rb
 - lib/active_admin/page_presenter.rb
 - lib/active_admin/pundit_adapter.rb
-- lib/active_admin/reloader.rb
 - lib/active_admin/resource.rb
 - lib/active_admin/resource/action_items.rb
 - lib/active_admin/resource/attributes.rb
@@ -700,7 +698,6 @@ files:
 - spec/unit/form_builder_spec.rb
 - spec/unit/generators/install_spec.rb
 - spec/unit/helpers/collection_spec.rb
-- spec/unit/helpers/output_safety_helper_spec.rb
 - spec/unit/helpers/scope_chain_spec.rb
 - spec/unit/i18n_spec.rb
 - spec/unit/localizers/resource_localizer_spec.rb
@@ -793,7 +790,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: The administration framework for Ruby on Rails.
@@ -951,7 +949,6 @@ test_files:
 - spec/unit/form_builder_spec.rb
 - spec/unit/generators/install_spec.rb
 - spec/unit/helpers/collection_spec.rb
-- spec/unit/helpers/output_safety_helper_spec.rb
 - spec/unit/helpers/scope_chain_spec.rb
 - spec/unit/i18n_spec.rb
 - spec/unit/localizers/resource_localizer_spec.rb

data/lib/active_admin/helpers/output_safety_helper.rb

@@ -1,35 +0,0 @@
-module ActiveAdmin
-  module OutputSafetyHelper
-    # Converts the array to a comma-separated sentence where the last element is
-    # joined by the connector word. This is the html_safe-aware version of
-    # ActiveSupport's {Array#to_sentence}[http://api.rubyonrails.org/classes/Array.html#method-i-to_sentence].
-    #
-    # Copied from Rails 5 to support Rails 4.
-    # https://github.com/rails/rails/blob/9c35bf2a6a27431c6aa283db781c19f61c5155be/actionview/lib/action_view/helpers/output_safety_helper.rb#L43
-    def to_sentence(array, options = {})
-      options.assert_valid_keys(:words_connector, :two_words_connector, :last_word_connector, :locale)
-
-      default_connectors = {
-        words_connector: ", ",
-        two_words_connector: " and ",
-        last_word_connector: ", and "
-      }
-      if defined?(::I18n)
-        i18n_connectors = ::I18n.translate(:'support.array', locale: options[:locale], default: {})
-        default_connectors.merge!(i18n_connectors)
-      end
-      options = default_connectors.merge!(options)
-
-      case array.length
-      when 0
-        "".html_safe
-      when 1
-        ERB::Util.html_escape(array[0])
-      when 2
-        safe_join([array[0], array[1]], options[:two_words_connector])
-      else
-        safe_join([safe_join(array[0...-1], options[:words_connector]), options[:last_word_connector], array[-1]], nil)
-      end
-    end
-  end
-end

data/lib/active_admin/reloader.rb

@@ -1,25 +0,0 @@
-module ActiveAdmin
-  module Reloader
-    # ActionDispatch::Reloader.to_prepare is deprecated in Rails 5.0 and will be removed from Rails 5.1
-    #
-    # Use ActiveSupport::Reloader if available for Rails 5, fall back to ActionDispatch::Reloader for earlier Rails
-    def self.to_prepare(*args, &block)
-      if defined? ActiveSupport::Reloader
-        ActiveSupport::Reloader.to_prepare(*args, &block)
-      else
-        ActionDispatch::Reloader.to_prepare(*args, &block)
-      end
-    end
-
-    # ActionDispatch::Reloader.to_cleanup is deprecated in Rails 5.0 and will be removed from Rails 5.1
-    #
-    # Use ActiveSupport::Reloader if available for Rails 5, fall back to ActionDispatch::Reloader for earlier Rails
-    def self.to_complete(*args, &block)
-      if defined? ActiveSupport::Reloader
-        ActiveSupport::Reloader.to_complete(*args, &block)
-      else
-        ActionDispatch::Reloader.to_cleanup(*args, &block)
-      end
-    end
-  end
-end

data/spec/unit/helpers/output_safety_helper_spec.rb

@@ -1,79 +0,0 @@
-require 'rails_helper'
-
-# Adapted from Rails 5 to support Rails 4.
-# https://github.com/rails/rails/blob/9c35bf2a6a27431c6aa283db781c19f61c5155be/actionview/test/template/output_safety_helper_test.rb
-RSpec.describe ActiveAdmin::OutputSafetyHelper, type: :view do
-  include described_class
-
-  before do
-    @string = "hello"
-  end
-
-  describe "to_sentence" do
-    it "escapes non-html_safe values" do
-      actual = to_sentence(%w(< > & ' "))
-      assert actual.html_safe?
-      assert_equal("&lt;, &gt;, &amp;, &#39;, and &quot;", actual)
-
-      actual = to_sentence(%w(<script>))
-      assert actual.html_safe?
-      assert_equal("&lt;script&gt;", actual)
-    end
-
-    it "does not double escape if single value is html_safe" do
-      assert_equal("&lt;script&gt;", to_sentence([ERB::Util.html_escape("<script>")]))
-      assert_equal("&lt;script&gt;", to_sentence(["&lt;script&gt;".html_safe]))
-      assert_equal("&amp;lt;script&amp;gt;", to_sentence(["&lt;script&gt;"]))
-    end
-
-    it "checks connector words for html safety" do
-      assert_equal "one & two, and three", to_sentence(["one", "two", "three"], words_connector: " & ".html_safe)
-      assert_equal "one & two", to_sentence(["one", "two"], two_words_connector: " & ".html_safe)
-      assert_equal "one, two &lt;script&gt;alert(1)&lt;/script&gt; three", to_sentence(["one", "two", "three"], last_word_connector: " <script>alert(1)</script> ")
-    end
-
-    it "does not escape html_safe values" do
-      ptag = content_tag("p") do
-        safe_join(["<marquee>shady stuff</marquee>", tag("br")])
-      end
-      url = "https://example.com"
-      expected = %(<a href="#{url}">#{url}</a> and <p>&lt;marquee&gt;shady stuff&lt;/marquee&gt;<br /></p>)
-      actual = to_sentence([link_to(url, url), ptag])
-      assert actual.html_safe?
-      assert_equal(expected, actual)
-    end
-
-    it "handles blank strings" do
-      actual = to_sentence(["", "two", "three"])
-      assert actual.html_safe?
-      assert_equal ", two, and three", actual
-    end
-
-    it "handles nil values" do
-      actual = to_sentence([nil, "two", "three"])
-      assert actual.html_safe?
-      assert_equal ", two, and three", actual
-    end
-
-    it "still supports ActiveSupports Array#to_sentence arguments" do
-      assert_equal "one two, and three", to_sentence(["one", "two", "three"], words_connector: " ")
-      assert_equal "one & two, and three", to_sentence(["one", "two", "three"], words_connector: " & ".html_safe)
-      assert_equal "onetwo, and three", to_sentence(["one", "two", "three"], words_connector: nil)
-      assert_equal "one, two, and also three", to_sentence(["one", "two", "three"], last_word_connector: ", and also ")
-      assert_equal "one, twothree", to_sentence(["one", "two", "three"], last_word_connector: nil)
-      assert_equal "one, two three", to_sentence(["one", "two", "three"], last_word_connector: " ")
-      assert_equal "one, two and three", to_sentence(["one", "two", "three"], last_word_connector: " and ")
-    end
-
-    it "is not affected by $," do
-      separator_was = $,
-      $, = "|"
-      begin
-        assert_equal "one and two", to_sentence(["one", "two"])
-        assert_equal "one, two, and three", to_sentence(["one", "two", "three"])
-      ensure
-        $, = separator_was
-      end
-    end
-  end
-end