Skip to content

Commit

Permalink
Migrate rails version to 5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Emilio Santiago authored and Emilio Santiago committed Apr 19, 2020
1 parent 208d0ed commit ceed4d8
Show file tree
Hide file tree
Showing 23 changed files with 279 additions and 253 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.3.1-slim
FROM ruby:2.5-slim

ENV RAILS_ROOT /myinterviews
ENV RAILS_ENV=production
Expand All @@ -12,7 +12,7 @@ EXPOSE 3000

RUN apt-get update \
&& apt-get install -y --no-install-recommends \
libpq-dev zlib1g-dev git liblzma-dev netcat build-essential \
libpq-dev zlib1g-dev git liblzma-dev netcat nodejs build-essential \
&& gem install bundler \
&& bundle install --without development test \
&& bundle exec rake assets:clean \
Expand Down
14 changes: 7 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ git_source(:github) do |repo_name|
"https://github.com/#{repo_name}.git"
end

gem 'rails', '~> 5.0.7.2'
gem 'rails', '~> 5.1.7'
gem 'pg', '~> 0.21'
gem 'puma', '~> 3'
gem 'puma', '~> 3.7'
gem 'sass-rails', '~> 5.0'
gem 'uglifier', '>= 1.3.0'
gem 'coffee-rails', '~> 4.2'
Expand All @@ -16,15 +16,15 @@ gem 'tinymce-rails'
gem 'jquery-rails'
gem 'jbuilder', '~> 2.5'
gem 'annotate'
gem 'acts-as-taggable-on', '4.0.0'
gem 'acts-as-taggable-on', '5.0.0'
gem 'rails-settings-cached', '0.6.5'
gem 'nokogiri', '~> 1.10'
gem 'kaminari', '1.0.1'

gem 'ffi', '>= 1.9.24'

group :development, :test do
gem 'byebug', platform: :mri
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
gem 'dotenv-rails'
gem 'rspec-rails'
gem 'rubocop', '~> 0.68', require: false
Expand All @@ -34,10 +34,10 @@ group :development, :test do
end

group :development do
gem 'web-console'
gem 'listen'
gem 'web-console', '>= 3.3.0'
gem 'listen', '>= 3.0.5', '< 3.2'
gem 'spring'
gem 'spring-watcher-listen'
gem 'spring-watcher-listen', '~> 2.0.0'
end

group :test do
Expand Down
Loading

0 comments on commit ceed4d8

Please sign in to comment.