Skip to content

Commit 67a875c

Browse files
authored
Merge pull request #934 from tdiary/update_bundles
update bundles
2 parents 8b5c101 + d6d42b0 commit 67a875c

File tree

2 files changed

+42
-37
lines changed

2 files changed

+42
-37
lines changed

Gemfile.lock

+18-16
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,16 @@ GEM
2020
tins (~> 1.6)
2121
debase (0.2.4.1)
2222
debase-ruby_core_source (>= 0.10.2)
23-
debase-ruby_core_source (0.10.11)
23+
debase-ruby_core_source (0.10.12)
2424
diff-lcs (1.4.4)
25-
docile (1.3.2)
25+
docile (1.3.5)
2626
emot (0.0.4)
2727
thor
28-
faraday (0.17.3)
28+
faraday (1.3.0)
29+
faraday-net_http (~> 1.0)
2930
multipart-post (>= 1.2, < 3)
31+
ruby2_keywords
32+
faraday-net_http (1.0.1)
3033
fastimage (2.2.2)
3134
hikidoc (0.1.0)
3235
jasmine (2.99.0)
@@ -35,19 +38,17 @@ GEM
3538
rack (>= 1.2.1)
3639
rake
3740
jasmine-core (2.99.2)
38-
json (2.3.1)
41+
json (2.5.1)
3942
launchy (2.5.0)
4043
addressable (~> 2.7)
4144
mail (2.7.1)
4245
mini_mime (>= 0.1.1)
4346
mime-types (3.3.1)
4447
mime-types-data (~> 3.2015)
45-
mime-types-data (3.2020.1104)
48+
mime-types-data (3.2021.0225)
4649
mini_mime (1.0.2)
47-
mini_portile2 (2.5.0)
4850
multipart-post (2.1.1)
49-
nokogiri (1.11.1)
50-
mini_portile2 (~> 2.5.0)
51+
nokogiri (1.11.1-x86_64-linux)
5152
racc (~> 1.4)
5253
octokit (4.20.0)
5354
faraday (>= 0.9)
@@ -65,23 +66,24 @@ GEM
6566
rack-test (>= 0.5)
6667
rake (13.0.3)
6768
redcarpet (3.5.1)
68-
regexp_parser (2.0.3)
69+
regexp_parser (2.1.1)
6970
rexml (3.2.4)
7071
rspec (3.10.0)
7172
rspec-core (~> 3.10.0)
7273
rspec-expectations (~> 3.10.0)
7374
rspec-mocks (~> 3.10.0)
74-
rspec-core (3.10.0)
75+
rspec-core (3.10.1)
7576
rspec-support (~> 3.10.0)
76-
rspec-expectations (3.10.0)
77+
rspec-expectations (3.10.1)
7778
diff-lcs (>= 1.2.0, < 2.0)
7879
rspec-support (~> 3.10.0)
79-
rspec-mocks (3.10.0)
80+
rspec-mocks (3.10.2)
8081
diff-lcs (>= 1.2.0, < 2.0)
8182
rspec-support (~> 3.10.0)
82-
rspec-support (3.10.0)
83+
rspec-support (3.10.2)
8384
ruby-debug-ide (0.7.2)
8485
rake (>= 0.8.1)
86+
ruby2_keywords (0.0.4)
8587
rubyzip (2.3.0)
8688
sawyer (0.8.2)
8789
addressable (>= 2.3.5)
@@ -102,14 +104,14 @@ GEM
102104
test-unit (3.4.0)
103105
power_assert
104106
thor (1.1.0)
105-
tins (1.26.0)
107+
tins (1.28.0)
106108
sync
107109
webrick (1.7.0)
108110
xpath (3.2.0)
109111
nokogiri (~> 1.8)
110112

111113
PLATFORMS
112-
ruby
114+
x86_64-linux
113115

114116
DEPENDENCIES
115117
capybara
@@ -139,4 +141,4 @@ DEPENDENCIES
139141
webrick
140142

141143
BUNDLED WITH
142-
2.1.4
144+
2.2.5

misc/paas/heroku/Gemfile.lock

+24-21
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GIT
22
remote: https://github.com/tdiary/tdiary-contrib.git
3-
revision: 11b02f55e1a67a93c117468b7527cb4fd0cab90b
3+
revision: da0e917590efbd3a2aa4d29e27546b8f33d11a99
44
specs:
55
tdiary-contrib (5.1.4)
66
coderay
@@ -20,17 +20,17 @@ GIT
2020
GEM
2121
remote: https://rubygems.org/
2222
specs:
23-
activemodel (6.0.3.4)
24-
activesupport (= 6.0.3.4)
25-
activesupport (6.0.3.4)
23+
activemodel (6.1.3)
24+
activesupport (= 6.1.3)
25+
activesupport (6.1.3)
2626
concurrent-ruby (~> 1.0, >= 1.0.2)
27-
i18n (>= 0.7, < 2)
28-
minitest (~> 5.1)
29-
tzinfo (~> 1.1)
30-
zeitwerk (~> 2.2, >= 2.2.2)
27+
i18n (>= 1.6, < 2)
28+
minitest (>= 5.1)
29+
tzinfo (~> 2.0)
30+
zeitwerk (~> 2.3)
3131
addressable (2.7.0)
3232
public_suffix (>= 2.0.2, < 5.0)
33-
bson (4.11.1)
33+
bson (4.12.0)
3434
capybara (3.35.3)
3535
addressable
3636
mini_mime (>= 0.1.3)
@@ -41,7 +41,7 @@ GEM
4141
xpath (~> 3.2)
4242
childprocess (3.0.0)
4343
coderay (1.1.3)
44-
commonmarker (0.21.1)
44+
commonmarker (0.21.2)
4545
ruby-enum (~> 0.5)
4646
concurrent-ruby (1.1.8)
4747
coveralls (0.8.23)
@@ -58,12 +58,12 @@ GEM
5858
docile (1.3.5)
5959
emot (0.0.4)
6060
thor
61-
faraday (0.17.3)
61+
faraday (0.17.4)
6262
multipart-post (>= 1.2, < 3)
6363
fastimage (2.2.2)
6464
hashie (4.1.0)
6565
hikidoc (0.1.0)
66-
i18n (1.8.8)
66+
i18n (1.8.9)
6767
concurrent-ruby (~> 1.0)
6868
idn-ruby (0.1.0)
6969
jasmine (2.99.0)
@@ -80,14 +80,14 @@ GEM
8080
memcachier (0.0.2)
8181
mime-types (3.3.1)
8282
mime-types-data (~> 3.2015)
83-
mime-types-data (3.2020.1104)
83+
mime-types-data (3.2021.0225)
8484
mini_mime (1.0.2)
8585
mini_portile2 (2.5.0)
86-
minitest (5.14.3)
86+
minitest (5.14.4)
8787
mongo (2.8.0)
8888
bson (>= 4.4.2, < 5.0.0)
89-
mongoid (7.1.6)
90-
activemodel (>= 5.1, < 6.1)
89+
mongoid (7.1.7)
90+
activemodel (>= 5.1, < 6.2)
9191
mongo (>= 2.7.0, < 3.0.0)
9292
multipart-post (2.1.1)
9393
nio4r (2.5.5)
@@ -98,7 +98,7 @@ GEM
9898
octokit (4.20.0)
9999
faraday (>= 0.9)
100100
sawyer (~> 0.8.0, >= 0.5.3)
101-
omniauth (2.0.2)
101+
omniauth (2.0.3)
102102
hashie (>= 3.4.6)
103103
rack (>= 1.6.2, < 3)
104104
rack-protection
@@ -129,7 +129,8 @@ GEM
129129
rake (13.0.3)
130130
rdtool (0.6.38)
131131
redcarpet (3.5.1)
132-
regexp_parser (2.0.3)
132+
regexp_parser (2.1.1)
133+
rexml (3.2.4)
133134
rspec (3.10.0)
134135
rspec-core (~> 3.10.0)
135136
rspec-expectations (~> 3.10.0)
@@ -182,17 +183,17 @@ GEM
182183
test-unit (3.4.0)
183184
power_assert
184185
thor (1.1.0)
185-
thread_safe (0.3.6)
186186
tins (1.28.0)
187187
sync
188188
twitter-text (3.1.0)
189189
idn-ruby
190190
unf (~> 0.1.0)
191-
tzinfo (1.2.9)
192-
thread_safe (~> 0.1)
191+
tzinfo (2.0.4)
192+
concurrent-ruby (~> 1.0)
193193
unf (0.1.4)
194194
unf_ext
195195
unf_ext (0.0.7.7)
196+
webrick (1.7.0)
196197
xpath (3.2.0)
197198
nokogiri (~> 1.8)
198199
zeitwerk (2.4.2)
@@ -222,6 +223,7 @@ DEPENDENCIES
222223
racksh
223224
rake
224225
redcarpet
226+
rexml
225227
rspec
226228
ruby-debug-ide
227229
selenium-webdriver
@@ -233,6 +235,7 @@ DEPENDENCIES
233235
tdiary-style-gfm
234236
tdiary-style-rd
235237
test-unit
238+
webrick
236239

237240
RUBY VERSION
238241
ruby 2.7.2p137

0 commit comments

Comments
 (0)