Skip to content

Commit

Permalink
Merge pull request #1892 from asideofcode-dev/bumping-versions
Browse files Browse the repository at this point in the history
Update Ruby to 3.2.2 and Rails to 6.1.7.4
  • Loading branch information
matyikriszta authored Aug 20, 2023
2 parents 4585db1 + 36ac86a commit ab9350d
Show file tree
Hide file tree
Showing 67 changed files with 516 additions and 469 deletions.
2 changes: 1 addition & 1 deletion .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ version: "2"
plugins:
rubocop:
enabled: true
channel: rubocop-0-79
channel: rubocop-1-50-2
brakeman:
enabled: true
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.7.2
ruby-version: 3.2.2
bundler-cache: true
env:
BUNDLE_JOBS: 4
Expand Down
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,10 @@ TAGS
# Ignore local uploads
public/uploads/
vendor/bundle

/public/packs
/public/packs-test
/node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Rails/Date:
Enabled: true

Metrics/BlockLength:
ExcludedMethods: ["describe", "context", "draw", "namespace"]
AllowedMethods: ["describe", "context", "draw", "namespace"]

Performance:
Exclude:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.2
3.2.2
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.7.2
FROM ruby:3.2.2

# Default node version on apt is old. This makes sure a recent version is installed
# This step also runs apt-get update
Expand Down
38 changes: 22 additions & 16 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
source 'https://rubygems.org'
ruby '2.7.2'
ruby '3.2.2'

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

gem 'acts-as-taggable-on'
gem 'carrierwave'
Expand All @@ -18,23 +18,25 @@ gem 'haml'
gem 'high_voltage'
gem 'jquery-rails'
gem 'jquery-ui-rails'
# Use ActiveStorage variant
gem 'mini_magick'

# Use Active Storage variant
gem 'image_processing', '~> 1.2'
gem 'nokogiri'
gem 'omniauth'
gem 'omniauth-github'
gem 'omniauth-rails_csrf_protection'
gem 'pg'
gem 'pickadate-rails'
gem 'premailer-rails'
gem 'puma'
gem 'puma', '~> 5.0'
gem 'pundit'
gem 'rails4-autocomplete'
gem 'rolify'
gem 'sassc-rails'
gem 'sass-rails', '>= 6'
gem 'simple_form'
gem 'turbolinks'
gem 'terser', '~> 1.1'

gem 'terser'

gem 'will_paginate'
gem 'sprockets-rails'

Expand All @@ -50,18 +52,22 @@ gem 'stripe'

gem 'rails-html-sanitizer', '~> 1.4.4'

gem 'jbuilder'
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
gem 'turbolinks', '~> 5'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.7'
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'
gem 'web-console', '>= 4.1.0'
# Display performance information such as SQL time and flame graphs for each request in your browser.
# Can be configured to work on production as well see: https://github.com/MiniProfiler/rack-mini-profiler/blob/master/README.md
gem 'rack-mini-profiler', '~> 2.0'
gem 'listen', '~> 3.3'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
end

group :development, :test do
Expand All @@ -73,15 +79,15 @@ group :development, :test do
gem 'pry-remote'
gem 'rspec-collection_matchers'
gem 'rspec-rails'
gem 'rubocop', '~> 1.12.1', require: false
gem 'rubocop', require: false
gem 'rubocop-rails', require: false
gem 'rubocop-performance', require: false
gem 'rubocop-rspec', require: false
gem 'bullet'
end

group :test do
gem 'capybara'
gem 'capybara', '>= 3.26'
gem 'database_cleaner'
gem 'shoulda-matchers', '~> 4.5'
gem 'webdrivers'
Expand Down
Loading

0 comments on commit ab9350d

Please sign in to comment.