diff --git a/Dockerfile b/Dockerfile index 5505d4f..8094c69 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.5.7 +FROM ruby:2.6.5 ENV RAILS_ENV production diff --git a/Dockerfile.dev b/Dockerfile.dev index 4381726..de91ca9 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM ruby:2.5.7 +FROM ruby:2.6.5 ENV RAILS_ENV development diff --git a/Gemfile b/Gemfile index 8d6e690..935818e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,10 +1,10 @@ # frozen_string_literal: true source 'http://rubygems.org' -ruby '2.5.7' +ruby '2.6.5' # Rails core -gem 'rails', '~> 6.0.2.1' +gem 'rails', '~> 6.0.2.2' gem 'rake', '< 11.0' # Dotenv @@ -21,8 +21,7 @@ gem 'faraday', '~> 0.9.0' gem 'puma' # Model plugins -# FIXME: using this b/c ruby 2.4 not supported -gem 'unread', '0.10.1' +gem 'unread' # gem 'impressionist' # gem 'ratyrate' # gem "acts_as_rateable", :git => "git://github.com/anton-zaytsev/acts_as_rateable.git" diff --git a/Gemfile.lock b/Gemfile.lock index 44d7bec..76b32b0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -352,7 +352,7 @@ GEM railties (>= 5.0) retriable (3.1.2) rexml (3.2.4) - rmagick (4.0.0) + rmagick (4.1.0) rubocop (0.80.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) @@ -423,7 +423,7 @@ GEM json (>= 1.8.0) unicode-display_width (1.6.1) unicode_utils (1.4.0) - unread (0.10.1) + unread (0.11.0) activerecord (>= 3) web-console (3.7.0) actionview (>= 5.0) @@ -479,7 +479,7 @@ DEPENDENCIES pry-rails public_suffix puma - rails (~> 6.0.2.1) + rails (~> 6.0.2.2) rails-controller-testing rails_autolink rake (< 11.0) @@ -503,12 +503,12 @@ DEPENDENCIES timecop tinymce-rails uglifier (~> 2.5.0) - unread (= 0.10.1) + unread web-console (= 3.7.0) will_paginate RUBY VERSION - ruby 2.5.7p206 + ruby 2.6.5p114 BUNDLED WITH 2.1.4