Skip to content

Commit d0aca86

Browse files
authored
Merge pull request #542 from tansengming/feature/bundle-update
bundle update
2 parents fc7b7d8 + 28357bc commit d0aca86

File tree

1 file changed

+94
-100
lines changed

1 file changed

+94
-100
lines changed

Gemfile.lock

Lines changed: 94 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GIT
22
remote: https://github.com/tansengming/stripe-subscribe.git
3-
revision: 5ac382da4efec8dc637571966e7305685b2edf71
3+
revision: 089430e7b5f4853d97af49ceac1cf1153ea0fbdc
44
specs:
55
stripe-subscribe (0.1.0)
66
devise
@@ -32,17 +32,15 @@ GEM
3232
erubi (~> 1.4)
3333
rails-dom-testing (~> 2.0)
3434
rails-html-sanitizer (~> 1.0, >= 1.0.3)
35-
activeadmin (2.6.1)
35+
activeadmin (2.9.0)
3636
arbre (~> 1.2, >= 1.2.1)
37-
formtastic (~> 3.1)
37+
formtastic (>= 3.1, < 5.0)
3838
formtastic_i18n (~> 0.4)
3939
inherited_resources (~> 1.7)
4040
jquery-rails (~> 4.2)
41-
kaminari (~> 1.0, >= 1.0.1)
42-
railties (>= 5.2, < 6.1)
41+
kaminari (~> 1.0, >= 1.2.1)
42+
railties (>= 5.2, < 6.2)
4343
ransack (~> 2.1, >= 2.1.1)
44-
sassc-rails (~> 2.1)
45-
sprockets (>= 3.0, < 4.1)
4644
activejob (5.2.4.4)
4745
activesupport (= 5.2.4.4)
4846
globalid (>= 0.3.6)
@@ -64,22 +62,23 @@ GEM
6462
addressable (2.7.0)
6563
public_suffix (>= 2.0.2, < 5.0)
6664
analytics-ruby (2.2.8)
67-
arbre (1.2.1)
68-
activesupport (>= 3.0.0)
65+
arbre (1.4.0)
66+
activesupport (>= 3.0.0, < 6.2)
67+
ruby2_keywords (>= 0.0.2, < 1.0)
6968
arel (9.0.0)
70-
autoprefixer-rails (9.7.3)
69+
autoprefixer-rails (10.1.0.0)
7170
execjs
7271
awesome_print (1.8.0)
73-
bcrypt (3.1.13)
74-
bindex (0.5.0)
75-
bootsnap (1.4.6)
72+
bcrypt (3.1.16)
73+
bindex (0.8.1)
74+
bootsnap (1.5.1)
7675
msgpack (~> 1.0)
77-
bootstrap (4.4.1)
76+
bootstrap (4.5.3)
7877
autoprefixer-rails (>= 9.1.0)
7978
popper_js (>= 1.14.3, < 2)
8079
sassc-rails (>= 2.0.0)
8180
builder (3.2.4)
82-
capybara (3.32.0)
81+
capybara (3.34.0)
8382
addressable
8483
mini_mime (>= 0.1.3)
8584
nokogiri (~> 1.8)
@@ -100,41 +99,41 @@ GEM
10099
coffee-script-source (1.12.2)
101100
concurrent-ruby (1.1.7)
102101
configatron (4.5.1)
103-
connection_pool (2.2.2)
104-
crack (0.4.3)
105-
safe_yaml (~> 1.0.0)
102+
connection_pool (2.2.3)
103+
crack (0.4.5)
104+
rexml
106105
crass (1.0.6)
107106
dante (0.2.0)
108-
devise (4.7.1)
107+
devise (4.7.3)
109108
bcrypt (~> 3.0)
110109
orm_adapter (~> 0.1)
111110
railties (>= 4.1.0)
112111
responders
113112
warden (~> 1.2.3)
114113
devise-bootstrap-views (1.1.0)
115-
diff-lcs (1.3)
116-
docile (1.3.2)
117-
dotenv (2.7.5)
118-
dotenv-rails (2.7.5)
119-
dotenv (= 2.7.5)
120-
railties (>= 3.2, < 6.1)
114+
diff-lcs (1.4.4)
115+
docile (1.3.4)
116+
dotenv (2.7.6)
117+
dotenv-rails (2.7.6)
118+
dotenv (= 2.7.6)
119+
railties (>= 3.2)
121120
erubi (1.10.0)
122121
erubis (2.7.0)
123122
execjs (2.7.0)
124-
factory_bot (5.1.1)
125-
activesupport (>= 4.2.0)
126-
factory_bot_rails (5.1.1)
127-
factory_bot (~> 5.1.0)
128-
railties (>= 4.2.0)
129-
faker (2.11.0)
123+
factory_bot (6.1.0)
124+
activesupport (>= 5.0.0)
125+
factory_bot_rails (6.1.0)
126+
factory_bot (~> 6.1.0)
127+
railties (>= 5.0.0)
128+
faker (2.15.1)
130129
i18n (>= 1.6, < 2)
131-
ffi (1.12.2)
130+
ffi (1.14.2)
132131
formtastic (3.1.5)
133132
actionpack (>= 3.2.13)
134133
formtastic_i18n (0.6.0)
135134
globalid (0.4.2)
136135
activesupport (>= 4.2.0)
137-
haml (5.1.0)
136+
haml (5.2.1)
138137
temple (>= 0.8.0)
139138
tilt
140139
haml-rails (2.0.1)
@@ -154,16 +153,15 @@ GEM
154153
ruby_parser (~> 3.5)
155154
i18n (1.8.5)
156155
concurrent-ruby (~> 1.0)
157-
inherited_resources (1.11.0)
158-
actionpack (>= 5.0, < 6.1)
156+
inherited_resources (1.12.0)
157+
actionpack (>= 5.2, < 6.2)
159158
has_scope (~> 0.6)
160-
railties (>= 5.0, < 6.1)
159+
railties (>= 5.2, < 6.2)
161160
responders (>= 2, < 4)
162-
jquery-rails (4.3.5)
161+
jquery-rails (4.4.0)
163162
rails-dom-testing (>= 1, < 3)
164163
railties (>= 4.2.0)
165164
thor (>= 0.14, < 2.0)
166-
json (2.3.0)
167165
kaminari (1.2.1)
168166
activesupport (>= 4.1.0)
169167
kaminari-actionview (= 1.2.1)
@@ -177,7 +175,7 @@ GEM
177175
kaminari-core (= 1.2.1)
178176
kaminari-core (1.2.1)
179177
libv8 (8.4.255.0)
180-
listen (3.2.1)
178+
listen (3.4.0)
181179
rb-fsevent (~> 0.10, >= 0.10.3)
182180
rb-inotify (~> 0.9, >= 0.9.10)
183181
lodash-rails (4.17.15)
@@ -200,27 +198,23 @@ GEM
200198
libv8 (~> 8.4.255)
201199
minitest (5.14.2)
202200
msgpack (1.3.3)
203-
multi_json (1.14.1)
201+
multi_json (1.15.0)
204202
nio4r (2.5.4)
205203
nokogiri (1.10.10)
206204
mini_portile2 (~> 2.4.0)
207205
orm_adapter (0.5.0)
208206
pg (1.2.3)
209-
polyamorous (2.3.2)
210-
activerecord (>= 5.2.1)
211-
popper_js (1.14.5)
212-
public_suffix (4.0.3)
213-
puma (5.0.4)
207+
popper_js (1.16.0)
208+
public_suffix (4.0.6)
209+
puma (5.1.1)
214210
nio4r (~> 2.0)
215211
pundit (2.1.0)
216212
activesupport (>= 3.0.0)
217213
rack (2.2.3)
218-
rack-attack (6.2.2)
214+
rack-attack (6.3.1)
219215
rack (>= 1.0, < 3)
220-
rack-contrib (2.1.0)
216+
rack-contrib (2.3.0)
221217
rack (~> 2.0)
222-
rack-protection (2.0.8.1)
223-
rack
224218
rack-test (1.1.0)
225219
rack (>= 1.0, < 3)
226220
rails (5.2.4.4)
@@ -247,66 +241,66 @@ GEM
247241
method_source
248242
rake (>= 0.8.7)
249243
thor (>= 0.19.0, < 2.0)
250-
rake (13.0.1)
251-
ransack (2.3.2)
252-
activerecord (>= 5.2.1)
253-
activesupport (>= 5.2.1)
244+
rake (13.0.3)
245+
ransack (2.4.1)
246+
activerecord (>= 5.2.4)
247+
activesupport (>= 5.2.4)
254248
i18n
255-
polyamorous (= 2.3.2)
256-
rb-fsevent (0.10.3)
257-
rb-inotify (0.10.0)
249+
rb-fsevent (0.10.4)
250+
rb-inotify (0.10.1)
258251
ffi (~> 1.0)
259-
redis (4.1.3)
260-
redis-actionpack (5.0.2)
261-
actionpack (>= 4.0, < 6)
262-
redis-rack (>= 1, < 3)
252+
redis (4.2.5)
253+
redis-actionpack (5.2.0)
254+
actionpack (>= 5, < 7)
255+
redis-rack (>= 2.1.0, < 3)
263256
redis-store (>= 1.1.0, < 2)
264-
redis-activesupport (5.0.7)
265-
activesupport (>= 3, < 6)
257+
redis-activesupport (5.2.0)
258+
activesupport (>= 3, < 7)
266259
redis-store (>= 1.3, < 2)
267-
redis-rack (2.0.4)
268-
rack (>= 1.5, < 3)
260+
redis-rack (2.1.3)
261+
rack (>= 2.0.8, < 3)
269262
redis-store (>= 1.2, < 2)
270263
redis-rails (5.0.2)
271264
redis-actionpack (>= 5.0, < 6)
272265
redis-activesupport (>= 5.0, < 6)
273266
redis-store (>= 1.2, < 2)
274-
redis-store (1.5.0)
275-
redis (>= 2.2, < 5)
276-
regexp_parser (1.7.0)
267+
redis-store (1.9.0)
268+
redis (>= 4, < 5)
269+
regexp_parser (1.8.2)
277270
responders (3.0.1)
278271
actionpack (>= 5.0)
279272
railties (>= 5.0)
280-
rollbar (2.24.0)
281-
rspec-core (3.9.1)
282-
rspec-support (~> 3.9.1)
283-
rspec-expectations (3.9.1)
273+
rexml (3.2.4)
274+
rollbar (3.1.1)
275+
rspec-core (3.10.1)
276+
rspec-support (~> 3.10.0)
277+
rspec-expectations (3.10.1)
284278
diff-lcs (>= 1.2.0, < 2.0)
285-
rspec-support (~> 3.9.0)
279+
rspec-support (~> 3.10.0)
286280
rspec-its (1.3.0)
287281
rspec-core (>= 3.0.0)
288282
rspec-expectations (>= 3.0.0)
289-
rspec-mocks (3.9.1)
283+
rspec-mocks (3.10.1)
290284
diff-lcs (>= 1.2.0, < 2.0)
291-
rspec-support (~> 3.9.0)
292-
rspec-rails (4.0.0)
285+
rspec-support (~> 3.10.0)
286+
rspec-rails (4.0.2)
293287
actionpack (>= 4.2)
294288
activesupport (>= 4.2)
295289
railties (>= 4.2)
296-
rspec-core (~> 3.9)
297-
rspec-expectations (~> 3.9)
298-
rspec-mocks (~> 3.9)
299-
rspec-support (~> 3.9)
290+
rspec-core (~> 3.10)
291+
rspec-expectations (~> 3.10)
292+
rspec-mocks (~> 3.10)
293+
rspec-support (~> 3.10)
300294
rspec-retry (0.6.2)
301295
rspec-core (> 3.3)
302-
rspec-support (3.9.2)
296+
rspec-support (3.10.1)
303297
rspec_junit_formatter (0.4.1)
304298
rspec-core (>= 2, < 4, != 2.12.0)
305-
ruby_parser (3.13.1)
299+
ruby2_keywords (0.0.2)
300+
ruby_parser (3.15.0)
306301
sexp_processor (~> 4.9)
307-
rubyzip (2.0.0)
308-
safe_yaml (1.0.5)
309-
sassc (2.2.1)
302+
rubyzip (2.3.0)
303+
sassc (2.4.0)
310304
ffi (~> 1.9)
311305
sassc-rails (2.1.2)
312306
railties (>= 4.0.0)
@@ -317,22 +311,22 @@ GEM
317311
selenium-webdriver (3.142.7)
318312
childprocess (>= 0.5, < 4.0)
319313
rubyzip (>= 1.2.2)
320-
send_with_us (4.2.0)
314+
send_with_us (4.2.1)
321315
sendwithus_ruby_action_mailer (1.0.0)
322316
actionpack
323317
activejob
324318
send_with_us (>= 1.9.0)
325-
sexp_processor (4.12.0)
326-
sidekiq (6.0.6)
319+
sexp_processor (4.15.1)
320+
sidekiq (6.1.2)
327321
connection_pool (>= 2.2.2)
328322
rack (~> 2.0)
329-
rack-protection (>= 2.0.0)
330-
redis (>= 4.1.0)
331-
simplecov (0.17.1)
323+
redis (>= 4.2.0)
324+
simplecov (0.20.0)
332325
docile (~> 1.1)
333-
json (>= 1.8, < 3)
334-
simplecov-html (~> 0.10.0)
335-
simplecov-html (0.10.2)
326+
simplecov-html (~> 0.11)
327+
simplecov_json_formatter (~> 0.1)
328+
simplecov-html (0.12.3)
329+
simplecov_json_formatter (0.1.2)
336330
sprockets (3.7.2)
337331
concurrent-ruby (~> 1.0)
338332
rack (> 1, < 3)
@@ -341,7 +335,7 @@ GEM
341335
activesupport (>= 4.0)
342336
sprockets (>= 3.0.0)
343337
stripe (5.28.0)
344-
stripe-rails (2.1.0)
338+
stripe-rails (2.2.1)
345339
rails (>= 5.1)
346340
responders
347341
stripe (>= 3.15.0)
@@ -351,29 +345,29 @@ GEM
351345
stripe (> 5, < 6)
352346
tapp (1.5.1)
353347
thor
354-
temple (0.8.1)
348+
temple (0.8.2)
355349
thor (1.0.1)
356350
thread_safe (0.3.6)
357351
tilt (2.0.10)
358352
turbolinks (5.2.1)
359353
turbolinks-source (~> 5.2)
360354
turbolinks-source (5.2.0)
361-
tzinfo (1.2.8)
355+
tzinfo (1.2.9)
362356
thread_safe (~> 0.1)
363357
uglifier (4.2.0)
364358
execjs (>= 0.3.0, < 3)
365-
warden (1.2.8)
366-
rack (>= 2.0.6)
359+
warden (1.2.9)
360+
rack (>= 2.0.9)
367361
web-console (3.7.0)
368362
actionview (>= 5.0)
369363
activemodel (>= 5.0)
370364
bindex (>= 0.4.0)
371365
railties (>= 5.0)
372-
webdrivers (4.2.0)
366+
webdrivers (4.4.2)
373367
nokogiri (~> 1.6)
374368
rubyzip (>= 1.3.0)
375369
selenium-webdriver (>= 3.0, < 4.0)
376-
webmock (3.8.3)
370+
webmock (3.11.0)
377371
addressable (>= 2.3.6)
378372
crack (>= 0.3.2)
379373
hashdiff (>= 0.4.0, < 2.0.0)

0 commit comments

Comments
 (0)