Skip to content
This repository was archived by the owner on Apr 19, 2023. It is now read-only.

Commit 5a06eac

Browse files
authored
Merge pull request #21 from railstack/dependabot/bundler/rails_admin-1.4.3
Bump rails_admin from 1.4.2 to 1.4.3
2 parents ac1fd19 + 1847648 commit 5a06eac

File tree

2 files changed

+38
-36
lines changed

2 files changed

+38
-36
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ gem 'jbuilder', '~> 2.5'
3535
# gem 'capistrano-rails', group: :development
3636
gem 'go-on-rails', '~> 0.4.0'
3737
gem 'devise'
38-
gem 'rails_admin', '~> 1.2'
38+
gem 'rails_admin', '~> 1.4'
3939
gem 'cancancan', '~> 2.0'
4040
gem 'webpacker', '~> 3.0'
4141

Gemfile.lock

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -64,69 +64,71 @@ GEM
6464
coffee-script-source
6565
execjs
6666
coffee-script-source (1.12.2)
67-
concurrent-ruby (1.1.5)
68-
crass (1.0.5)
67+
concurrent-ruby (1.1.7)
68+
crass (1.0.6)
6969
devise (4.7.1)
7070
bcrypt (~> 3.0)
7171
orm_adapter (~> 0.1)
7272
railties (>= 4.1.0)
7373
responders
7474
warden (~> 1.2.3)
75-
erubi (1.9.0)
75+
erubi (1.10.0)
7676
execjs (2.7.0)
77-
ffi (1.11.3)
78-
font-awesome-rails (4.7.0.5)
79-
railties (>= 3.2, < 6.1)
77+
ffi (1.14.2)
78+
font-awesome-rails (4.7.0.6)
79+
railties (>= 3.2, < 6.2)
8080
globalid (0.4.2)
8181
activesupport (>= 4.2.0)
8282
go-on-rails (0.4.0)
83-
haml (5.1.2)
83+
haml (5.2.1)
8484
temple (>= 0.8.0)
8585
tilt
86-
i18n (1.7.0)
86+
i18n (1.8.7)
8787
concurrent-ruby (~> 1.0)
8888
jbuilder (2.9.1)
8989
activesupport (>= 4.2.0)
90-
jquery-rails (4.3.5)
90+
jquery-rails (4.4.0)
9191
rails-dom-testing (>= 1, < 3)
9292
railties (>= 4.2.0)
9393
thor (>= 0.14, < 2.0)
9494
jquery-ui-rails (6.0.1)
9595
railties (>= 3.2.16)
96-
kaminari (1.1.1)
96+
kaminari (1.2.1)
9797
activesupport (>= 4.1.0)
98-
kaminari-actionview (= 1.1.1)
99-
kaminari-activerecord (= 1.1.1)
100-
kaminari-core (= 1.1.1)
101-
kaminari-actionview (1.1.1)
98+
kaminari-actionview (= 1.2.1)
99+
kaminari-activerecord (= 1.2.1)
100+
kaminari-core (= 1.2.1)
101+
kaminari-actionview (1.2.1)
102102
actionview
103-
kaminari-core (= 1.1.1)
104-
kaminari-activerecord (1.1.1)
103+
kaminari-core (= 1.2.1)
104+
kaminari-activerecord (1.2.1)
105105
activerecord
106-
kaminari-core (= 1.1.1)
107-
kaminari-core (1.1.1)
106+
kaminari-core (= 1.2.1)
107+
kaminari-core (1.2.1)
108108
listen (3.1.5)
109109
rb-fsevent (~> 0.9, >= 0.9.4)
110110
rb-inotify (~> 0.9, >= 0.9.7)
111111
ruby_dep (~> 1.2)
112-
loofah (2.4.0)
112+
loofah (2.8.0)
113113
crass (~> 1.0.2)
114114
nokogiri (>= 1.5.9)
115115
mail (2.7.1)
116116
mini_mime (>= 0.1.1)
117-
method_source (0.9.2)
117+
method_source (1.0.0)
118118
mini_mime (1.0.2)
119-
mini_portile2 (2.4.0)
120-
minitest (5.13.0)
119+
mini_portile2 (2.5.0)
120+
minitest (5.14.3)
121121
mysql2 (0.4.10)
122122
nested_form (0.3.2)
123-
nio4r (2.5.2)
124-
nokogiri (1.10.7)
125-
mini_portile2 (~> 2.4.0)
123+
nio4r (2.5.4)
124+
nokogiri (1.11.1)
125+
mini_portile2 (~> 2.5.0)
126+
racc (~> 1.4)
126127
orm_adapter (0.5.0)
127128
public_suffix (4.0.1)
128129
puma (3.12.2)
129-
rack (2.0.8)
130+
racc (1.5.2)
131+
rack (2.2.3)
130132
rack-pjax (1.1.0)
131133
nokogiri (~> 1.5)
132134
rack (>= 1.1)
@@ -151,7 +153,7 @@ GEM
151153
nokogiri (>= 1.6)
152154
rails-html-sanitizer (1.3.0)
153155
loofah (~> 2.3)
154-
rails_admin (1.4.2)
156+
rails_admin (1.4.3)
155157
builder (~> 3.1)
156158
coffee-rails (~> 4.0)
157159
font-awesome-rails (>= 3.0, < 5)
@@ -170,11 +172,11 @@ GEM
170172
method_source
171173
rake (>= 0.8.7)
172174
thor (>= 0.18.1, < 2.0)
173-
rake (13.0.1)
174-
rb-fsevent (0.10.3)
175-
rb-inotify (0.10.0)
175+
rake (13.0.3)
176+
rb-fsevent (0.10.4)
177+
rb-inotify (0.10.1)
176178
ffi (~> 1.0)
177-
remotipart (1.4.3)
179+
remotipart (1.4.4)
178180
responders (3.0.0)
179181
actionpack (>= 5.0)
180182
railties (>= 5.0)
@@ -201,7 +203,7 @@ GEM
201203
sprockets (3.7.2)
202204
concurrent-ruby (~> 1.0)
203205
rack (> 1, < 3)
204-
sprockets-rails (3.2.1)
206+
sprockets-rails (3.2.2)
205207
actionpack (>= 4.0)
206208
activesupport (>= 4.0)
207209
sprockets (>= 3.0.0)
@@ -212,7 +214,7 @@ GEM
212214
turbolinks (5.2.1)
213215
turbolinks-source (~> 5.2)
214216
turbolinks-source (5.2.0)
215-
tzinfo (1.2.5)
217+
tzinfo (1.2.9)
216218
thread_safe (~> 0.1)
217219
uglifier (4.2.0)
218220
execjs (>= 0.3.0, < 3)
@@ -229,7 +231,7 @@ GEM
229231
railties (>= 4.2)
230232
websocket-driver (0.6.5)
231233
websocket-extensions (>= 0.1.0)
232-
websocket-extensions (0.1.4)
234+
websocket-extensions (0.1.5)
233235
xpath (3.2.0)
234236
nokogiri (~> 1.8)
235237

@@ -249,7 +251,7 @@ DEPENDENCIES
249251
mysql2 (>= 0.3.18, < 0.5)
250252
puma (~> 3.7)
251253
rails (~> 5.1.3)
252-
rails_admin (~> 1.2)
254+
rails_admin (~> 1.4)
253255
sass-rails (~> 5.0)
254256
selenium-webdriver
255257
spring

0 commit comments

Comments
 (0)