Merge pull request #2231 from DMPRoadmap/security_sep_19

updated devise, eslint-utils, js-yaml

Gemfile

@@ -64,7 +64,7 @@ gem 'jbuilder', '~> 2.6.0'
 #    USERS
 # devise for user authentication
 # Flexible authentication solution for Rails with Warden (https://github.com/plataformatec/devise)
-gem 'devise'
+gem 'devise', ">= 4.7.1"
 
 # An invitation strategy for Devise (https://github.com/scambra/devise_invitable)
 gem 'devise_invitable'

Gemfile.lock

@@ -102,10 +102,10 @@ GEM
     daemons (1.3.1)
     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)
     devise_invitable (1.7.5)
@@ -327,7 +327,7 @@ GEM
       activesupport (>= 4.2.0, < 5.0)
       nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.4)
+    rails-html-sanitizer (1.2.0)
       loofah (~> 2.2, >= 2.2.2)
     rails_12factor (0.0.3)
       rails_serve_static_assets
@@ -340,7 +340,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (3.0.0)
-    rake (12.3.2)
+    rake (12.3.3)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
@@ -506,7 +506,7 @@ DEPENDENCIES
   chromedriver-helper (>= 1.2.0)
   contact_us
   database_cleaner
-  devise
+  devise (>= 4.7.1)
   devise_invitable
   dotenv-rails
   dragonfly

package.json

@@ -33,6 +33,7 @@
     "eslint-config-airbnb-base": "^13.1.0",
     "eslint-loader": "^2.1.1",
     "eslint-plugin-import": "^2.14.0",
+    "eslint-utils": "^1.4.1",
     "jquery": "^3.3.1",
     "jquery-accessible-autocomplete-list-aria": "^1.6.1",
     "jquery-ui": "^1.12.1",

spec/features/annotations/annotations_editing_spec.rb

@@ -53,8 +53,8 @@
       # Expect it to destroy the newly cleared Annotation
       expect { click_button 'Save' }.not_to change { Annotation.count }
     end
-    expect(Annotation.find(1).text).to eql("Foo bar")
-    expect(Annotation.find(2).text).to eql("Noo bar")
+    expect(annotation.text).to eql("Foo bar")
+    expect(Annotation.order("created_at").last.text).to eql("Noo bar")
     expect(page).not_to have_errors
   end
 

yarn.lock

@@ -3487,6 +3487,13 @@ eslint-utils@^1.3.1:
   dependencies:
     eslint-visitor-keys "^1.0.0"
 
+eslint-utils@^1.4.1:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz#166a5180ef6ab7eb462f162fd0e6f2463d7309ab"
+  integrity sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==
+  dependencies:
+    eslint-visitor-keys "^1.0.0"
+
 eslint-visitor-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"