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.

Sign up for GitHub

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

Jump to bottom

upgrade rails from 6.1 to 7.1 #162

Merged
merged 1 commit into from
Nov 15, 2023
Merged

upgrade rails from 6.1 to 7.1 #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ source 'https://rubygems.org'

ruby File.read(".ruby-version").strip

gem 'audited', '~> 5.3'
gem 'audited'
gem 'autoprefixer-rails'
gem 'bootstrap-sass', '~> 3.4.1'
gem 'bootstrap-sass'
gem 'bootstrap-will_paginate'
gem 'diffy'
gem 'font-awesome-rails'
gem 'jbuilder', '~> 2.5' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jquery-datatables-rails', '~> 3.4.0' # Use datatables for rendering and searching songs
gem 'jquery-rails' # Use jquery as the JavaScript library
gem 'js_cookie_rails' # Use js-cookie to handle cookies
Expand All @@ -19,13 +19,13 @@ gem 'omniauth-rails_csrf_protection'
gem 'pg'
gem 'pg_search'
gem 'rack-timeout'
gem 'rails', '6.1.7'
gem 'rails', '7.1'
gem 'sass-rails', '>= 5' # Use SCSS for stylesheets
gem 'sdoc', '~> 2.6.1', group: :doc # bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', group: :doc # bundle exec rake doc:rails generates the API under doc/api.
gem 'turbolinks'
gem 'uglifier', '>= 1.3.0' # Use Uglifier as compressor for JavaScript assets
gem "terser", "~> 1.1"
gem 'unicorn' # Use Unicorn as the app server
gem 'will_paginate', '~> 3.1'
gem 'will_paginate'
gem 'wicked_pdf'
gem 'render_anywhere'
gem 'wkhtmltopdf-binary'
Expand All @@ -40,10 +40,10 @@ group :test do
end

group :development do
gem 'listen', '>= 3.0.5', '< 3.2'
gem 'listen'
gem 'rubocop', require: false
gem 'spring' # keeps the app running in the background so you don't need to keep rebotting it
gem 'spring-watcher-listen', '~> 2.0.0'
gem 'spring-watcher-listen'
gem 'web-console', '>= 4.2.0'
gem 'solargraph' # ruby language server, need a plugin for editor/IDE to make sure of it
end
193 changes: 112 additions & 81 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,65 +1,79 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (6.1.7)
actionpack (= 6.1.7)
activesupport (= 6.1.7)
actioncable (7.1.0)
actionpack (= 7.1.0)
activesupport (= 7.1.0)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.1.7)
actionpack (= 6.1.7)
activejob (= 6.1.7)
activerecord (= 6.1.7)
activestorage (= 6.1.7)
activesupport (= 6.1.7)
zeitwerk (~> 2.6)
actionmailbox (7.1.0)
actionpack (= 7.1.0)
activejob (= 7.1.0)
activerecord (= 7.1.0)
activestorage (= 7.1.0)
activesupport (= 7.1.0)
mail (>= 2.7.1)
actionmailer (6.1.7)
actionpack (= 6.1.7)
actionview (= 6.1.7)
activejob (= 6.1.7)
activesupport (= 6.1.7)
net-imap
net-pop
net-smtp
actionmailer (7.1.0)
actionpack (= 7.1.0)
actionview (= 7.1.0)
activejob (= 7.1.0)
activesupport (= 7.1.0)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.1.7)
actionview (= 6.1.7)
activesupport (= 6.1.7)
rack (~> 2.0, >= 2.0.9)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.2)
actionpack (7.1.0)
actionview (= 7.1.0)
activesupport (= 7.1.0)
nokogiri (>= 1.8.5)
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.7)
actionpack (= 6.1.7)
activerecord (= 6.1.7)
activestorage (= 6.1.7)
activesupport (= 6.1.7)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actiontext (7.1.0)
actionpack (= 7.1.0)
activerecord (= 7.1.0)
activestorage (= 7.1.0)
activesupport (= 7.1.0)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (6.1.7)
activesupport (= 6.1.7)
actionview (7.1.0)
activesupport (= 7.1.0)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.1.7)
activesupport (= 6.1.7)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (7.1.0)
activesupport (= 7.1.0)
globalid (>= 0.3.6)
activemodel (6.1.7)
activesupport (= 6.1.7)
activerecord (6.1.7)
activemodel (= 6.1.7)
activesupport (= 6.1.7)
activestorage (6.1.7)
actionpack (= 6.1.7)
activejob (= 6.1.7)
activerecord (= 6.1.7)
activesupport (= 6.1.7)
activemodel (7.1.0)
activesupport (= 7.1.0)
activerecord (7.1.0)
activemodel (= 7.1.0)
activesupport (= 7.1.0)
timeout (>= 0.4.0)
activestorage (7.1.0)
actionpack (= 7.1.0)
activejob (= 7.1.0)
activerecord (= 7.1.0)
activesupport (= 7.1.0)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (6.1.7)
activesupport (7.1.0)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
ast (2.4.2)
Expand All @@ -71,6 +85,7 @@ GEM
backport (1.2.0)
base64 (0.2.0)
benchmark (0.3.0)
bigdecimal (3.1.4)
bindex (0.8.1)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
Expand All @@ -80,10 +95,13 @@ GEM
builder (3.2.4)
byebug (11.1.3)
concurrent-ruby (1.2.2)
connection_pool (2.4.1)
crass (1.0.6)
date (3.3.4)
diff-lcs (1.5.0)
diffy (3.4.2)
drb (2.2.0)
ruby2_keywords
e2mmap (0.1.0)
erubi (1.12.0)
execjs (2.9.1)
Expand All @@ -100,6 +118,10 @@ GEM
hashie (5.0.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
io-console (0.6.0)
irb (1.9.0)
rdoc
reline (>= 0.3.8)
jaro_winkler (1.5.6)
jbuilder (2.11.5)
actionview (>= 5.0.0)
Expand All @@ -123,9 +145,9 @@ GEM
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.21.4)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
Expand All @@ -135,13 +157,13 @@ GEM
net-pop
net-smtp
marcel (1.0.2)
method_source (1.0.0)
mini_mime (1.1.5)
minitest (5.20.0)
minitest-ci (3.4.0)
minitest (>= 5.0.6)
multi_xml (0.6.0)
net-imap (0.4.4)
mutex_m (0.2.0)
net-imap (0.4.5)
date
net-protocol
net-pop (0.1.2)
Expand Down Expand Up @@ -193,24 +215,28 @@ GEM
rack (2.2.8)
rack-protection (3.1.0)
rack (~> 2.2, >= 2.2.4)
rack-session (1.0.1)
rack (< 3)
rack-test (2.1.0)
rack (>= 1.3)
rack-timeout (0.6.3)
rails (6.1.7)
actioncable (= 6.1.7)
actionmailbox (= 6.1.7)
actionmailer (= 6.1.7)
actionpack (= 6.1.7)
actiontext (= 6.1.7)
actionview (= 6.1.7)
activejob (= 6.1.7)
activemodel (= 6.1.7)
activerecord (= 6.1.7)
activestorage (= 6.1.7)
activesupport (= 6.1.7)
rackup (1.0.0)
rack (< 3)
webrick
rails (7.1.0)
actioncable (= 7.1.0)
actionmailbox (= 7.1.0)
actionmailer (= 7.1.0)
actionpack (= 7.1.0)
actiontext (= 7.1.0)
actionview (= 7.1.0)
activejob (= 7.1.0)
activemodel (= 7.1.0)
activerecord (= 7.1.0)
activestorage (= 7.1.0)
activesupport (= 7.1.0)
bundler (>= 1.15.0)
railties (= 6.1.7)
sprockets-rails (>= 2.0.0)
railties (= 7.1.0)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
Expand All @@ -222,12 +248,14 @@ GEM
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (6.1.7)
actionpack (= 6.1.7)
activesupport (= 6.1.7)
method_source
railties (7.1.0)
actionpack (= 7.1.0)
activesupport (= 7.1.0)
irb
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0)
thor (~> 1.0, >= 1.2.2)
zeitwerk (~> 2.6)
rainbow (3.1.1)
raindrops (0.20.1)
rake (13.1.0)
Expand All @@ -237,6 +265,8 @@ GEM
rdoc (6.6.0)
psych (>= 4.0.0)
regexp_parser (2.8.2)
reline (0.4.0)
io-console (~> 0.5)
render_anywhere (0.0.12)
rails (>= 3.0.7)
request_store (1.5.1)
Expand Down Expand Up @@ -299,6 +329,8 @@ GEM
activesupport (>= 4.0)
sprockets (>= 3.0.0)
stringio (3.0.9)
terser (1.1.19)
execjs (>= 0.3.0, < 3)
thor (1.3.0)
tilt (2.3.0)
timeout (0.4.1)
Expand All @@ -307,8 +339,6 @@ GEM
turbolinks-source (5.2.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
unicode-display_width (2.5.0)
unicorn (6.1.0)
kgio (~> 2.6)
Expand All @@ -319,6 +349,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)
Expand All @@ -334,41 +365,41 @@ PLATFORMS
x86_64-linux

DEPENDENCIES
audited (~> 5.3)
audited
autoprefixer-rails
bootstrap-sass (~> 3.4.1)
bootstrap-sass
bootstrap-will_paginate
byebug
diffy
font-awesome-rails
jbuilder (~> 2.5)
jbuilder
jquery-datatables-rails (~> 3.4.0)
jquery-rails
js_cookie_rails
json-schema
listen (>= 3.0.5, < 3.2)
listen
minitest-ci
normalize-rails
omniauth-google-oauth2
omniauth-rails_csrf_protection
pg
pg_search
rack-timeout
rails (= 6.1.7)
rails (= 7.1)
rails-controller-testing
render_anywhere
rubocop
sass-rails (>= 5)
sdoc (~> 2.6.1)
sdoc
solargraph
spring
spring-watcher-listen (~> 2.0.0)
spring-watcher-listen
terser (~> 1.1)
turbolinks
uglifier (>= 1.3.0)
unicorn
web-console (>= 4.2.0)
wicked_pdf
will_paginate (~> 3.1)
will_paginate
wkhtmltopdf-binary

RUBY VERSION
Expand Down
2 changes: 1 addition & 1 deletion config/application.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
module GraceTunes
class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
config.load_defaults 6.1
config.load_defaults 7.1

# Settings in config/environments/* take precedence over those specified here.
# Application configuration should go into files in config/initializers
Expand Down
Loading