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

App and specs working under Ruby 3.1.4 #1138 #1139

Merged
merged 9 commits into from
Aug 10, 2023
Merged

App and specs working under Ruby 3.1.4 #1138 #1139

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fec8655
1138 app and specs working under Ruby 3.0.6
ferrisoxide Jul 28, 2023
6406312
Merge branch 'master' into 1138_ruby_2_7_has_reached_eol
CloCkWeRX Aug 6, 2023
3a79a28
Update Gemfile.lock
CloCkWeRX Aug 6, 2023
56ffbd8
1138 upgrade brakeman
ferrisoxide Aug 7, 2023
a72ea81
1138 upgrade PaperTrail, Ruby to 3.1
ferrisoxide Aug 7, 2023
a31b2e6
1138 update ruby version in Dockerfile
ferrisoxide Aug 7, 2023
3abfe60
1138 one more attempt at updating ruby version
ferrisoxide Aug 7, 2023
1cdcf71
1138 update brakeman-analysis
ferrisoxide Aug 7, 2023
b3a5c6d
1138 use yaml_column_permitted_classes config
ferrisoxide Aug 9, 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
Prev Previous commit
Next Next commit
1138 one more attempt at updating ruby version
  • Loading branch information
@ferrisoxide
ferrisoxide committed Aug 7, 2023
commit 3abfe60cb4c9293463762f91a6da9f5663132295
2 changes: 1 addition & 1 deletion .github/workflows/ruby.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ruby-version: ['2.7'] # , '2.7', '3.0'
ruby-version: ['3.1'] # , '2.7', '3.0'

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
inherit_from: .rubocop_todo.yml

AllCops:
TargetRubyVersion: 2.7
TargetRubyVersion: 3.1

Bundler/OrderedGems:
Enabled: false
Expand Down
2 changes: 1 addition & 1 deletion fat_free_crm.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
gem.email = ['mike@fatfreecrm.com', 'steveyken@gmail.com', 'daniel.oconnor@gmail.com']
gem.files = Dir["{app,config,db,lib,vendor,public,bin,log/script}/**/*", "MIT-LICENSE", "Rakefile", "README.md", "config.ru", "CHANGELOG.md", "CONTRIBUTING.md"]
gem.version = FatFreeCRM::VERSION::STRING
gem.required_ruby_version = '>= 2.7.0'
gem.required_ruby_version = '>= 3.1'
gem.license = 'MIT'

gem.add_dependency 'rails', '~> 6.1.0'
Expand Down