ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2025-02-05 07:51:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade to ruby 2.6.5 and Rails 6.0.2.2

Browse source 
+ Update some gems
This commit is contained in:
Ari Timonen 2020-03-23 05:38:38 +02:00
parent 3a890b8803
commit d539a95c68
4 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -1,4 +1,4 @@
FROM ruby:2.5.7 FROM ruby:2.6.5
ENV RAILS_ENV production ENV RAILS_ENV production

2
Dockerfile.dev
View file

@ -1,4 +1,4 @@
FROM ruby:2.5.7 FROM ruby:2.6.5
ENV RAILS_ENV development ENV RAILS_ENV development

7
Gemfile
View file

@ -1,10 +1,10 @@
# frozen_string_literal: true # frozen_string_literal: true
source 'http://rubygems.org' source 'http://rubygems.org'
ruby '2.5.7' ruby '2.6.5'
# Rails core # Rails core
gem 'rails', '~> 6.0.2.1' gem 'rails', '~> 6.0.2.2'
gem 'rake', '< 11.0' gem 'rake', '< 11.0'
# Dotenv # Dotenv
@ -21,8 +21,7 @@ gem 'faraday', '~> 0.9.0'
gem 'puma' gem 'puma'
# Model plugins # Model plugins
# FIXME: using this b/c ruby 2.4 not supported gem 'unread'
gem 'unread', '0.10.1'
# gem 'impressionist' # gem 'impressionist'
# gem 'ratyrate' # gem 'ratyrate'
# gem "acts_as_rateable", :git => "git://github.com/anton-zaytsev/acts_as_rateable.git" # gem "acts_as_rateable", :git => "git://github.com/anton-zaytsev/acts_as_rateable.git"

10
Gemfile.lock
View file

@ -352,7 +352,7 @@ GEM
railties (>= 5.0) railties (>= 5.0)
retriable (3.1.2) retriable (3.1.2)
rexml (3.2.4) rexml (3.2.4)
rmagick (4.0.0) rmagick (4.1.0)
rubocop (0.80.1) rubocop (0.80.1)
jaro_winkler (~> 1.5.1) jaro_winkler (~> 1.5.1)
parallel (~> 1.10) parallel (~> 1.10)
@ -423,7 +423,7 @@ GEM
json (>= 1.8.0) json (>= 1.8.0)
unicode-display_width (1.6.1) unicode-display_width (1.6.1)
unicode_utils (1.4.0) unicode_utils (1.4.0)
unread (0.10.1) unread (0.11.0)
activerecord (>= 3) activerecord (>= 3)
web-console (3.7.0) web-console (3.7.0)
actionview (>= 5.0) actionview (>= 5.0)
@ -479,7 +479,7 @@ DEPENDENCIES
pry-rails pry-rails
public_suffix public_suffix
puma puma
rails (~> 6.0.2.1) rails (~> 6.0.2.2)
rails-controller-testing rails-controller-testing
rails_autolink rails_autolink
rake (< 11.0) rake (< 11.0)
@ -503,12 +503,12 @@ DEPENDENCIES
timecop timecop
tinymce-rails tinymce-rails
uglifier (~> 2.5.0) uglifier (~> 2.5.0)
unread (= 0.10.1) unread
web-console (= 3.7.0) web-console (= 3.7.0)
will_paginate will_paginate
RUBY VERSION RUBY VERSION
ruby 2.5.7p206 ruby 2.6.5p114
BUNDLED WITH BUNDLED WITH
2.1.4 2.1.4