Skip to content

Commit 7b75556

Browse files
authored
fix: revert "fix: update arel-helpers dependency (#535)" (#537)
This reverts commit 176afff.
1 parent 820ec7d commit 7b75556

File tree

2 files changed

+35
-33
lines changed

2 files changed

+35
-33
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ end
2525
gem 'rails', '6.0.3.6'
2626
gem 'forestadmin-jsonapi-serializers'
2727
gem 'rack-cors'
28-
gem 'arel-helpers', '2.14.0'
28+
gem 'arel-helpers', '2.11.0'
2929
gem 'groupdate', '5.2.2'
3030
gem 'useragent'
3131
gem 'jwt'

Gemfile.lock

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -75,52 +75,54 @@ GEM
7575
tzinfo (~> 1.1)
7676
zeitwerk (~> 2.2, >= 2.2.2)
7777
aes_key_wrap (1.1.0)
78-
arel-helpers (2.14.0)
79-
activerecord (>= 3.1.0, < 8)
78+
arel-helpers (2.11.0)
79+
activerecord (>= 3.1.0, < 7)
8080
attr_required (1.0.1)
8181
bcrypt (3.1.16)
82-
bindata (2.4.10)
82+
bindata (2.4.9)
8383
builder (3.2.4)
8484
byebug (11.1.3)
85-
concurrent-ruby (1.1.9)
85+
concurrent-ruby (1.1.8)
8686
crass (1.0.6)
8787
diff-lcs (1.4.4)
88-
docile (1.4.0)
88+
docile (1.3.5)
8989
erubi (1.10.0)
9090
forestadmin-jsonapi-serializers (2.0.0.pre.beta.2)
9191
activesupport
92-
globalid (1.0.0)
93-
activesupport (>= 5.0)
92+
globalid (0.4.2)
93+
activesupport (>= 4.2.0)
9494
groupdate (5.2.2)
9595
activesupport (>= 5)
9696
httparty (0.18.1)
9797
mime-types (~> 3.0)
9898
multi_xml (>= 0.5.2)
9999
httpclient (2.8.3)
100-
i18n (1.8.11)
100+
i18n (1.8.10)
101101
concurrent-ruby (~> 1.0)
102102
ipaddress (0.8.3)
103-
json (2.6.1)
103+
json (2.5.1)
104104
json-jwt (1.12.0)
105105
activesupport (>= 4.2)
106106
aes_key_wrap
107107
bindata
108-
jwt (2.3.0)
109-
loofah (2.13.0)
108+
jwt (2.2.3)
109+
loofah (2.9.1)
110110
crass (~> 1.0.2)
111111
nokogiri (>= 1.5.9)
112112
mail (2.7.1)
113113
mini_mime (>= 0.1.1)
114-
marcel (1.0.2)
114+
marcel (1.0.1)
115115
method_source (1.0.0)
116-
mime-types (3.4.1)
116+
mime-types (3.3.1)
117117
mime-types-data (~> 3.2015)
118-
mime-types-data (3.2021.1115)
119-
mini_mime (1.1.2)
120-
minitest (5.15.0)
118+
mime-types-data (3.2021.0225)
119+
mini_mime (1.1.0)
120+
mini_portile2 (2.5.0)
121+
minitest (5.14.4)
121122
multi_xml (0.6.0)
122-
nio4r (2.5.8)
123-
nokogiri (1.12.5-x86_64-darwin)
123+
nio4r (2.5.7)
124+
nokogiri (1.11.3)
125+
mini_portile2 (~> 2.5.0)
124126
racc (~> 1.4)
125127
openid_connect (1.2.0)
126128
activemodel
@@ -133,11 +135,11 @@ GEM
133135
validate_url
134136
webfinger (>= 1.0.1)
135137
public_suffix (4.0.6)
136-
racc (1.6.0)
138+
racc (1.5.2)
137139
rack (2.2.3)
138140
rack-cors (1.1.1)
139141
rack (>= 2.0.0)
140-
rack-oauth2 (1.19.0)
142+
rack-oauth2 (1.16.0)
141143
activesupport
142144
attr_required
143145
httpclient
@@ -163,15 +165,15 @@ GEM
163165
rails-dom-testing (2.0.3)
164166
activesupport (>= 4.2.0)
165167
nokogiri (>= 1.6)
166-
rails-html-sanitizer (1.4.2)
168+
rails-html-sanitizer (1.3.0)
167169
loofah (~> 2.3)
168170
railties (6.0.3.6)
169171
actionpack (= 6.0.3.6)
170172
activesupport (= 6.0.3.6)
171173
method_source
172174
rake (>= 0.8.7)
173175
thor (>= 0.20.3, < 2.0)
174-
rake (13.0.6)
176+
rake (13.0.3)
175177
rspec-core (3.8.2)
176178
rspec-support (~> 3.8.0)
177179
rspec-expectations (3.8.6)
@@ -197,12 +199,12 @@ GEM
197199
sprockets (4.0.2)
198200
concurrent-ruby (~> 1.0)
199201
rack (> 1, < 3)
200-
sprockets-rails (3.4.2)
201-
actionpack (>= 5.2)
202-
activesupport (>= 5.2)
202+
sprockets-rails (3.2.2)
203+
actionpack (>= 4.0)
204+
activesupport (>= 4.0)
203205
sprockets (>= 3.0.0)
204206
sqlite3 (1.4.2)
205-
swd (1.3.0)
207+
swd (1.2.0)
206208
activesupport (>= 3)
207209
attr_required (>= 0.0.5)
208210
httpclient (>= 2.4)
@@ -217,19 +219,19 @@ GEM
217219
validate_url (1.0.13)
218220
activemodel (>= 3.0.0)
219221
public_suffix
220-
webfinger (1.2.0)
222+
webfinger (1.1.0)
221223
activesupport
222224
httpclient (>= 2.4)
223-
websocket-driver (0.7.5)
225+
websocket-driver (0.7.3)
224226
websocket-extensions (>= 0.1.0)
225227
websocket-extensions (0.1.5)
226-
zeitwerk (2.5.1)
228+
zeitwerk (2.4.2)
227229

228230
PLATFORMS
229-
x86_64-darwin-20
231+
ruby
230232

231233
DEPENDENCIES
232-
arel-helpers (= 2.14.0)
234+
arel-helpers (= 2.11.0)
233235
bcrypt
234236
byebug
235237
forest_liana!
@@ -250,4 +252,4 @@ DEPENDENCIES
250252
useragent
251253

252254
BUNDLED WITH
253-
2.2.22
255+
2.2.3

0 commit comments

Comments
 (0)