Skip to content

Commit

Permalink
Merge pull request #1315 from sul-dlss/rails71-defaults
Browse files Browse the repository at this point in the history
Use rails 7.2 default configs
  • Loading branch information
jcoyne authored Dec 3, 2024
2 parents cc5f2e1 + 05f83ba commit b2e3a35
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 465 deletions.
2 changes: 1 addition & 1 deletion app/models/stacks_media_token.rb
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def self.verify_encrypted_token?(encrypted_string, expected_id, expected_file_na
end

def self.create_from_hash(token_hash)
new token_hash[:id], token_hash[:file_name], token_hash[:user_ip]
new token_hash['id'], token_hash['file_name'], token_hash['user_ip']
end
private_class_method :create_from_hash

Expand Down
2 changes: 1 addition & 1 deletion config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
module DigitalStacks
class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
config.load_defaults 7.0
config.load_defaults 7.2

# Please, add to the `ignore` list any other `lib` subdirectories that do
# not contain `.rb` files, or that should not be reloaded or eager loaded.
Expand Down
63 changes: 0 additions & 63 deletions config/initializers/new_framework_defaults_6_1.rb

This file was deleted.

117 changes: 0 additions & 117 deletions config/initializers/new_framework_defaults_7_0.rb

This file was deleted.

Loading

0 comments on commit b2e3a35

Please sign in to comment.