Skip to content

Commit

Permalink
Update to rails 6.0.0, devise 4.7.1, and coffee-rails 5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
remomueller committed Sep 11, 2019
1 parent aac8bbb commit 2be3bf9
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
12 changes: 6 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"

Expand All @@ -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
Expand Down

0 comments on commit 2be3bf9

Please sign in to comment.