Skip to content

Commit

Permalink
Merge pull request #3 from ConvertKit/sb-rails-7
Browse files Browse the repository at this point in the history
Upgrade to Rails 7
  • Loading branch information
Stefanni Brasil authored Jan 3, 2024
2 parents 59c8f00 + a69b466 commit ece010a
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion impressionist.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Gem::Specification.new do |s|

s.add_dependency "friendly_id"
s.add_dependency 'nokogiri', RUBY_VERSION < '2.1.0' ? '~> 1.6.0' : '~> 1'
s.add_dependency 'rails', '>= 3.2.15', '< 7.1'
s.add_dependency 'rails', '>= 6.1.7.6'

s.add_development_dependency 'bundler', '~> 2.0'
s.add_development_dependency 'capybara'
Expand Down
2 changes: 1 addition & 1 deletion lib/generators/active_record/impressionist_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class ImpressionistGenerator < Rails::Generators::Base
# FIX, why is this implementing rails behaviour?
def self.next_migration_number(dirname)
sleep 1
if ActiveRecord::Base.timestamped_migrations
if ActiveRecord.timestamped_migrations
Time.now.utc.strftime("%Y%m%d%H%M%S")
else
"%.3d" % (current_migration_number(dirname) + 1)
Expand Down
2 changes: 1 addition & 1 deletion spec/dummy/config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
module Dummy
class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
config.load_defaults 6.0
config.load_defaults 7.1

# Settings in config/environments/* take precedence over those specified here.
# Application configuration can go into files in config/initializers
Expand Down
1 change: 0 additions & 1 deletion spec/dummy/config/environments/test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
# Settings specified here will take precedence over those in config/application.rb.

config.cache_classes = false
config.active_record.legacy_connection_handling = false

# Do not eager load code on boot. This avoids loading your whole application
# just for the purpose of running a single test. If you are using a tool that
Expand Down
2 changes: 1 addition & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
RSpec.configure do |config|
config.fixture_path = "spec/fixtures"
config.fixture_paths = ["spec/fixtures"]
config.infer_spec_type_from_file_location!

config.mock_with :rspec
Expand Down

0 comments on commit ece010a

Please sign in to comment.