Skip to content

Commit

Permalink
Rails 7 (#1196)
Browse files Browse the repository at this point in the history
* Update to Ruby 3.2.2

* Upgrade to Rails 7.0. WIP.

* Fix specs

* Fix schema

* update gems

---------

Co-authored-by: Daniel O'Connor <[email protected]>
  • Loading branch information
Roman Shterenzon and CloCkWeRX authored Jan 9, 2024
1 parent e898750 commit 2d3a456
Show file tree
Hide file tree
Showing 105 changed files with 584 additions and 443 deletions.
4 changes: 2 additions & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Lint/ScriptPermission:
Exclude:
- 'Rakefile'

Metrics/LineLength:
Layout/LineLength:
Enabled: false

Metrics/BlockLength:
Expand All @@ -42,7 +42,7 @@ Security/YAMLLoad:
- 'db/migrate/*.rb'
- 'lib/tasks/ffcrm/config.rake'

StringLiterals:
Style/StringLiterals:
Enabled: false

Style/Alias:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.4
3.2.2
10 changes: 5 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ source 'https://rubygems.org'

case ENV['CI'] && ENV['DB']
when 'sqlite'
gem 'sqlite3', '~> 1.4.0'
gem 'sqlite3', '~> 1.6.8'
when 'mysql'
gem 'mysql2'
when 'postgres'
Expand Down Expand Up @@ -78,7 +78,7 @@ group :test do
gem 'database_cleaner'
gem 'zeus', platform: :ruby unless ENV["CI"]
gem 'timecop'
gem 'sqlite3', '~> 1.4.0'
gem 'sqlite3', '~> 1.6.8'
gem 'webrick'
end

Expand All @@ -87,8 +87,8 @@ group :heroku do
gem 'puma'
end

gem 'responds_to_parent', git: 'https://github.com/CloCkWeRX/responds_to_parent.git', branch: 'patch-2' # Temporarily pointed at git until https://github.com/zendesk/responds_to_parent/pull/7 is released
gem 'acts_as_commentable', git: 'https://github.com/fatfreecrm/acts_as_commentable.git', branch: 'rails-61' # Our fork
gem 'responds_to_parent', git: 'https://github.com/RedPatchTechnologies/responds_to_parent.git', branch: 'master' # Temporarily pointed at git until https://github.com/zendesk/responds_to_parent/pull/7 is released
gem 'acts_as_commentable', git: 'https://github.com/fatfreecrm/acts_as_commentable.git', branch: 'main' # Our fork
gem 'sassc-rails'
gem 'coffee-rails'
gem 'uglifier'
Expand All @@ -104,6 +104,6 @@ gem "devise-encryptable"
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
gem 'activejob'
gem 'ransack_ui'
gem 'bootstrap', '5.0.0'
gem 'bootstrap', '~>5.0.0'
gem 'mini_magick'
gem 'image_processing', '~> 1.2'
Loading

0 comments on commit 2d3a456

Please sign in to comment.