Skip to content

Commit f741e9b

Browse files
sensei100sensei100
authored
Merge pull request #101 from tulibraries/Update_carrierwave
Update Blimp and Carrierwave gems
2 parents c36ca4a + 1816bb5 commit f741e9b

File tree

2 files changed

+64
-67
lines changed

2 files changed

+64
-67
lines changed

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ gem "rsolr", ">= 1.0", "< 3"
7777
gem "bootstrap", "~> 4.0"
7878
gem "twitter-typeahead-rails", "0.11.1.pre.corejavascript"
7979
gem "jquery-rails"
80-
gem "carrierwave", "~> 2.1.1"
80+
gem "carrierwave", "~> 3.0.6"
8181
gem "devise", "~> 4.7", ">= 4.7.1"
8282
gem "devise-guests"
8383
gem "blimp", github: "tulibraries/blimp"

‎Gemfile.lock‎

Lines changed: 63 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,69 @@
1-
PATH
2-
remote: vendor/blimp
1+
GIT
2+
remote: https://github.com/tulibraries/blimp.git
3+
revision: 60d9842c7056ed770f1f07e771a5532c7b5a1463
34
specs:
45
blimp (0.3.7)
5-
carrierwave (= 2.1.1)
6-
rails (= 6.1.7.6)
6+
carrierwave (= 3.0.6)
7+
rails (= 6.1.7.7)
78
ruby-progressbar (= 1.10.1)
89

910
GEM
1011
remote: https://rubygems.org/
1112
specs:
12-
actioncable (6.1.7.6)
13-
actionpack (= 6.1.7.6)
14-
activesupport (= 6.1.7.6)
13+
actioncable (6.1.7.7)
14+
actionpack (= 6.1.7.7)
15+
activesupport (= 6.1.7.7)
1516
nio4r (~> 2.0)
1617
websocket-driver (>= 0.6.1)
17-
actionmailbox (6.1.7.6)
18-
actionpack (= 6.1.7.6)
19-
activejob (= 6.1.7.6)
20-
activerecord (= 6.1.7.6)
21-
activestorage (= 6.1.7.6)
22-
activesupport (= 6.1.7.6)
18+
actionmailbox (6.1.7.7)
19+
actionpack (= 6.1.7.7)
20+
activejob (= 6.1.7.7)
21+
activerecord (= 6.1.7.7)
22+
activestorage (= 6.1.7.7)
23+
activesupport (= 6.1.7.7)
2324
mail (>= 2.7.1)
24-
actionmailer (6.1.7.6)
25-
actionpack (= 6.1.7.6)
26-
actionview (= 6.1.7.6)
27-
activejob (= 6.1.7.6)
28-
activesupport (= 6.1.7.6)
25+
actionmailer (6.1.7.7)
26+
actionpack (= 6.1.7.7)
27+
actionview (= 6.1.7.7)
28+
activejob (= 6.1.7.7)
29+
activesupport (= 6.1.7.7)
2930
mail (~> 2.5, >= 2.5.4)
3031
rails-dom-testing (~> 2.0)
31-
actionpack (6.1.7.6)
32-
actionview (= 6.1.7.6)
33-
activesupport (= 6.1.7.6)
32+
actionpack (6.1.7.7)
33+
actionview (= 6.1.7.7)
34+
activesupport (= 6.1.7.7)
3435
rack (~> 2.0, >= 2.0.9)
3536
rack-test (>= 0.6.3)
3637
rails-dom-testing (~> 2.0)
3738
rails-html-sanitizer (~> 1.0, >= 1.2.0)
38-
actiontext (6.1.7.6)
39-
actionpack (= 6.1.7.6)
40-
activerecord (= 6.1.7.6)
41-
activestorage (= 6.1.7.6)
42-
activesupport (= 6.1.7.6)
39+
actiontext (6.1.7.7)
40+
actionpack (= 6.1.7.7)
41+
activerecord (= 6.1.7.7)
42+
activestorage (= 6.1.7.7)
43+
activesupport (= 6.1.7.7)
4344
nokogiri (>= 1.8.5)
44-
actionview (6.1.7.6)
45-
activesupport (= 6.1.7.6)
45+
actionview (6.1.7.7)
46+
activesupport (= 6.1.7.7)
4647
builder (~> 3.1)
4748
erubi (~> 1.4)
4849
rails-dom-testing (~> 2.0)
4950
rails-html-sanitizer (~> 1.1, >= 1.2.0)
50-
activejob (6.1.7.6)
51-
activesupport (= 6.1.7.6)
51+
activejob (6.1.7.7)
52+
activesupport (= 6.1.7.7)
5253
globalid (>= 0.3.6)
53-
activemodel (6.1.7.6)
54-
activesupport (= 6.1.7.6)
55-
activerecord (6.1.7.6)
56-
activemodel (= 6.1.7.6)
57-
activesupport (= 6.1.7.6)
58-
activestorage (6.1.7.6)
59-
actionpack (= 6.1.7.6)
60-
activejob (= 6.1.7.6)
61-
activerecord (= 6.1.7.6)
62-
activesupport (= 6.1.7.6)
54+
activemodel (6.1.7.7)
55+
activesupport (= 6.1.7.7)
56+
activerecord (6.1.7.7)
57+
activemodel (= 6.1.7.7)
58+
activesupport (= 6.1.7.7)
59+
activestorage (6.1.7.7)
60+
actionpack (= 6.1.7.7)
61+
activejob (= 6.1.7.7)
62+
activerecord (= 6.1.7.7)
63+
activesupport (= 6.1.7.7)
6364
marcel (~> 1.0)
6465
mini_mime (>= 1.1.0)
65-
activesupport (6.1.7.6)
66+
activesupport (6.1.7.7)
6667
concurrent-ruby (~> 1.0, >= 1.0.2)
6768
i18n (>= 1.6, < 2)
6869
minitest (>= 5.1)
@@ -106,13 +107,12 @@ GEM
106107
rack-test (>= 0.6.3)
107108
regexp_parser (>= 1.5, < 3.0)
108109
xpath (~> 3.2)
109-
carrierwave (2.1.1)
110-
activemodel (>= 5.0.0)
111-
activesupport (>= 5.0.0)
110+
carrierwave (3.0.6)
111+
activemodel (>= 6.0.0)
112+
activesupport (>= 6.0.0)
112113
addressable (~> 2.6)
113114
image_processing (~> 1.1)
114-
mimemagic (>= 0.3.0)
115-
mini_mime (>= 0.1.3)
115+
marcel (~> 1.0.0)
116116
ssrf_filter (~> 1.0)
117117
coderay (1.1.3)
118118
coffee-rails (4.2.2)
@@ -209,9 +209,6 @@ GEM
209209
marcel (1.0.4)
210210
matrix (0.4.2)
211211
method_source (1.0.0)
212-
mimemagic (0.4.3)
213-
nokogiri (~> 1)
214-
rake
215212
mini_magick (4.12.0)
216213
mini_mime (1.1.5)
217214
minitar (0.9)
@@ -250,20 +247,20 @@ GEM
250247
rack (2.2.8.1)
251248
rack-test (2.1.0)
252249
rack (>= 1.3)
253-
rails (6.1.7.6)
254-
actioncable (= 6.1.7.6)
255-
actionmailbox (= 6.1.7.6)
256-
actionmailer (= 6.1.7.6)
257-
actionpack (= 6.1.7.6)
258-
actiontext (= 6.1.7.6)
259-
actionview (= 6.1.7.6)
260-
activejob (= 6.1.7.6)
261-
activemodel (= 6.1.7.6)
262-
activerecord (= 6.1.7.6)
263-
activestorage (= 6.1.7.6)
264-
activesupport (= 6.1.7.6)
250+
rails (6.1.7.7)
251+
actioncable (= 6.1.7.7)
252+
actionmailbox (= 6.1.7.7)
253+
actionmailer (= 6.1.7.7)
254+
actionpack (= 6.1.7.7)
255+
actiontext (= 6.1.7.7)
256+
actionview (= 6.1.7.7)
257+
activejob (= 6.1.7.7)
258+
activemodel (= 6.1.7.7)
259+
activerecord (= 6.1.7.7)
260+
activestorage (= 6.1.7.7)
261+
activesupport (= 6.1.7.7)
265262
bundler (>= 1.15.0)
266-
railties (= 6.1.7.6)
263+
railties (= 6.1.7.7)
267264
sprockets-rails (>= 2.0.0)
268265
rails-dom-testing (2.2.0)
269266
activesupport (>= 5.0.0)
@@ -272,9 +269,9 @@ GEM
272269
rails-html-sanitizer (1.6.0)
273270
loofah (~> 2.21)
274271
nokogiri (~> 1.14)
275-
railties (6.1.7.6)
276-
actionpack (= 6.1.7.6)
277-
activesupport (= 6.1.7.6)
272+
railties (6.1.7.7)
273+
actionpack (= 6.1.7.7)
274+
activesupport (= 6.1.7.7)
278275
method_source
279276
rake (>= 12.2)
280277
thor (~> 1.0)
@@ -421,7 +418,7 @@ DEPENDENCIES
421418
brakeman
422419
byebug
423420
capybara (>= 3.36)
424-
carrierwave (~> 2.1.1)
421+
carrierwave (~> 3.0.6)
425422
coffee-rails (~> 4.2)
426423
devise (~> 4.7, >= 4.7.1)
427424
devise-guests

0 commit comments

Comments
 (0)