diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8dba7f501..2061b2610 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,6 +31,7 @@ jobs:
           - 2.6.6
           - 2.5.8
         appraisal:
+          - rails_6_1
           - rails_6_0
           - rails_5_2
           - rails_5_1
diff --git a/Appraisals b/Appraisals
index de9fea76a..0ce62e499 100644
--- a/Appraisals
+++ b/Appraisals
@@ -134,3 +134,28 @@ if Gem::Requirement.new('>= 2.5.0').
     gem 'sqlite3', '~> 1.4'
   end
 end
+
+appraise 'rails_6_1' do
+  instance_eval(&shared_dependencies)
+  instance_eval(&controller_test_dependency)
+
+  gem 'rails', '6.1.2.1'
+  gem 'puma', '~> 4.1'
+  gem 'bootsnap', '>= 1.4.2', require: false
+  gem 'sass-rails', '>= 6'
+  gem 'turbolinks', '~> 5'
+  gem 'jbuilder', '~> 2.7'
+  gem 'bcrypt', '~> 3.1.7'
+  gem 'capybara', '>= 2.15'
+  gem 'listen', '>= 3.0.5', '< 3.2'
+  gem 'spring-watcher-listen', '~> 2.0.0'
+  gem 'selenium-webdriver'
+  gem 'webdrivers'
+
+  # Other dependencies
+  gem 'actiontext', '~> 6.1.2.1'
+
+  # Database adapters
+  gem 'pg', '>= 0.18', '< 2.0'
+  gem 'sqlite3', '~> 1.4'
+end
diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile
new file mode 100644
index 000000000..ca1dff3d7
--- /dev/null
+++ b/gemfiles/rails_6_1.gemfile
@@ -0,0 +1,39 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", "2.2.0"
+gem "bundler", "~> 1.1"
+gem "pry"
+gem "pry-byebug"
+gem "rake", "13.0.1"
+gem "rspec", "~> 3.9"
+gem "rubocop", require: false
+gem "rubocop-packaging", require: false
+gem "rubocop-rails", require: false
+gem "warnings_logger"
+gem "zeus", require: false
+gem "fssm"
+gem "redcarpet"
+gem "rouge"
+gem "yard"
+gem "spring"
+gem "spring-commands-rspec"
+gem "rspec-rails", "~> 3.9"
+gem "shoulda-context", "~> 1.2.0"
+gem "rails-controller-testing", ">= 1.0.1"
+gem "rails", "6.1.2.1"
+gem "puma", "~> 4.1"
+gem "bootsnap", ">= 1.4.2", require: false
+gem "sass-rails", ">= 6"
+gem "turbolinks", "~> 5"
+gem "jbuilder", "~> 2.7"
+gem "bcrypt", "~> 3.1.7"
+gem "capybara", ">= 2.15"
+gem "listen", ">= 3.0.5", "< 3.2"
+gem "spring-watcher-listen", "~> 2.0.0"
+gem "selenium-webdriver"
+gem "webdrivers"
+gem "actiontext", "~> 6.1.2.1"
+gem "pg", ">= 0.18", "< 2.0"
+gem "sqlite3", "~> 1.4"
diff --git a/gemfiles/rails_6_1.gemfile.lock b/gemfiles/rails_6_1.gemfile.lock
new file mode 100644
index 000000000..9bbba11a2
--- /dev/null
+++ b/gemfiles/rails_6_1.gemfile.lock
@@ -0,0 +1,307 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (6.1.2.1)
+      actionpack (= 6.1.2.1)
+      activesupport (= 6.1.2.1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.1.2.1)
+      actionpack (= 6.1.2.1)
+      activejob (= 6.1.2.1)
+      activerecord (= 6.1.2.1)
+      activestorage (= 6.1.2.1)
+      activesupport (= 6.1.2.1)
+      mail (>= 2.7.1)
+    actionmailer (6.1.2.1)
+      actionpack (= 6.1.2.1)
+      actionview (= 6.1.2.1)
+      activejob (= 6.1.2.1)
+      activesupport (= 6.1.2.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.1.2.1)
+      actionview (= 6.1.2.1)
+      activesupport (= 6.1.2.1)
+      rack (~> 2.0, >= 2.0.9)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.1.2.1)
+      actionpack (= 6.1.2.1)
+      activerecord (= 6.1.2.1)
+      activestorage (= 6.1.2.1)
+      activesupport (= 6.1.2.1)
+      nokogiri (>= 1.8.5)
+    actionview (6.1.2.1)
+      activesupport (= 6.1.2.1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.1.2.1)
+      activesupport (= 6.1.2.1)
+      globalid (>= 0.3.6)
+    activemodel (6.1.2.1)
+      activesupport (= 6.1.2.1)
+    activerecord (6.1.2.1)
+      activemodel (= 6.1.2.1)
+      activesupport (= 6.1.2.1)
+    activestorage (6.1.2.1)
+      actionpack (= 6.1.2.1)
+      activejob (= 6.1.2.1)
+      activerecord (= 6.1.2.1)
+      activesupport (= 6.1.2.1)
+      marcel (~> 0.3.1)
+      mimemagic (~> 0.3.2)
+    activesupport (6.1.2.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.2)
+    bcrypt (3.1.16)
+    bootsnap (1.7.2)
+      msgpack (~> 1.0)
+    builder (3.2.4)
+    byebug (11.1.3)
+    capybara (3.35.3)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (>= 1.5, < 3.0)
+      xpath (~> 3.2)
+    childprocess (3.0.0)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.8)
+    crass (1.0.6)
+    diff-lcs (1.4.4)
+    erubi (1.10.0)
+    ffi (1.14.2)
+    fssm (0.2.10)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    i18n (1.8.9)
+      concurrent-ruby (~> 1.0)
+    jbuilder (2.11.2)
+      activesupport (>= 5.0.0)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    loofah (2.9.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (1.0.0)
+    mimemagic (0.3.5)
+    mini_mime (1.0.2)
+    mini_portile2 (2.5.0)
+    minitest (5.14.3)
+    msgpack (1.4.2)
+    nio4r (2.5.5)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
+    pg (1.2.3)
+    pry (0.14.0)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.8.0)
+      byebug (~> 11.0)
+      pry (~> 0.10)
+    public_suffix (4.0.6)
+    puma (4.3.7)
+      nio4r (~> 2.0)
+    racc (1.5.2)
+    rack (2.2.3)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (6.1.2.1)
+      actioncable (= 6.1.2.1)
+      actionmailbox (= 6.1.2.1)
+      actionmailer (= 6.1.2.1)
+      actionpack (= 6.1.2.1)
+      actiontext (= 6.1.2.1)
+      actionview (= 6.1.2.1)
+      activejob (= 6.1.2.1)
+      activemodel (= 6.1.2.1)
+      activerecord (= 6.1.2.1)
+      activestorage (= 6.1.2.1)
+      activesupport (= 6.1.2.1)
+      bundler (>= 1.15.0)
+      railties (= 6.1.2.1)
+      sprockets-rails (>= 2.0.0)
+    rails-controller-testing (1.0.5)
+      actionpack (>= 5.0.1.rc1)
+      actionview (>= 5.0.1.rc1)
+      activesupport (>= 5.0.1.rc1)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.1.2.1)
+      actionpack (= 6.1.2.1)
+      activesupport (= 6.1.2.1)
+      method_source
+      rake (>= 0.8.7)
+      thor (~> 1.0)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    redcarpet (3.5.1)
+    regexp_parser (2.0.3)
+    rexml (3.2.4)
+    rouge (3.26.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-rails (3.9.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.4)
+    rubocop (1.10.0)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    rubocop-packaging (0.5.1)
+      rubocop (>= 0.89, < 2.0)
+    rubocop-rails (2.9.1)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 0.90.0, < 2.0)
+    ruby-progressbar (1.11.0)
+    ruby_dep (1.5.0)
+    rubyzip (2.3.0)
+    sass-rails (6.0.0)
+      sassc-rails (~> 2.1, >= 2.1.1)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
+    selenium-webdriver (3.142.7)
+      childprocess (>= 0.5, < 4.0)
+      rubyzip (>= 1.2.2)
+    shoulda-context (1.2.2)
+    spring (2.1.1)
+    spring-commands-rspec (1.0.4)
+      spring (>= 0.9.1)
+    spring-watcher-listen (2.0.1)
+      listen (>= 2.7, < 4.0)
+      spring (>= 1.2, < 3.0)
+    sprockets (4.0.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.2)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.4.2)
+    thor (1.1.0)
+    tilt (2.0.10)
+    turbolinks (5.2.1)
+      turbolinks-source (~> 5.2)
+    turbolinks-source (5.2.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    warnings_logger (0.1.1)
+    webdrivers (4.5.0)
+      nokogiri (~> 1.6)
+      rubyzip (>= 1.3.0)
+      selenium-webdriver (>= 3.0, < 4.0)
+    websocket-driver (0.7.3)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
+    yard (0.9.26)
+    zeitwerk (2.4.2)
+    zeus (0.15.14)
+      method_source (>= 0.6.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actiontext (~> 6.1.2.1)
+  appraisal (= 2.2.0)
+  bcrypt (~> 3.1.7)
+  bootsnap (>= 1.4.2)
+  bundler (~> 1.1)
+  capybara (>= 2.15)
+  fssm
+  jbuilder (~> 2.7)
+  listen (>= 3.0.5, < 3.2)
+  pg (>= 0.18, < 2.0)
+  pry
+  pry-byebug
+  puma (~> 4.1)
+  rails (= 6.1.2.1)
+  rails-controller-testing (>= 1.0.1)
+  rake (= 13.0.1)
+  redcarpet
+  rouge
+  rspec (~> 3.9)
+  rspec-rails (~> 3.9)
+  rubocop
+  rubocop-packaging
+  rubocop-rails
+  sass-rails (>= 6)
+  selenium-webdriver
+  shoulda-context (~> 1.2.0)
+  spring
+  spring-commands-rspec
+  spring-watcher-listen (~> 2.0.0)
+  sqlite3 (~> 1.4)
+  turbolinks (~> 5)
+  warnings_logger
+  webdrivers
+  yard
+  zeus
+
+BUNDLED WITH
+   1.17.3