Update for CVE-2019-8331.

castorini · Feb 23, 2019 · 98bf142a0a4024ee784b5860ea1035efc3565dbc · 98bf142
1 parent d7b141e
commit 98bf142a0a4024ee784b5860ea1035efc3565dbc
Unified Split

Showing with 26 additions and 17 deletions.

+2 −2 Gemfile

+23 −14 Gemfile.lock

+1 −1 app/views/shared/_header_navbar.html.erb
diff --git a/Gemfile b/Gemfile
@@ -6,7 +6,7 @@ ruby '2.4.5'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.2.2'
 # Use sqlite3 as the database for Active Record
-  
-gem 'sqlite3'
+  
+gem 'sqlite3', '~> 1.3', '< 1.4'
 # Use Puma as the app server
 gem 'puma', '~> 3.11'
 # Use SCSS for stylesheets
@@ -68,7 +68,7 @@ group :development, :test do
 end
 gem 'rsolr', '>= 1.0', '< 3'
-  
-gem 'bootstrap', '~> 4.0'
+  
+gem 'bootstrap', '~> 4.3.1'
 gem 'popper_js'
 gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
 gem 'jquery-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -42,12 +42,12 @@ GEM
      i18n (>= 0.7, < 2)
      minitest (~> 5.1)
      tzinfo (~> 1.1)
-  
-    addressable (2.5.2)
+  
+    addressable (2.6.0)
      public_suffix (>= 2.0.2, < 4.0)
    archive-zip (0.11.0)
      io-like (~> 0.3.0)
    arel (9.0.0)
-  
-    autoprefixer-rails (9.4.5)
+  
+    autoprefixer-rails (9.4.8)
      execjs
    bindex (0.5.0)
    blacklight (7.0.1)
@@ -57,15 +57,15 @@ GEM
      kaminari (>= 0.15)
      nokogiri (~> 1.6)
      rails (~> 5.1)
-  
-    bootsnap (1.3.2)
+  
+    bootsnap (1.4.0)
      msgpack (~> 1.0)
-  
-    bootstrap (4.1.3)
-  
-      autoprefixer-rails (>= 6.0.3)
-  
-      popper_js (>= 1.12.9, < 2)
-  
-      sass (>= 3.5.2)
+  
+    bootstrap (4.3.1)
+  
+      autoprefixer-rails (>= 9.1.0)
+  
+      popper_js (>= 1.14.3, < 2)
+  
+      sassc-rails (>= 2.0.0)
    builder (3.2.3)
-  
-    byebug (10.0.2)
-  
-    capybara (3.12.0)
+  
+    byebug (11.0.0)
+  
+    capybara (3.13.2)
      addressable
      mini_mime (>= 0.1.3)
      nokogiri (~> 1.8)
@@ -93,10 +93,10 @@ GEM
    execjs (2.7.0)
    faraday (0.15.4)
      multipart-post (>= 1.2, < 3)
-  
-    ffi (1.10.0)
+  
+    ffi (1.9.25)
    globalid (0.4.2)
      activesupport (>= 4.2.0)
-  
-    i18n (1.5.2)
+  
+    i18n (1.5.3)
      concurrent-ruby (~> 1.0)
    io-like (0.3.0)
    jbuilder (2.8.0)
@@ -193,6 +193,15 @@ GEM
      sprockets (>= 2.8, < 4.0)
      sprockets-rails (>= 2.0, < 4.0)
      tilt (>= 1.1, < 3)
+  
+    sassc (2.0.0)
+  
+      ffi (~> 1.9.6)
+  
+      rake
+  
+    sassc-rails (2.1.0)
+  
+      railties (>= 4.0.0)
+  
+      sassc (>= 2.0)
+  
+      sprockets (> 3.0)
+  
+      sprockets-rails
+  
+      tilt
    selenium-webdriver (3.141.0)
      childprocess (~> 0.5)
      rubyzip (~> 1.2, >= 1.2.2)
@@ -245,7 +254,7 @@ PLATFORMS
 DEPENDENCIES
  blacklight (>= 7.0)
  bootsnap (>= 1.1.0)
-  
-  bootstrap (~> 4.0)
+  
+  bootstrap (~> 4.3.1)
  byebug
  capybara (>= 2.15)
  chromedriver-helper
@@ -262,7 +271,7 @@ DEPENDENCIES
  solr_wrapper (>= 0.3)
  spring
  spring-watcher-listen (~> 2.0.0)
-  
-  sqlite3
+  
+  sqlite3 (~> 1.3, < 1.4)
  turbolinks (~> 5)
  twitter-typeahead-rails (= 0.11.1.pre.corejavascript)
  tzinfo-data
@@ -273,4 +282,4 @@ RUBY VERSION
   ruby 2.4.5p335
 BUNDLED WITH
-  
-   1.17.1
+  
+   2.0.1
diff --git a/app/views/shared/_header_navbar.html.erb b/app/views/shared/_header_navbar.html.erb
@@ -1,6 +1,6 @@
 <nav class="navbar navbar-expand-md navbar-dark bg-dark topbar" role="navigation">
  <div class="<%= container_classes %>">
-  
-    <h1><%= link_to "GooseLight", root_path, style: 'color:white; text-decoration: none;' %></h1>
+  
+    <h1><%= link_to "Gooselight", root_path, style: 'color:white; text-decoration: none;' %></h1>
    <%= link_to application_name, root_path, class: 'mb-0 navbar-brand', style: 'margin-left: 10px;'%>
    <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#user-util-collapse" aria-controls="user-util-collapse" aria-expanded="false" aria-label="Toggle navigation">
      <span class="navbar-toggler-icon"></span>