diff --git a/.ruby-version b/.ruby-version index a04abec9..818bd47a 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.6.10 +3.0.6 diff --git a/Gemfile b/Gemfile index fd22480d..5380a8f3 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,11 @@ source 'http://rubygems.org' -ruby '2.6.10' +ruby '3.0.6' gem 'rails', '= 6.1.7.4' +# The HTTP server running the Rails instance. +gem 'webrick', '~> 1.7' + # Our database is MySQL, in both development and production. gem 'mysql2', '~> 0.5.5' diff --git a/Gemfile.lock b/Gemfile.lock index 5cf0c811..94d33e26 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -301,6 +301,7 @@ GEM activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) + webrick (1.8.1) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -341,10 +342,11 @@ DEPENDENCIES sass-rails (~> 5.0, >= 5.0.7) uglifier (~> 4.2) web-console (~> 4.2) + webrick (~> 1.7) will_paginate (~> 4.0) RUBY VERSION - ruby 2.6.10p210 + ruby 3.0.6p216 BUNDLED WITH 2.4.18 diff --git a/Vagrantfile b/Vagrantfile index 20311112..40ed691d 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -75,7 +75,7 @@ Vagrant.configure("2") do |config| apt-get install -y libmysqlclient-dev libcurl4-openssl-dev nodejs su vagrant -c 'git clone https://github.com/rbenv/rbenv.git ~/.rbenv' su vagrant -c 'git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build' - su vagrant -c '~/.rbenv/bin/rbenv install 2.6.10 && ~/.rbenv/shims/gem update --system' + su vagrant -c '~/.rbenv/bin/rbenv install 3.0.6 && ~/.rbenv/shims/gem update --system' apt-get install -y mysql-server mysql -e "CREATE USER IF NOT EXISTS openneo_impress IDENTIFIED BY 'openneo_impress';" mysql -e "CREATE DATABASE IF NOT EXISTS openneo_impress;" diff --git a/vendor/cache/webrick-1.8.1.gem b/vendor/cache/webrick-1.8.1.gem new file mode 100644 index 00000000..ac0894b9 Binary files /dev/null and b/vendor/cache/webrick-1.8.1.gem differ