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.

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

Update to Ruby 2.7.2 and Rails 5.2.8.1 #1882

Merged
merged 23 commits into from
Jul 28, 2023
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
53399b9
Reduce seed data a little bit
asideofcode-dev Jul 21, 2023
c66da1d
Update Node.js version in Dockerfile to 20.x
asideofcode-dev Jul 21, 2023
145acbe
Notify ./bin/dbuild completion
asideofcode-dev Jul 21, 2023
30bd15f
Fix: Temporarily pin Webdrivers::Chromedriver.required_version
asideofcode-dev Jul 21, 2023
d3dc7b7
Bump Ruby version to 2.7.2
asideofcode-dev Jul 21, 2023
6234a16
Update Rails to 5.2.8.1 + other gems
asideofcode-dev Jul 23, 2023
32f888e
Run rails app:update
asideofcode-dev Jul 23, 2023
87851dd
Minor cleanup ./bin/d*
asideofcode-dev Jul 23, 2023
6ce99d0
Avoid gem issues with 'net-http'
asideofcode-dev Jul 23, 2023
229ef15
Fix development logger issue
asideofcode-dev Jul 23, 2023
bd96c4c
Fix disappearing Navbar toggler
asideofcode-dev Jul 23, 2023
7afff14
Use ApplicationRecord per upgrade instructions
asideofcode-dev Jul 23, 2023
e534994
Update sprockets gem
asideofcode-dev Jul 23, 2023
5e3cb58
Fix js format
asideofcode-dev Jul 23, 2023
087e2aa
Update bundler
asideofcode-dev Jul 23, 2023
6deb936
Additional changes by 'rails app:update'
asideofcode-dev Jul 23, 2023
a4dca4e
Add context around chromedriver fix
asideofcode-dev Jul 23, 2023
168c710
Fix remote form submission for invitations
asideofcode-dev Jul 23, 2023
282bc78
Remove modernizr relic
asideofcode-dev Jul 27, 2023
f553922
Fix remaining Boostrap data-* attributes
asideofcode-dev Jul 27, 2023
e40e3b1
Make code climate happy
asideofcode-dev Jul 27, 2023
e6f0c4c
Fix dropdown menu alignment
asideofcode-dev Jul 27, 2023
c686546
Fix close buttons
asideofcode-dev Jul 27, 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: 1 addition & 1 deletion .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.5.9
ruby-version: 2.7.2
bundler-cache: true
env:
BUNDLE_JOBS: 4
Expand Down
15 changes: 15 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,21 @@
# Ignore all logfiles and tempfiles.
/log/*.log
/tmp
!/tmp/.keep

# Ignore uploaded files in development
/storage/*
!/storage/.keep

/node_modules
/yarn-error.log

/public/assets
.byebug_history

# Ignore master key for decrypting credentials and more.
/config/master.key

/coverage/

TAGS
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.5.9
2.7.2
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM ruby:2.5.9
FROM ruby:2.7.2

# Default node version on apt is old. This makes sure a recent version is installed
# This step also runs apt-get update
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash -
RUN apt-get install -y --force-yes build-essential libpq-dev nodejs

# Install latest chrome dev package
Expand All @@ -17,6 +17,6 @@ RUN set -ex; \
WORKDIR /planner

COPY Gemfile Gemfile.lock ./
RUN bundle install
RUN bundle install --jobs 4

COPY . ./
29 changes: 19 additions & 10 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,39 +1,42 @@
source 'https://rubygems.org'
ruby '2.5.9'
ruby '2.7.2'

gem 'rails', '4.2.11.3'
gem 'rails', '5.2.8.1'
# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.1.0', require: false

gem 'acts-as-taggable-on', '~> 5.0'
gem 'acts-as-taggable-on'
gem 'carrierwave'
gem 'carrierwave-ftp', require: 'carrierwave/storage/sftp'
gem 'cocoon'
gem 'delayed_job'
gem 'delayed_job_active_record'
gem 'font_awesome5_rails'
gem 'bootstrap', '~> 5.0.0.alpha1'
gem 'bootstrap', '~> 5'
gem 'friendly_id'
gem 'haml'
gem 'high_voltage'
gem 'jquery-rails'
gem 'jquery-ui-rails', '~> 6.0.1'
gem 'jquery-ui-rails'
# Use ActiveStorage variant
gem 'mini_magick'
gem 'nokogiri'
gem 'omniauth'
gem 'omniauth-github'
gem 'omniauth-rails_csrf_protection', '~> 0.1'
gem 'pg', '~>0.20.0'
gem 'omniauth-rails_csrf_protection'
gem 'pg'
gem 'pickadate-rails'
gem 'premailer-rails'
gem 'puma'
gem 'pundit'
gem 'rails4-autocomplete'
gem 'rolify'
gem 'sass-rails', '~> 5.0.1'
gem 'sassc-rails'
gem 'simple_form'
gem 'turbolinks'
gem 'uglifier', '>= 1.3.0'
gem 'uglifier'
gem 'will_paginate'
gem 'sprockets-rails', '3.2.2'
gem 'sprockets-rails'

gem 'icalendar'
gem 'tzinfo-data'
Expand All @@ -53,6 +56,12 @@ gem 'public_activity'
group :development do
gem 'better_errors'
gem 'letter_opener'
# Access an interactive console on exception pages or by calling 'console' anywhere in the code.
gem 'web-console', '>= 3.3.0'
gem 'listen', '>= 3.0.5', '< 3.2'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
matyikriszta marked this conversation as resolved.
Show resolved Hide resolved
gem 'spring-watcher-listen', '~> 2.0.0'
end

group :development, :test do
Expand Down
Loading