diff --git a/.github/workflows/cm42-central.yml b/.github/workflows/cm42-central.yml index da70c3459..2c28c6093 100644 --- a/.github/workflows/cm42-central.yml +++ b/.github/workflows/cm42-central.yml @@ -45,7 +45,7 @@ jobs: - name: Install Ruby and gems uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6 + ruby-version: 3.1 bundler-cache: true # Add or replace database setup steps here - name: Set up database schema @@ -114,7 +114,7 @@ jobs: - name: Install Ruby and gems uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6 + ruby-version: 3.1 bundler-cache: true - name: Install Node uses: actions/setup-node@v2 diff --git a/Gemfile b/Gemfile index e23918a12..f57ffbb0a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -ruby '~> 2.6' +ruby '~> 3.1' git_source(:github) do |repo_name| repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") @@ -64,6 +64,7 @@ gem 'webpacker', '~> 5.4.3' gem 'pusher' source 'https://rails-assets.org' do + gem 'rails-assets-jquery' gem 'rails-assets-jquery.gritter' end diff --git a/Gemfile.lock b/Gemfile.lock index 6f501010c..86080b7cf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -660,6 +660,7 @@ DEPENDENCIES rack-cors rack-timeout rails (~> 5.2.6.3) + rails-assets-jquery! rails-assets-jquery.gritter! rails-controller-testing rails-i18n @@ -690,7 +691,7 @@ DEPENDENCIES webpacker (~> 5.4.3) RUBY VERSION - ruby 2.6.8p205 + ruby 3.1.2p20 BUNDLED WITH 1.17.3