From 2be3bf903cff12beee8a32a660b703a34d8fea56 Mon Sep 17 00:00:00 2001 From: Remo Mueller Date: Tue, 10 Sep 2019 20:57:45 -0400 Subject: [PATCH] Update to rails 6.0.0, devise 4.7.1, and coffee-rails 5.0 --- CHANGELOG.md | 4 ++++ Gemfile | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82c4692..24c535d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ - **User Changes** - Admins can now associate a Staff ID with a user that will display in the directory and in the menu bar +- **Gem Changes** + - Update to rails 6.0.0 + - Update to devise 4.7.1 + - Update to coffee-rails 5.0 ## 11.0.0 (August 10, 2019) diff --git a/Gemfile b/Gemfile index d3096fa..a087657 100644 --- a/Gemfile +++ b/Gemfile @@ -3,17 +3,17 @@ # rubocop:disable Layout/ExtraSpacing source "https://rubygems.org" -gem "rails", "6.0.0.beta3" +gem "rails", "6.0.0" # Use PostgreSQL as the database for Active Record gem "pg", ">= 0.18", "< 2.0" # Gems used by project -gem "autoprefixer-rails", "9.1.0" +gem "autoprefixer-rails" gem "aws-sdk-s3", require: false gem "bootstrap", "~> 4.3.1" gem "carrierwave", "~> 1.3.1" -gem "devise", "~> 4.6.2" +gem "devise", "~> 4.7.1" gem "fog-aws" gem "font-awesome-sass", "~> 5.8.1" gem "haml", "~> 5.1.1" @@ -25,11 +25,11 @@ gem "pg_search", "~> 2.3.0" gem "redcarpet", "~> 3.5.0" # Rails defaults -gem "coffee-rails", "~> 4.2" +gem "coffee-rails", "~> 5.0" gem "jbuilder", "~> 2.9" gem "puma", "~> 3.11" gem "redis", "~> 4.0" -gem "sass-rails", "~> 5.0" +gem "sass-rails", "~> 5" gem "turbolinks", "~> 5" gem "uglifier", ">= 1.3.0" @@ -41,7 +41,7 @@ group :development do end group :test do - gem "capybara", ">= 2.15", "< 4.0" + gem "capybara", ">= 2.15" gem "selenium-webdriver" gem "simplecov", "~> 0.16.1", require: false end