Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump puma from 3.12.0 to 4.3.12 #18

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump puma from 3.12.0 to 4.3.12 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ gem 'rails', '~> 5.2.0'
# Use Postgres as the database for Active Record
gem 'pg'
# Use Puma as the app server
gem 'puma', '~> 3.7'
gem 'puma', '~> 4.3'
# Use SCSS for stylesheets
gem 'sassc-rails'
# Use Uglifier as compressor for JavaScript assets
Expand Down
107 changes: 56 additions & 51 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GIT
remote: git://github.com/WSULib/blacklight-maps.git
remote: https://github.com/WSULib/blacklight-maps.git
revision: 95810fe9fc950517262d9efbd9f168cb6b0cc999
branch: master
specs:
Expand All @@ -10,7 +10,7 @@ GIT
rails

GIT
remote: git://github.com/WSULib/blacklight.git
remote: https://github.com/WSULib/blacklight.git
revision: 7c54ef3e01f95ec804a293ab525a51dbd5626b16
branch: 6.15.0
specs:
Expand All @@ -26,7 +26,7 @@ GIT
twitter-typeahead-rails (= 0.11.1.pre.corejavascript)

GIT
remote: git://github.com/WSULib/spotlight.git
remote: https://github.com/WSULib/spotlight.git
revision: 7e71009405ced97c80b2166611104e0c1a951e3e
branch: master
specs:
Expand Down Expand Up @@ -117,8 +117,8 @@ GEM
activerecord (>= 4.2.8)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
almond-rails (0.1.0)
rails (>= 4.2, < 6)
almond-rails (0.3.0)
rails (>= 4.2)
arel (9.0.0)
autoprefixer-rails (9.6.1.1)
execjs
Expand All @@ -145,26 +145,26 @@ GEM
breadcrumbs_on_rails (3.0.1)
builder (3.2.3)
byebug (10.0.2)
cancancan (3.0.1)
cancancan (3.3.0)
capybara (2.18.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (>= 2.0, < 4.0)
carrierwave (1.3.1)
carrierwave (1.3.2)
activemodel (>= 4.0.0)
activesupport (>= 4.0.0)
mime-types (>= 1.16)
ssrf_filter (~> 1.0)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
chronic (0.10.2)
clipboard-rails (1.7.1)
concurrent-ruby (1.1.5)
crass (1.0.4)
declarative (0.0.10)
declarative-option (0.1.0)
declarative (0.0.20)
deprecation (1.0.0)
activesupport
devise (4.7.1)
Expand All @@ -178,7 +178,7 @@ GEM
devise_invitable (1.7.5)
actionmailer (>= 4.1.0)
devise (>= 4.0.0)
diffy (3.3.0)
diffy (3.4.0)
dotenv (2.5.0)
dotenv-rails (2.5.0)
dotenv (= 2.5.0)
Expand All @@ -187,44 +187,44 @@ GEM
execjs (2.7.0)
faraday (0.16.2)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.13.1)
faraday_middleware (0.14.0)
faraday (>= 0.7.4, < 1.0)
ffi (1.9.25)
friendly_id (5.2.5)
activerecord (>= 4.0.0)
github-markup (3.0.4)
github-markup (4.0.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
i18n (1.6.0)
concurrent-ruby (~> 1.0)
i18n-active_record (0.3.0)
i18n-active_record (1.1.0)
i18n (>= 0.5.0)
iiif-presentation (0.2.0)
iiif-presentation (1.0.0)
activesupport (>= 3.2.18)
faraday (>= 0.9)
json
iiif_manifest (1.0.1)
iiif_manifest (1.1.0)
activesupport (>= 4)
jbuilder (2.9.1)
activesupport (>= 4.2.0)
jquery-rails (4.3.5)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (2.2.0)
jwt (2.2.1)
kaminari (1.1.1)
json (2.6.1)
jwt (2.3.0)
kaminari (1.2.2)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.1.1)
kaminari-activerecord (= 1.1.1)
kaminari-core (= 1.1.1)
kaminari-actionview (1.1.1)
kaminari-actionview (= 1.2.2)
kaminari-activerecord (= 1.2.2)
kaminari-core (= 1.2.2)
kaminari-actionview (1.2.2)
actionview
kaminari-core (= 1.1.1)
kaminari-activerecord (1.1.1)
kaminari-core (= 1.2.2)
kaminari-activerecord (1.2.2)
activerecord
kaminari-core (= 1.1.1)
kaminari-core (1.1.1)
kaminari-core (= 1.2.2)
kaminari-core (1.2.2)
leaflet-rails (1.5.1)
rails (>= 4.2.0)
legato (0.7.0)
Expand All @@ -241,36 +241,39 @@ GEM
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (0.9.2)
mime-types (3.3)
mime-types (3.4.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.0904)
mimemagic (0.3.3)
mini_magick (4.9.5)
mime-types-data (3.2022.0105)
mimemagic (0.3.10)
nokogiri (~> 1)
rake
mini_magick (4.11.0)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.12.2)
multi_json (1.13.1)
multi_json (1.15.0)
multi_xml (0.6.0)
multipart-post (2.1.1)
nio4r (2.5.2)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
oauth2 (1.4.2)
faraday (>= 0.8, < 2.0)
oauth2 (1.4.8)
faraday (>= 0.8, < 3.0)
jwt (>= 1.0, < 3.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
openseadragon (0.5.0)
rails (> 3.2.0)
orm_adapter (0.5.0)
paper_trail (10.3.1)
activerecord (>= 4.2)
paper_trail (12.3.0)
activerecord (>= 5.2)
request_store (~> 1.1)
pg (1.0.0)
public_suffix (4.0.1)
pul_uv_rails (2.0.1)
puma (3.12.0)
puma (4.3.12)
nio4r (~> 2.0)
rack (2.0.7)
rack-test (1.1.0)
rack (>= 1.0, < 3)
Expand Down Expand Up @@ -305,12 +308,12 @@ GEM
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
redcarpet (3.5.0)
representable (3.0.4)
redcarpet (3.5.1)
representable (3.1.1)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
request_store (1.4.1)
request_store (1.5.1)
rack (>= 1.4)
responders (3.0.0)
actionpack (>= 5.0)
Expand All @@ -319,8 +322,8 @@ GEM
riiif (1.7.1)
deprecation (>= 1.0.0)
railties (>= 4.2, < 6)
roar (1.1.0)
representable (~> 3.0.0)
roar (1.1.1)
representable (~> 3.0)
roar-rails (1.1.0)
actionpack
railties (>= 3.0.0)
Expand Down Expand Up @@ -355,14 +358,14 @@ GEM
rubyzip (~> 1.2)
sentry-raven (2.7.4)
faraday (>= 0.7.6, < 1.0)
signet (0.11.0)
signet (0.12.0)
addressable (~> 2.3)
faraday (~> 0.9)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
sir_trevor_rails (0.5.1)
sir_trevor_rails (0.6.1)
multi_json (~> 1.0)
rails (>= 3, < 6)
rails (>= 3, < 7)
redcarpet (>= 2.0.1, < 4)
twitter-text (~> 1.4)
sitemap_generator (6.0.1)
Expand All @@ -388,6 +391,7 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
ssrf_filter (1.0.7)
test_xml (0.1.8)
diffy (~> 3.0)
nokogiri (>= 1.3.2)
Expand All @@ -396,6 +400,7 @@ GEM
tilt (2.0.8)
tophat (2.3.1)
actionpack (>= 3.0.0)
trailblazer-option (0.1.2)
twitter-text (1.14.7)
unf (~> 0.1.0)
twitter-typeahead-rails (0.11.1.pre.corejavascript)
Expand All @@ -410,7 +415,7 @@ GEM
underscore-rails (1.8.3)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.6)
unf_ext (0.0.8.1)
warden (1.2.8)
rack (>= 2.0.6)
web-console (3.6.2)
Expand All @@ -425,10 +430,10 @@ GEM
chronic (>= 0.6.3)
xpath (3.1.0)
nokogiri (~> 1.8)
zip_tricks (4.8.0)
zipline (1.1.1)
rails (>= 3.2.1, < 6.1)
zip_tricks (>= 4.2.1, <= 5.0.0)
zip_tricks (5.6.0)
zipline (1.4.0)
actionpack (>= 3.2.1, < 8.0)
zip_tricks (>= 4.2.1, < 6.0)

PLATFORMS
ruby
Expand All @@ -454,7 +459,7 @@ DEPENDENCIES
listen (>= 3.0.5, < 3.2)
pg
pul_uv_rails
puma (~> 3.7)
puma (~> 4.3)
rails (~> 5.2.0)
rails-assets-leaflet.markercluster!
riiif (~> 1.0)
Expand Down