Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Rails 6.1 / Ruby 2.7 #663

Merged
merged 23 commits into from
Nov 22, 2023
Merged

Upgrade to Rails 6.1 / Ruby 2.7 #663

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
2b0cea1
Upgrade to Rails 6.0 / Ruby 2.7 via rake app:update
Fryguy Nov 17, 2023
40676b7
Fix issues where Rails 6 requires belongs_to to exist
Fryguy Nov 20, 2023
98007e5
Fix Ruby 2.7 issue where module is not being recognized
Fryguy Nov 20, 2023
a03ec03
Fix issue where lib file is not loaded because the const already exists
Fryguy Nov 20, 2023
6e304ec
Eager-load in development
Fryguy Nov 20, 2023
9e7780b
Switch to Rails 6 default configuration
Fryguy Nov 20, 2023
11bae38
Switch to use zeitwerk as the default
Fryguy Nov 20, 2023
bc62a50
Replace thin with puma
Fryguy Nov 20, 2023
627d774
Upgrade to Rails 6.1
Fryguy Nov 20, 2023
6fc8329
Update a lot of gems
Fryguy Nov 20, 2023
c1fc65e
Fix issue where running specs infects Redis
Fryguy Nov 21, 2023
8240130
Update more gems
Fryguy Nov 21, 2023
85c08e6
Drop systemd
Fryguy Nov 21, 2023
7b8fc27
Drop Vagrant
Fryguy Nov 21, 2023
8dc1397
Update to Ruby 2.7 and NodeJs 18 in Dockerfile
Fryguy Nov 21, 2023
3348f61
Add ruby and x86_64-linux to the lockfile
Fryguy Nov 21, 2023
ea4c1ca
Bump tp Ruby 2.7 for GHA
Fryguy Nov 21, 2023
d8928ea
Fix issue where bin/setup was not creating the test DB in CI
Fryguy Nov 21, 2023
38bb51c
Ensure manageiq-style 1.4.0
Fryguy Nov 22, 2023
1e98c2e
Fix issue where ActiveRecord::RecordInvalid was not used correctly
Fryguy Nov 22, 2023
b5306ef
Fix issue where rules settings may not exist
Fryguy Nov 22, 2023
7d8c321
Fix issue where extract_file couldn't handle symlinks
Fryguy Nov 22, 2023
68b775b
Fix issue where haml-lint executable is different
Fryguy Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,5 @@ db/seeds.local.rb

# Ignore vagrant configuration/runtime files
.vagrant/

/config/master.key
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is something I think we need to put in as a secret in kube that maps to this location, and I guess keep in our vault separately.

33 changes: 14 additions & 19 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
source 'https://rubygems.org'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.8', '>= 5.2.8.1'
gem 'rails', '~> 6.1.0', '>= 6.1.7.6'

# Use PostgreSQL as the database for Active Record
gem 'pg'
Expand All @@ -15,31 +14,27 @@ gem 'jquery-rails'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks'

gem 'thin'
gem 'foreman', '~> 0.64.0' # v0.65.0 breaks support for the older upstart on RHEL 6
gem 'foreman'
gem 'puma'

gem 'config'
gem 'listen'

# Sidekiq specific gems
gem 'celluloid', '~> 0.17.4', :require => false
gem 'sidecloq'
gem 'sidekiq', '~> 5.2.10'
gem 'sinatra', :require => false
gem 'slim'
gem 'sidekiq'

# Services gems
gem 'minigit', '~> 0.0.4'
gem 'net-ssh', '~> 4.2.0'

gem 'awesome_spawn', '>= 1.4.1'
gem 'default_value_for', '>= 3.1.0'
gem 'haml', '~> 5.1', :require => false # force newer version of haml
gem 'haml_lint', '~> 0.35.0', :require => false
gem 'manageiq-style', :require => false
gem 'more_core_extensions', '~> 4.0.0', :require => 'more_core_extensions/all'
gem 'sync', :require => false # required by more_core_extensions
gem 'rugged', :require => false
gem 'minigit', '~> 0.0.4'
gem 'net-ssh', '~> 7.2.0'
Copy link
Member Author

@Fryguy Fryguy Nov 21, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can probably drop the ~> here or use >=

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wow, that's a version bump. 😉


gem 'awesome_spawn', '~> 1.6'
gem 'default_value_for', '~> 3.4'
gem 'haml_lint', '~> 0.51', :require => false
gem 'manageiq-style', :require => false
gem 'more_core_extensions', '~> 4.4', :require => 'more_core_extensions/all'
gem 'rugged', :require => false


gem 'octokit', '~> 4.8.0', :require => false
gem 'faraday', '~> 0.9.2'
Expand Down
Loading