Merge branch 'main' into update-user-stat-importer-file-set-query

Author: kirkkwang

.dassie/Gemfile

@@ -41,8 +41,7 @@ gem 'turbolinks', '~> 5'
 gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 gem 'uglifier', '>= 1.3.0'
-gem 'activerecord-nulldb-adapter', git: 'https://github.com/taylorthurlow/nulldb', branch: 'fix/activerecord72-register-adapter'
-gem 'hydra-editor', github: 'samvera/hydra-editor', branch: 'revert_and_modernize'
+gem 'activerecord-nulldb-adapter', '~> 1.1'
 
 group :development do
   gem 'better_errors' # add command line in browser when errors

.koppie/Gemfile

@@ -41,8 +41,7 @@ gem 'turbolinks', '~> 5'
 gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 gem 'uglifier', '>= 1.3.0'
-gem 'activerecord-nulldb-adapter', git: 'https://github.com/taylorthurlow/nulldb', branch: 'fix/activerecord72-register-adapter'
-gem 'hydra-editor', github: 'samvera/hydra-editor', branch: 'revert_and_modernize'
+gem 'activerecord-nulldb-adapter', '~> 1.1'
 
 group :development do
   gem 'better_errors' # add command line in browser when errors

documentation/developing-your-hyrax-based-app.md

@@ -32,7 +32,7 @@ You can also try [Running Hyrax-based application in local VM](https://github.co
 During development, running only the dependent services in a container environment may be beneficial. This avoids potential headaches concerning file permissions and eases the use of debugging tools. The application generation instructions below use [Lando](https://lando.dev) to achieve this setup.
 
 This document contains instructions specific to setting up an app with __Hyrax
-v5.0.2__. If you are looking for instructions on installing a different
+v5.0.3__. If you are looking for instructions on installing a different
 version, be sure to select the appropriate branch or tag from the drop-down
 menu above.
 
@@ -148,7 +148,7 @@ Generate a new Rails application using the template.
 **NOTE:** `HYRAX_SKIP_WINGS` is needed here to avoid loading the Wings compatibility layer during the application generation process.
 
 ```shell
-HYRAX_SKIP_WINGS=true rails _6.1.7.7_ new my_app --database=postgresql -m https://raw.githubusercontent.com/samvera/hyrax/hyrax-v5.0.2/template.rb
+HYRAX_SKIP_WINGS=true rails _6.1.7.7_ new my_app --database=postgresql -m https://raw.githubusercontent.com/samvera/hyrax/hyrax-v5.0.3/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:

hyrax.gemspec

@@ -57,7 +57,7 @@ SUMMARY
   spec.add_dependency 'font-awesome-rails', '~> 4.2'
   spec.add_dependency 'google-analytics-data', '~> 0.6'
   spec.add_dependency 'hydra-derivatives', '~> 4.0'
-  spec.add_dependency 'hydra-editor', '~> 6.0'
+  spec.add_dependency 'hydra-editor', '~> 7.0'
   spec.add_dependency 'hydra-file_characterization', '~> 1.1'
   spec.add_dependency 'hydra-head', '~> 13.0'
   spec.add_dependency 'hydra-works', '>= 0.16'

lib/hyrax/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hyrax
-  VERSION = '5.0.2'
+  VERSION = '5.0.3'
 end

template.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
-gem 'hyrax', '5.0.2'
+gem 'hyrax', '5.0.3'
 run 'bundle install'
 generate 'hyrax:install', '-f'