Skip to content

Commit

Permalink
Merge pull request #937 from DavyJonesLocker/chore/allow-rails-8-alpha
Browse files Browse the repository at this point in the history
Allow Rails 8 alpha
  • Loading branch information
tagliala authored Jun 1, 2024
2 parents b87fb77 + fc8fad3 commit 403db97
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

## main / unreleased

* [FEATURE] Allow Rails 8.0 alpha
* [ENHANCEMENT] Test against Ruby 3.3
* [ENHANCEMENT] Update QUnit to 2.20.1
* [ENHANCEMENT] Update QUnit to 2.21.0

## 22.1.1 / 2023-10-08

Expand Down
2 changes: 1 addition & 1 deletion client_side_validations.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ Gem::Specification.new do |spec|
spec.required_ruby_version = '>= 2.7'

spec.add_dependency 'js_regex', '~> 3.7'
spec.add_dependency 'rails', '>= 6.1', '< 7.2'
spec.add_dependency 'rails', '>= 6.1', '< 8.0'
end
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
"test": "test/javascript/run-qunit.mjs"
},
"devDependencies": {
"@babel/core": "^7.24.5",
"@babel/preset-env": "^7.24.5",
"@babel/core": "^7.24.6",
"@babel/preset-env": "^7.24.6",
"@rollup/plugin-babel": "^6.0.4",
"@rollup/plugin-node-resolve": "^15.2.2",
"chrome-launcher": "^1.1.1",
"puppeteer-core": "^22.7.1",
"rollup": "^4.17.2",
"puppeteer-core": "^22.10.0",
"rollup": "^4.18.0",
"rollup-plugin-copy": "^3.5.0",
"standard": "^17.1.0"
},
Expand Down
2 changes: 1 addition & 1 deletion test/javascript/server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def call(env)
use AssetPath, urls: ['/vendor/assets/javascripts'], root: File.expand_path('../', $LOAD_PATH.find { |p| p.include?('jquery-rails') })

DEFAULT_JQUERY_VERSION = '3.7.1'
QUNIT_VERSION = '2.20.1'
QUNIT_VERSION = '2.21.0'

helpers do
def jquery_version
Expand Down

0 comments on commit 403db97

Please sign in to comment.