Skip to content
Permalink
Browse files

upgrade for Rails 6.0

  • Loading branch information...
west2538 committed Aug 17, 2019
1 parent 9a2ff1e commit fd22c6975380b64b9a493f40b43266a0b54c47bd
Showing with 144 additions and 149 deletions.
  1. +23 −23 Gemfile
  2. +101 −101 Gemfile.lock
  3. +3 −3 config/application.rb
  4. +13 −3 config/database.yml
  5. +3 −3 config/initializers/inflections.rb
  6. +0 −15 config/initializers/rack_attack.rb
  7. +1 −1 config/initializers/session_store.rb
46 Gemfile
@@ -9,19 +9,19 @@ gem 'mastodon-api', '~> 2.0', require: 'mastodon'
gem 'omniauth-mastodon'
gem 'omniauth', github: 'west2538/omniauth'
gem 'rails_autolink'
gem 'meta-tags', '~> 2.11'
gem 'meta-tags'
gem 'gmaps4rails'
gem 'geocoder', '~> 1.5', '>= 1.5.1'
gem 'ffi', '~> 1.11', '>= 1.11.1'
gem 'sprockets-rails', '~> 3.2', '>= 3.2.1'
gem 'geocoder'
gem 'ffi'
gem 'sprockets-rails'
gem 'jquery-rails'
gem 'jquery-ui-rails'
gem 'aws-sdk-s3', require: false
gem 'mini_magick', '~> 4.9', '>= 4.9.2'
gem 'redis-rails', '~> 5.0', '>= 5.0.2'
gem 'mini_magick'
# gem 'redis-rails'
gem 'acts-as-taggable-on'
gem 'nested_form_fields'
gem 'rails-i18n', '~> 5.1', '>= 5.1.2'
gem 'rails-i18n'
gem 'dotenv-rails'
gem 'opengraph_parser'
gem 'file_validators'
@@ -31,10 +31,10 @@ gem 'twitter'
gem 'toastr_rails'
gem 'rack-attack'
gem 'google-cloud-vision'
gem 'google-protobuf', '~> 3.8'
gem 'google-protobuf'
gem 'momentjs-rails'
gem 'webpush'
gem 'redis', '~> 4.1'
gem 'redis'
gem 'sidekiq'
gem 'sinatra', require: false
gem 'redis-namespace'
@@ -45,32 +45,32 @@ gem 'grape-swagger'
gem 'grape-swagger-rails'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.3'
gem 'rails', '~> 6.0'
# Use sqlite3 as the database for Active Record
# gem 'sqlite3'
# Use Puma as the app server
gem 'puma', '~> 4.0'
gem 'puma'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0', '>= 5.0.7'
gem 'sass-rails'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
gem 'uglifier'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'mini_racer', platforms: :ruby

# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 5.0'
gem 'coffee-rails'
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
gem 'turbolinks', '~> 5.2.0'
gem 'turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.5'
gem 'jbuilder'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '~> 1.4', '>= 1.4.3'
gem 'bootsnap'
# gem 'bootsnap', '>= 1.1.0', require: false

group :development, :test do
@@ -79,10 +79,10 @@ group :development, :test do
end

group :development do
gem 'sqlite3', '~> 1.3.6'
# gem 'sqlite3'
gem 'pg', '~> 1.1', '>= 1.1.4'
# gem 'sqlite3', '~> 1.4'
# Access an interactive console on exception pages or by calling 'console' anywhere in the code.
gem 'web-console', '~> 3.7'
gem 'web-console'
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'
@@ -92,10 +92,10 @@ group :development do
end

group :test do
gem 'sqlite3', '~> 1.3.6'
# gem 'sqlite3'
gem 'pg', '~> 1.1', '>= 1.1.4'
# gem 'sqlite3', '~> 1.4'
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '>= 2.15', '< 4.0'
gem 'capybara'
gem 'selenium-webdriver'
# Easy installation and use of chromedriver to run system tests with Chrome
gem 'chromedriver-helper'

0 comments on commit fd22c69

Please sign in to comment.
You can’t perform that action at this time.