diff --git a/.circleci/config.yml b/.circleci/config.yml index 03aecf5f302c926c4fc42e5179bcdd3a862f8fe1..056dab95c4a1eb6dd131bda4464b5752b8f2e7b8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -45,21 +45,6 @@ default_job: &default_job - run: bundle exec appraisal rake jobs: - ruby-25: - <<: *default_job - docker: - - image: circleci/ruby:2.5.0-node-browsers - environment: - PGHOST: localhost - PGUSER: administrate - RAILS_ENV: test - BUNDLER_VERSION: 2.1.4 - - image: postgres:10.1-alpine - environment: - POSTGRES_USER: administrate - POSTGRES_DB: ruby25 - POSTGRES_PASSWORD: "" - ruby-26: <<: *default_job docker: @@ -94,4 +79,3 @@ workflows: jobs: - ruby-27 - ruby-26 - - ruby-25 diff --git a/Gemfile b/Gemfile index 61c3637f4a7a04b8096bc7d1c9dab249fceb5e62..502a23021c68e686e369292ca9ec25d83eebb4eb 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,7 @@ gemspec gem "administrate-field-image" gem "faker" +gem "front_matter_parser" gem "globalid" gem "kaminari-i18n" gem "pg" @@ -11,10 +12,6 @@ gem "redcarpet" gem "sentry-raven" gem "unicorn" -# Version 1.0.1 invokes `YAML.safe_load` with arguments that are incompatible -# with Ruby 2.5, causing an `ArgumentError: unknown keyword: permitted_classes` -gem "front_matter_parser", "1.0.0" - group :development, :test do gem "appraisal" gem "awesome_print" diff --git a/Gemfile.lock b/Gemfile.lock index 7e0f4a0a5e50895daff8a6a5cb40efdd0e26f28d..03a6304e847923b79f7661954f121c67c0dd2049 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -330,7 +330,7 @@ DEPENDENCIES factory_bot_rails faker formulaic - front_matter_parser (= 1.0.0) + front_matter_parser globalid i18n-tasks (= 0.9.34) kaminari-i18n diff --git a/docs/getting_started.md b/docs/getting_started.md index 1f869b1d0e8fd55cfc6a24e3670346f43fa0d6c8..cedd3dcfda6f3872473ac7efc059158139aac58f 100644 --- a/docs/getting_started.md +++ b/docs/getting_started.md @@ -3,7 +3,7 @@ title: Getting Started --- Administrate is released as a Ruby gem, and can be installed on Rails -applications version 5.0 or greater. We support Ruby 2.4 and up. +applications version 5.0 or greater. We support Ruby 2.6 and up. First, add the following to your Gemfile: diff --git a/gemfiles/rails50.gemfile b/gemfiles/rails50.gemfile index a0e6916cd3b05f1ea9f783ed07297b69813b9afc..59518e2abd89516f790c82f7865aa195b3d044ce 100644 --- a/gemfiles/rails50.gemfile +++ b/gemfiles/rails50.gemfile @@ -4,13 +4,13 @@ source "https://rubygems.org" gem "administrate-field-image" gem "faker" +gem "front_matter_parser" gem "globalid" gem "kaminari-i18n" gem "pg", "0.21.0" gem "redcarpet" gem "sentry-raven" gem "unicorn" -gem "front_matter_parser", "1.0.0" gem "actionpack", "~> 5.0.0" gem "actionview", "~> 5.0.0" gem "activerecord", "~> 5.0.0" diff --git a/gemfiles/rails51.gemfile b/gemfiles/rails51.gemfile index f1d8f9a086ddb26f006d0a8ef4458773dda0616d..2e5e46c2a887225f9844566c0ef0edbb9714edac 100644 --- a/gemfiles/rails51.gemfile +++ b/gemfiles/rails51.gemfile @@ -4,13 +4,13 @@ source "https://rubygems.org" gem "administrate-field-image" gem "faker" +gem "front_matter_parser" gem "globalid" gem "kaminari-i18n" gem "pg", "0.21.0" gem "redcarpet" gem "sentry-raven" gem "unicorn" -gem "front_matter_parser", "1.0.0" gem "actionpack", "~> 5.1.0" gem "actionview", "~> 5.1.0" gem "activerecord", "~> 5.1.0" diff --git a/gemfiles/rails52.gemfile b/gemfiles/rails52.gemfile index 204bb8461b8da23c4959880f492282537b7c9620..b761c2e5a9597d31e08ff5435aee2578ec15f436 100644 --- a/gemfiles/rails52.gemfile +++ b/gemfiles/rails52.gemfile @@ -4,13 +4,13 @@ source "https://rubygems.org" gem "administrate-field-image" gem "faker" +gem "front_matter_parser" gem "globalid" gem "kaminari-i18n" gem "pg" gem "redcarpet" gem "sentry-raven" gem "unicorn" -gem "front_matter_parser", "1.0.0" gem "actionpack", "~> 5.2.0" gem "actionview", "~> 5.2.0" gem "activerecord", "~> 5.2.0" diff --git a/gemfiles/rails60.gemfile b/gemfiles/rails60.gemfile index 11b5292742ac2fec43fde3008046b3df192deff4..0a1f64946c5110ca429b9b4f8d0cf154407469a2 100644 --- a/gemfiles/rails60.gemfile +++ b/gemfiles/rails60.gemfile @@ -4,13 +4,13 @@ source "https://rubygems.org" gem "administrate-field-image" gem "faker" +gem "front_matter_parser" gem "globalid" gem "kaminari-i18n" gem "pg" gem "redcarpet" gem "sentry-raven" gem "unicorn" -gem "front_matter_parser", "1.0.0" gem "rails", "~> 6.0.3.4" group :development, :test do diff --git a/gemfiles/rails61.gemfile b/gemfiles/rails61.gemfile index 08e54f8f495a1d07acce2f46f7ac0486d55b0247..4a60a023b05974812edf756bca330f074faeac5d 100644 --- a/gemfiles/rails61.gemfile +++ b/gemfiles/rails61.gemfile @@ -4,13 +4,13 @@ source "https://rubygems.org" gem "administrate-field-image" gem "faker" +gem "front_matter_parser" gem "globalid" gem "kaminari-i18n" gem "pg" gem "redcarpet" gem "sentry-raven" gem "unicorn" -gem "front_matter_parser", "1.0.0" gem "rails", "~> 6.1" group :development, :test do