8000 Merge pull request #158 from activeadmin/dependabot/bundler/kaminari-… · activeadmin/activeadmin-mongoid@0d324ec · GitHub
[go: up one dir, main page]

Skip to content

Commit 0d324ec

Browse files
Merge pull request #158 from activeadmin/dependabot/bundler/kaminari-1.2.1
2 parents 5c18846 + 46bc244 commit 0d324ec

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

Gemfile.lock

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ GEM
7777
ast (2.4.0)
7878
bcrypt (3.1.13)
7979
bson (4.7.1)
80-
builder (3.2.3)
80+
builder (3.2.4)
8181
capybara (3.12.0)
8282
addressable
8383
mini_mime (>= 0.1.3)
@@ -88,8 +88,8 @@ GEM
8888
xpath (~> 3.2)
8989
cliver (0.3.2)
9090
coderay (1.1.2)
91-
concurrent-ruby (1.1.5)
92-
crass (1.0.5)
91+
concurrent-ruby (1.1.6)
92+
crass (1.0.6)
9393
devise (4.7.1)
9494
bcrypt (~> 3.0)
9595
orm_adapter (~> 0.1)
@@ -98,7 +98,7 @@ GEM
9898
warden (~> 1.2.3)
9999
diff-lcs (1.3)
100100
docile (1.3.1)
101-
erubi (1.8.0)
101+
erubi (1.9.0)
102102
ffi (1.12.1)
103103
formtastic (3.1.5)
104104
actionpack (>= 3.2.13)
@@ -108,7 +108,7 @@ GEM
108108
has_scope (0.7.2)
109109
actionpack (>= 4.1)
110110
activesupport (>= 4.1)
111-
i18n (1.6.0)
111+
i18n (1.8.2)
112112
concurrent-ruby (~> 1.0)
113113
inherited_resources (1.11.0)
114114
actionpack (>= 5.0, < 6.1)
@@ -125,24 +125,24 @@ GEM
125125
jslint (1.2.0)
126126
json
127127
json (2.1.0)
128-
kaminari (1.1.1)
128+
kaminari (1.2.1)
129129
activesupport (>= 4.1.0)
130-
kaminari-actionview (= 1.1.1)
131-
kaminari-activerecord (= 1.1.1)
132-
kaminari-core (= 1.1.1)
133-
kaminari-actionview (1.1.1)
130+
kaminari-actionview (= 1.2.1)
131+
kaminari-activerecord (= 1.2.1)
132+
kaminari-core (= 1.2.1)
133+
kaminari-actionview (1.2.1)
134134
actionview
135-
kaminari-core (= 1.1.1)
136-
kaminari-activerecord (1.1.1)
135+
kaminari-core (= 1.2.1)
136+
kaminari-activerecord (1.2.1)
137137
activerecord
138-
kaminari-core (= 1.1.1)
139-
kaminari-core (1.1.1)
138+
kaminari-core (= 1.2.1)
139+
kaminari-core (1.2.1)
140140
kaminari-mongoid (1.0.1)
141141
kaminari-core (~> 1.0)
142142
mongoid
143143
launchy (2.4.3)
144144
addressable (~> 2.3)
145-
loofah (2.3.1)
145+
loofah (2.5.0)
146146
crass (~> 1.0.2)
147147
nokogiri (>= 1.5.9)
148148
mail (2.7.1)
@@ -153,14 +153,14 @@ GEM
153153
mimemagic (0.3.3)
154154
mini_mime (1.0.1)
155155
mini_portile2 (2.4.0)
156-
minitest (5.11.3)
156+
minitest (5.14.1)
157157
mongo (2.11.3)
158158
bson (>= 4.4.2, < 5.0.0)
159159
mongoid (7.0.5)
160160
activemodel (>= 5.1, < 6.1)
161161
mongo (>= 2.5.1, < 3.0.0)
162162
nio4r (2.3.1)
163-
nokogiri (1.10.8)
163+
nokogiri (1.10.9)
164164
mini_portile2 (~> 2.4.0)
165165
orm_adapter (0.5.0)
166166
parallel (1.19.1)
@@ -197,8 +197,8 @@ GEM
197197
rails-dom-testing (2.0.3)
198198
activesupport (>= 4.2.0)
199199
nokogiri (>= 1.6)
200-
rails-html-sanitizer (1.2.0)
201-
loofah (~> 2.2, >= 2.2.2)
200+
rails-html-sanitizer (1.3.0)
201+
loofah (~> 2.3)
202202
railties (5.2.3)
203203
actionpack (= 5.2.3)
204204
activesupport (= 5.2.3)
@@ -268,7 +268,7 @@ GEM
268268
thor (0.20.3)
269269
thread_safe (0.3.6)
270270
tilt (2.0.10)
271-
tzinfo (1.2.5)
271+
tzinfo (1.2.7)
272272
thread_safe (~> 0.1)
273273
unicode-display_width (1.6.1)
274274
warden (1.2.8)

0 commit comments

Comments
 (0)
0