diff --git a/.ruby-version b/.ruby-version index 8e8299d..338a5b5 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.4.2 +2.6.6 diff --git a/.tool-versions b/.tool-versions index dff7248..1c44dd0 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -ruby 2.4.2 +ruby 2.6.6 diff --git a/Gemfile b/Gemfile index c32a37f..f403013 100644 --- a/Gemfile +++ b/Gemfile @@ -1,63 +1,64 @@ -source 'http://rubygems.org' -ruby '2.4.2' +source "http://rubygems.org" +ruby "2.6.6" -gem 'dotenv-rails', :groups => [:development, :test] +gem "dotenv-rails", groups: [:development, :test] -gem 'rails', '~> 5.1' +gem "rails", "~> 5.1" # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' -gem 'administrate' -gem 'administrate-field-image' -gem 'aws-sdk' -gem 'bourbon' -gem 'coffee-rails' -gem 'dragonfly' -gem 'dragonfly-s3_data_store' -gem 'jquery-rails' -gem 'kaminari' -gem 'kramdown' -gem 'mime-types' -gem 'nokogiri' -gem 'oath' -gem 'oath-generators' -gem 'pg' -gem 'sass-rails' -gem 'simple_form' -gem 'slugtastic' -gem 'uglifier' -gem 'unf' +gem "administrate" +gem "administrate-field-image" +gem "aws-sdk" +gem "bourbon" +gem "coffee-rails" +gem "dragonfly" +gem "dragonfly-s3_data_store" +gem "jquery-rails" +gem "kaminari" +gem "kramdown" +gem "mime-types" +gem "nokogiri" +gem "oath" +gem "oath-generators" +gem "pg" +gem "sass-rails" +gem "simple_form" +gem "slugtastic" +gem "uglifier" +gem "unf" # Bundle gems for the local environment. Make sure to # put test-only gems in this group so their generators # and rake tasks are available in development mode: group :development do - gem 'ruby_parser' - gem 'powder' - gem 'better_errors' - gem 'binding_of_caller' - gem 'letter_opener' + gem "ruby_parser" + gem "powder" + gem "better_errors" + gem "binding_of_caller" + gem "letter_opener" + gem "standardrb" end group :test, :development do - gem 'rspec-rails' - gem 'rails-controller-testing' - gem 'rubocop' - gem 'pry' + gem "rspec-rails" + gem "rails-controller-testing" + gem "rubocop" + gem "pry" end group :test do - gem 'factory_bot_rails' - gem 'shoulda' - gem 'poltergeist' - gem 'database_cleaner' - gem 'fivemat' - gem 'capybara-screenshot' - gem 'simplecov' + gem "factory_bot_rails" + gem "shoulda" + gem "poltergeist" + gem "database_cleaner" + gem "fivemat" + gem "capybara-screenshot" + gem "simplecov" end group :production do - gem 'puma' - gem 'rails_12factor' + gem "puma" + gem "rails_12factor" end diff --git a/Gemfile.lock b/Gemfile.lock index a6698d5..6e101a8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -320,6 +320,10 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) + standard (0.0.36) + rubocop (>= 0.63) + standardrb (1.0.0) + standard thor (0.20.3) thread_safe (0.3.6) tilt (2.0.8) @@ -381,11 +385,12 @@ DEPENDENCIES simple_form simplecov slugtastic + standardrb uglifier unf RUBY VERSION - ruby 2.4.2p198 + ruby 2.6.6p146 BUNDLED WITH - 1.16.1 + 1.17.2