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.4 to 4.3.12 #24

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

Bump puma from 3.12.4 to 4.3.12 #24

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 @@ -8,7 +8,7 @@ gem 'rails', '~> 5.2.3'
# Use sqlite3 as the database for Active Record
gem "sqlite3", "~> 1.3.0"
# Use Puma as the app server
gem 'puma', '~> 3.12'
gem 'puma', '~> 4.3'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
Expand Down
174 changes: 98 additions & 76 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ GEM
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.7.0)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
almond-rails (0.1.0)
rails (>= 4.2, < 6)
Expand All @@ -77,22 +77,22 @@ GEM
execjs
awesome_nested_set (3.2.0)
activerecord (>= 4.0.0, < 7.0)
aws-eventstream (1.0.3)
aws-partitions (1.262.0)
aws-sdk-core (3.86.0)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-eventstream (1.2.0)
aws-partitions (1.571.0)
aws-sdk-core (3.130.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-kms (1.27.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sdk-kms (1.55.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.60.1)
aws-sdk-core (~> 3, >= 3.83.0)
aws-sdk-s3 (1.113.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.1.0)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-sigv4 (~> 1.4)
aws-sigv4 (1.4.0)
aws-eventstream (~> 1, >= 1.0.2)
babel-source (5.8.35)
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
Expand Down Expand Up @@ -126,19 +126,16 @@ GEM
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
breadcrumbs_on_rails (3.0.1)
browse-everything (1.0.2)
browse-everything (1.1.2)
addressable (~> 2.5)
aws-sdk-s3
dropbox_api (>= 0.1.10)
google-api-client (~> 0.23)
google_drive (~> 2.1)
googleauth (= 0.6.6)
puma (~> 3.11)
rails (>= 4.2, < 6.0)
google_drive (>= 2.1, < 4)
googleauth (>= 0.6.6, < 1.0)
rails (>= 4.2, < 7.0)
ruby-box
signet (~> 0.8)
sprockets (~> 3.7)
thor (~> 0.19)
typhoeus
builder (3.2.4)
byebug (11.0.1)
Expand Down Expand Up @@ -167,10 +164,10 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.5)
concurrent-ruby (1.1.10)
connection_pool (2.2.2)
crass (1.0.5)
declarative (0.0.10)
crass (1.0.6)
declarative (0.0.20)
declarative-builder (0.1.0)
declarative-option (< 0.2.0)
declarative-option (0.1.0)
Expand All @@ -197,8 +194,8 @@ GEM
activemodel-serializers-xml (>= 1.0)
activesupport (>= 5.0)
request_store (>= 1.0)
dropbox_api (0.1.18)
faraday (<= 1.0)
dropbox_api (0.1.21)
faraday (< 3.0)
oauth2 (~> 1.1)
dry-configurable (0.9.0)
concurrent-ruby (~> 1.0)
Expand Down Expand Up @@ -253,44 +250,62 @@ GEM
sxp (~> 1.1)
equivalent-xml (0.6.0)
nokogiri (>= 1.4.3)
erubi (1.9.0)
ethon (0.12.0)
ffi (>= 1.3.0)
erubi (1.10.0)
ethon (0.15.0)
ffi (>= 1.15.0)
execjs (2.7.0)
faraday (0.17.3)
faraday (0.17.5)
multipart-post (>= 1.2, < 3)
faraday-encoding (0.0.5)
faraday
fcrepo_wrapper (0.9.0)
ruby-progressbar
ffi (1.11.3)
ffi (1.15.5)
flipflop (2.6.0)
activesupport (>= 4.0)
flot-rails (0.0.7)
jquery-rails
font-awesome-rails (4.7.0.5)
railties (>= 3.2, < 6.1)
globalid (0.4.2)
activesupport (>= 4.2.0)
google-api-client (0.32.1)
gems (1.2.0)
globalid (1.0.0)
activesupport (>= 5.0)
google-api-client (0.53.0)
google-apis-core (~> 0.1)
google-apis-generator (~> 0.1)
google-apis-core (0.4.2)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.5, < 0.10.0)
httpclient (>= 2.8.1, < 3.0)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
mini_mime (~> 1.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
signet (~> 0.10)
google_drive (2.1.3)
google-api-client (>= 0.11.0, < 1.0.0)
retriable (>= 2.0, < 4.a)
rexml
webrick
google-apis-discovery_v1 (0.8.0)
google-apis-core (>= 0.4, < 2.a)
google-apis-drive_v3 (0.19.0)
google-apis-core (>= 0.4, < 2.a)
google-apis-generator (0.4.1)
activesupport (>= 5.0)
gems (~> 1.2)
google-apis-core (>= 0.4, < 2.a)
google-apis-discovery_v1 (~> 0.5)
thor (>= 0.20, < 2.a)
google-apis-sheets_v4 (0.12.0)
google-apis-core (>= 0.4, < 2.a)
google_drive (3.0.7)
google-apis-drive_v3 (>= 0.5.0, < 1.0.0)
google-apis-sheets_v4 (>= 0.4.0, < 1.0.0)
googleauth (>= 0.5.0, < 1.0.0)
nokogiri (>= 1.5.3, < 2.0.0)
googleauth (0.6.6)
faraday (~> 0.12)
googleauth (0.17.1)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.4, < 3.0)
memoist (~> 0.12)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (~> 0.7)
signet (~> 0.15)
haml (5.1.2)
temple (>= 0.8.0)
tilt
Expand Down Expand Up @@ -390,7 +405,7 @@ GEM
signet
tinymce-rails (~> 4.1)
valkyrie (~> 1.6)
i18n (1.7.1)
i18n (1.10.0)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
iiif-image-api (0.1.0)
Expand All @@ -401,7 +416,7 @@ GEM
io-like (0.3.0)
jbuilder (2.9.1)
activesupport (>= 4.2.0)
jmespath (1.4.0)
jmespath (1.6.1)
jquery-datatables-rails (3.4.0)
actionpack (>= 3.1)
jquery-rails
Expand All @@ -413,7 +428,7 @@ GEM
thor (>= 0.14, < 2.0)
jquery-ui-rails (6.0.1)
railties (>= 3.2.16)
json (2.3.0)
json (2.6.1)
json-canonicalization (0.2.0)
json-ld (3.1.0)
htmlentities (~> 4.3)
Expand All @@ -427,7 +442,7 @@ GEM
rdf (~> 3.1)
json-schema (2.8.1)
addressable (>= 2.4)
jwt (2.2.1)
jwt (2.3.0)
kaminari (1.1.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.1.1)
Expand Down Expand Up @@ -490,7 +505,7 @@ GEM
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.4.0)
loofah (2.15.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
Expand All @@ -501,56 +516,61 @@ GEM
marcel (0.3.3)
mimemagic (~> 0.3.2)
memoist (0.16.2)
method_source (0.9.2)
method_source (1.0.0)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.1009)
mimemagic (0.3.3)
mimemagic (0.3.10)
nokogiri (~> 1)
rake
mini_magick (4.10.1)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.13.0)
mini_mime (1.1.2)
mini_portile2 (2.8.0)
minitest (5.15.0)
msgpack (1.3.1)
multi_json (1.14.1)
multi_json (1.15.0)
multi_xml (0.6.0)
multipart-post (2.1.1)
nest (3.2.0)
redic
net-http-persistent (3.1.0)
connection_pool (~> 2.2)
nio4r (2.5.2)
nio4r (2.5.8)
noid (0.9.0)
noid-rails (3.0.1)
actionpack (>= 5.0.0, < 6)
noid (~> 0.9)
nokogiri (1.10.8)
mini_portile2 (~> 2.4.0)
nokogiri (1.13.3)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
nokogumbo (2.0.2)
nokogiri (~> 1.8, >= 1.8.4)
oauth (0.5.4)
oauth2 (1.4.2)
faraday (>= 0.8, < 2.0)
oauth2 (1.4.9)
faraday (>= 0.17.3, < 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)
os (1.0.1)
os (1.1.4)
pg (1.2.1)
posix-spawn (0.3.13)
power_converter (0.1.2)
public_suffix (4.0.3)
puma (3.12.4)
public_suffix (4.0.6)
puma (4.3.12)
nio4r (~> 2.0)
qa (3.0.0)
activerecord-import
deprecation
faraday
nokogiri (~> 1.6)
rails (~> 5.0)
rdf
rack (2.0.8)
racc (1.6.0)
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.4.1)
Expand All @@ -569,7 +589,7 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
rails-html-sanitizer (1.4.2)
loofah (~> 2.3)
rails_autolink (1.1.6)
rails (> 3.1)
Expand All @@ -579,7 +599,7 @@ GEM
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (13.0.1)
rake (13.0.6)
rb-fsevent (0.10.3)
rb-inotify (0.10.1)
ffi (~> 1.0)
Expand Down Expand Up @@ -662,6 +682,7 @@ GEM
actionpack (>= 5.0)
railties (>= 5.0)
retriable (3.1.2)
rexml (3.2.5)
riiif (2.2.0)
deprecation (>= 1.0.0)
iiif-image-api (~> 0.1.0)
Expand Down Expand Up @@ -722,9 +743,9 @@ GEM
rdf-xsd (~> 3.1)
sparql (~> 3.1)
sxp (~> 1.1)
signet (0.12.0)
addressable (~> 2.3)
faraday (~> 0.9)
signet (0.16.1)
addressable (~> 2.8)
faraday (>= 0.17.5, < 3.0)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simple_form (5.0.1)
Expand Down Expand Up @@ -758,9 +779,9 @@ GEM
babel-source (>= 5.8.11)
babel-transpiler
sprockets (>= 3.0.0)
sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets-rails (3.4.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sqlite3 (1.3.13)
sxp (1.1.0)
Expand All @@ -778,9 +799,9 @@ GEM
actionpack (>= 3.1)
jquery-rails
railties (>= 3.1)
typhoeus (1.3.1)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.6)
tzinfo (1.2.9)
thread_safe (~> 0.1)
uber (0.1.0)
uglifier (4.2.0)
Expand Down Expand Up @@ -808,9 +829,10 @@ GEM
activemodel (>= 5.0)
bindex (>= 0.4.0)
railties (>= 5.0)
websocket-driver (0.7.1)
webrick (1.7.0)
websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4)
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)

Expand All @@ -831,7 +853,7 @@ DEPENDENCIES
jbuilder (~> 2.5)
jquery-rails
listen (>= 3.0.5, < 3.2)
puma (~> 3.12)
puma (~> 4.3)
rails (~> 5.2.3)
riiif (~> 2.1)
rspec-rails
Expand Down