Merge branch 'hotfix-1.6.3'

duke-libraries · Jan 15, 2020 · 3136740 · 3136740
2 parents 679fc50 + 19730cc
commit 3136740
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -21,7 +21,7 @@ gem 'lcsort', '~> 0.9'
 gem 'loofah', '>= 2.3.1'
 gem 'non-stupid-digest-assets'
 gem 'pg'
-gem 'puma', '~> 3.0'
+gem 'puma', '~> 3.12'
 gem 'rails', '~> 5.0.1'
 gem 'sass-rails', '~> 5.0'
 gem 'sprockets', '~> 3.7.2'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -194,7 +194,7 @@ GEM
     pg (1.1.4)
     powerpack (0.1.2)
     public_suffix (3.0.3)
-    puma (3.12.0)
+    puma (3.12.2)
     rack (2.0.7)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -356,7 +356,7 @@ DEPENDENCIES
   loofah (>= 2.3.1)
   non-stupid-digest-assets
   pg
-  puma (~> 3.0)
+  puma (~> 3.12)
   rails (~> 5.0.1)
   rails-controller-testing
   rspec-rails (~> 3.8)

diff --git a/lib/dul_argon_skin/version.rb b/lib/dul_argon_skin/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DulArgonSkin
-  VERSION = '1.6.2'
+  VERSION = '1.6.3'
 end