diff --git a/.travis.yml b/.travis.yml index 5ea0e5e..cd6114f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,9 @@ sudo: required dist: trusty rvm: - 2.6.4 -before_install: gem install bundler -v 1.16.0 +before_install: + - gem install bundler + - bundle update before_script: - cp config/application.yml.example config/application.yml - cp config/database.yml.example config/database.yml diff --git a/Dockerfile b/Dockerfile index 249e1ae..e3cc660 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,4 +8,4 @@ ADD Gemfile /app/Gemfile ADD Gemfile.lock /app/Gemfile.lock RUN bundle install -ADD . /app \ No newline at end of file +ADD . /app diff --git a/Gemfile b/Gemfile index 8ff1c61..5358298 100644 --- a/Gemfile +++ b/Gemfile @@ -34,7 +34,7 @@ gem 'modernizr-rails' gem 'nokogiri', '>= 1.10.4' gem 'pg' gem 'pdfkit' -gem 'rails', '5.2.2.1' +gem 'rails', '6.0' gem 'rails-i18n' gem 'rails-env' gem 'rack', '>= 2.0.6' @@ -49,6 +49,7 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] gem 'uglifier' gem 'wkhtmltopdf-binary' gem 'whenever', require: false +gem 'rubocop' group :development, :test do gem 'byebug', platform: :mri