Merge branch 'hotfix/v1.4.1'

CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased] changes
 
+## [v1.4.1] - 2019-12-16
+
+### Fixed
+- Bump Devise to 4.7.1
+- Bump Puma to 4.3.1
+
 ## [v1.4.0] - 2019-12-16
 
 ### Changed
@@ -122,7 +128,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Account overview with list of all accounts and balances for each
 
 
-[Unreleased]: https://github.com/odinsride/olubalance/compare/v1.4.0...HEAD
+[Unreleased]: https://github.com/odinsride/olubalance/compare/v1.4.1...HEAD
+[v1.4.1]: https://github.com/odinsride/olubalance/compare/v1.4.0...v1.4.1
 [v1.4.0]: https://github.com/odinsride/olubalance/compare/v1.3.2...v1.4.0
 [v1.3.2]: https://github.com/odinsride/olubalance/compare/v1.3.0...v1.3.2
 [v1.3.0]: https://github.com/odinsride/olubalance/compare/v1.2.2...v1.3.0

Gemfile

@@ -10,23 +10,19 @@ end
 ruby '2.6.4'
 
 gem 'aws-sdk-s3'
-gem 'devise', '~> 4.6.2'
+gem 'devise', '~> 4.7.1'
 gem 'draper', '~> 3.1.0'
 gem 'figaro'
 gem 'font-awesome-rails'
 gem 'jquery-rails'
 gem 'jquery-turbolinks'
-# gem 'material_icons'
-# gem 'materialize-form', '~> 1.0.8'
-# gem 'materialize-sass', '~> 0.100.2'
 gem 'mini_magick'
 gem 'pg', '~> 1.1.4'
-gem 'puma', '~> 4.0.1'
+gem 'puma', '~> 4.3.1'
 gem 'rails', '~> 5.2.3'
 gem 'rails-ujs'
 gem 'sassc'
 gem 'sassc-rails'
-# gem 'simple_form', '~> 4.1.0'
 gem 'turbolinks'
 gem 'uglifier'
 gem 'will_paginate'

Gemfile.lock

@@ -88,10 +88,10 @@ GEM
     crass (1.0.5)
     database_cleaner (1.7.0)
     debug_inspector (0.0.3)
-    devise (4.6.2)
+    devise (4.7.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 6.0)
+      railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
     diff-lcs (1.3)
@@ -164,7 +164,7 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.1)
-    puma (4.0.1)
+    puma (4.3.1)
       nio4r (~> 2.0)
     rack (2.0.7)
     rack-test (1.1.0)
@@ -296,7 +296,7 @@ DEPENDENCIES
   binding_of_caller
   capybara
   database_cleaner
-  devise (~> 4.6.2)
+  devise (~> 4.7.1)
   draper (~> 3.1.0)
   factory_bot_rails (~> 5.0.2)
   faker
@@ -309,7 +309,7 @@ DEPENDENCIES
   pg (~> 1.1.4)
   pry-byebug (~> 3.7.0)
   pry-rails (~> 0.3.9)
-  puma (~> 4.0.1)
+  puma (~> 4.3.1)
   rails (~> 5.2.3)
   rails-controller-testing
   rails-ujs