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

Commit 4753290

Browse files
authored
update some gem dependencies (#211)
* update gems that can be updated, pinned some versions to work with Rails 3/Ruby2.1 * updated ameoba, and tzinfo * locked the dependencies that can't be updated * downgrade selenium-webdriver, will sort the version out with setting up the tests
1 parent 3fdc4da commit 4753290

File tree

2 files changed

+82
-61
lines changed

2 files changed

+82
-61
lines changed

Gemfile

+14-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,19 @@ gem 'rails', '~>3.2.22'
55
# pin this to post-CVE 2017-5946
66
gem 'rubyzip', '~> 1.2.3'
77

8+
# pin the following dependencies to work with Ruby 2.1 and Rails 3
9+
gem 'arbre','1.1.1'
10+
gem 'rb-inotify','0.9.10'
11+
gem 'public_suffix','3.0.3'
12+
gem 'bourbon','4.2.7'
13+
814
gem 'mysql2', '~>0.3.20'
915
gem 'omniauth'
1016
gem 'omniauth-shibboleth'
11-
gem 'recaptcha'
17+
18+
# pin recaptcha to work with Ruby 2.1 and Rails 3
19+
# some work is required to upgrade to 4.9. So pinned it to 3.x for now
20+
gem 'recaptcha', '3.4.0'
1221
gem 'i18n'
1322
gem 'globalize', '~>3.1.0'
1423
gem 'dragonfly'
@@ -66,7 +75,8 @@ gem 'validate_url'
6675
# gem 'sword2ruby'
6776

6877
gem 'thin'
69-
gem 'wicked_pdf'
78+
# Pinned this version for Ruby 2.1 and Rails 3
79+
gem 'wicked_pdf','1.1.0'
7080
gem 'htmltoword'
7181
# To use ActiveModel has_secure_password
7282
# gem 'bcrypt-ruby', '~> 3.0.0'
@@ -86,7 +96,8 @@ gem 'htmltoword'
8696
group :development, :test do
8797
gem 'rspec-rails'
8898
gem 'rspec'
89-
gem 'selenium-webdriver'
99+
# pinned this version to current version. Leave for the test setup to be completed
100+
gem 'selenium-webdriver', '2.53.4'
90101

91102
# pint this to issue 115 - security warning
92103
gem 'mail', '~> 2.5.5'

Gemfile.lock

+68-58
Original file line numberDiff line numberDiff line change
@@ -42,26 +42,27 @@ GEM
4242
activesupport (3.2.22.5)
4343
i18n (~> 0.6, >= 0.6.4)
4444
multi_json (~> 1.0)
45-
addressable (2.4.0)
45+
addressable (2.6.0)
46+
public_suffix (>= 2.0.2, < 4.0)
4647
afm (0.2.2)
4748
amoeba (3.1.0)
4849
activerecord (>= 3.2.6)
4950
arbre (1.1.1)
5051
activesupport (>= 3.0.0)
5152
arel (3.0.3)
52-
bcrypt (3.1.11)
53+
bcrypt (3.1.13)
5354
better_errors (2.5.1)
5455
coderay (>= 1.0.0)
5556
erubi (>= 1.0.0)
5657
rack (>= 0.9.0)
57-
binding_of_caller (0.7.2)
58+
binding_of_caller (0.8.0)
5859
debug_inspector (>= 0.0.1)
5960
bourbon (4.2.7)
6061
sass (~> 3.4)
6162
thor (~> 0.19)
6263
builder (3.0.4)
6364
cancan (1.6.10)
64-
childprocess (0.5.9)
65+
childprocess (0.9.0)
6566
ffi (~> 1.0, >= 1.0.11)
6667
ci_reporter (1.9.2)
6768
builder (>= 2.1.2)
@@ -72,13 +73,13 @@ GEM
7273
coffee-script (2.4.1)
7374
coffee-script-source
7475
execjs
75-
coffee-script-source (1.10.0)
76+
coffee-script-source (1.12.2)
7677
commonjs (0.2.7)
7778
concurrent-ruby (1.1.5)
7879
contact_us (0.5.0)
7980
rails (>= 3.0.0)
80-
daemons (1.2.4)
81-
debug_inspector (0.0.2)
81+
daemons (1.3.1)
82+
debug_inspector (0.0.3)
8283
devise (3.5.10)
8384
bcrypt (~> 3.0)
8485
orm_adapter (~> 0.1)
@@ -90,21 +91,21 @@ GEM
9091
actionmailer (>= 3.2.6)
9192
devise (>= 3.2.0)
9293
diff-lcs (1.3)
93-
dragonfly (1.0.12)
94+
dragonfly (1.2.0)
9495
addressable (~> 2.3)
9596
multi_json (~> 1.0)
96-
rack (>= 1.3.0)
97+
rack (>= 1.3)
9798
email_validator (2.0.1)
9899
activemodel
99100
erubi (1.8.0)
100101
erubis (2.7.0)
101-
eventmachine (1.2.0.1)
102+
eventmachine (1.2.7)
102103
exception_notification (4.1.1)
103104
actionmailer (>= 3.0.4)
104105
activesupport (>= 3.0.4)
105106
execjs (2.7.0)
106107
ffi (1.11.1)
107-
formtastic (3.1.4)
108+
formtastic (3.1.5)
108109
actionpack (>= 3.2.13)
109110
formtastic_i18n (0.6.0)
110111
friendly_id (4.0.10.1)
@@ -118,20 +119,20 @@ GEM
118119
hashery (2.1.2)
119120
hashie (3.6.0)
120121
hike (1.2.3)
121-
htmltoword (0.5.1)
122+
htmltoword (1.1.0)
122123
actionpack
123124
nokogiri
124125
rubyzip (>= 1.0)
125126
i18n (0.9.5)
126127
concurrent-ruby (~> 1.0)
127-
inherited_resources (1.6.0)
128-
actionpack (>= 3.2, < 5)
129-
has_scope (~> 0.6.0.rc)
130-
railties (>= 3.2, < 5)
128+
inherited_resources (1.7.2)
129+
actionpack (>= 3.2, < 5.2.x)
130+
has_scope (~> 0.6)
131+
railties (>= 3.2, < 5.2.x)
131132
responders
132-
jbuilder (2.6.0)
133-
activesupport (>= 3.0.0, < 5.1)
134-
multi_json (~> 1.2)
133+
jbuilder (2.6.4)
134+
activesupport (>= 3.0.0)
135+
multi_json (>= 1.2)
135136
journey (1.0.4)
136137
jquery-rails (3.1.5)
137138
railties (>= 3.0, < 5.0)
@@ -144,7 +145,7 @@ GEM
144145
activesupport (>= 3.0.0)
145146
launchy (2.4.3)
146147
addressable (~> 2.3)
147-
ledermann-rails-settings (2.4.2)
148+
ledermann-rails-settings (2.4.3)
148149
activerecord (>= 3.1)
149150
less (2.6.0)
150151
commonjs (~> 0.2.7)
@@ -166,7 +167,7 @@ GEM
166167
omniauth (1.4.2)
167168
hashie (>= 1.2, < 4)
168169
rack (>= 1.0, < 3)
169-
omniauth-shibboleth (1.2.1)
170+
omniauth-shibboleth (1.3.0)
170171
omniauth (>= 1.0.0)
171172
orm_adapter (0.5.0)
172173
pdf-reader (2.2.0)
@@ -175,9 +176,8 @@ GEM
175176
hashery (~> 2.0)
176177
ruby-rc4
177178
ttfunk
178-
polyamorous (1.3.1)
179-
activerecord (>= 3.0)
180179
polyglot (0.3.5)
180+
public_suffix (3.0.3)
181181
rack (1.4.7)
182182
rack-cache (1.9.0)
183183
rack (>= 0.4)
@@ -201,46 +201,52 @@ GEM
201201
rdoc (~> 3.4)
202202
thor (>= 0.14.6, < 2.0)
203203
rake (12.3.2)
204-
ransack (1.8.2)
205-
actionpack (>= 3.0)
206-
activerecord (>= 3.0)
207-
activesupport (>= 3.0)
204+
ransack (1.8.10)
205+
actionpack (>= 3.0, < 5.2)
206+
activerecord (>= 3.0, < 5.2)
207+
activesupport (>= 3.0, < 5.2)
208208
i18n
209-
polyamorous (~> 1.3)
209+
rb-fsevent (0.10.3)
210+
rb-inotify (0.9.10)
211+
ffi (>= 0.5.0, < 2)
210212
rdoc (3.12.2)
211213
json (~> 1.4)
212-
recaptcha (3.3.0)
214+
recaptcha (3.4.0)
213215
json
214216
ref (2.0.0)
215217
responders (1.1.2)
216218
railties (>= 3.2, < 4.2)
217219
rolify (5.2.0)
218220
rollbar (2.20.1)
219221
multi_json
220-
rspec (3.5.0)
221-
rspec-core (~> 3.5.0)
222-
rspec-expectations (~> 3.5.0)
223-
rspec-mocks (~> 3.5.0)
224-
rspec-core (3.5.4)
225-
rspec-support (~> 3.5.0)
226-
rspec-expectations (3.5.0)
222+
rspec (3.8.0)
223+
rspec-core (~> 3.8.0)
224+
rspec-expectations (~> 3.8.0)
225+
rspec-mocks (~> 3.8.0)
226+
rspec-core (3.8.0)
227+
rspec-support (~> 3.8.0)
228+
rspec-expectations (3.8.3)
227229
diff-lcs (>= 1.2.0, < 2.0)
228-
rspec-support (~> 3.5.0)
229-
rspec-mocks (3.5.0)
230+
rspec-support (~> 3.8.0)
231+
rspec-mocks (3.8.0)
230232
diff-lcs (>= 1.2.0, < 2.0)
231-
rspec-support (~> 3.5.0)
232-
rspec-rails (3.5.2)
233+
rspec-support (~> 3.8.0)
234+
rspec-rails (3.8.2)
233235
actionpack (>= 3.0)
234236
activesupport (>= 3.0)
235237
railties (>= 3.0)
236-
rspec-core (~> 3.5.0)
237-
rspec-expectations (~> 3.5.0)
238-
rspec-mocks (~> 3.5.0)
239-
rspec-support (~> 3.5.0)
240-
rspec-support (3.5.0)
238+
rspec-core (~> 3.8.0)
239+
rspec-expectations (~> 3.8.0)
240+
rspec-mocks (~> 3.8.0)
241+
rspec-support (~> 3.8.0)
242+
rspec-support (3.8.0)
241243
ruby-rc4 (0.1.5)
242244
rubyzip (1.2.3)
243-
sass (3.4.22)
245+
sass (3.7.4)
246+
sass-listen (~> 4.0.0)
247+
sass-listen (4.0.0)
248+
rb-fsevent (~> 0.9, >= 0.9.4)
249+
rb-inotify (~> 0.9, >= 0.9.7)
244250
sass-rails (3.2.6)
245251
railties (~> 3.2.0)
246252
sass (>= 3.1.10)
@@ -258,14 +264,14 @@ GEM
258264
therubyracer (0.11.4)
259265
libv8 (~> 3.11.8.12)
260266
ref
261-
thin (1.7.0)
267+
thin (1.7.2)
262268
daemons (~> 1.0, >= 1.0.9)
263269
eventmachine (~> 1.0, >= 1.0.4)
264270
rack (>= 1, < 3)
265271
thor (0.20.3)
266-
thread_safe (0.3.5)
272+
thread_safe (0.3.6)
267273
tilt (1.4.1)
268-
tinymce-rails (4.4.1)
274+
tinymce-rails (5.0.5)
269275
railties (>= 3.1.1)
270276
treetop (1.4.15)
271277
polyglot
@@ -277,24 +283,26 @@ GEM
277283
rails (>= 3.1)
278284
railties (>= 3.1)
279285
tzinfo (0.3.55)
280-
uglifier (3.0.1)
286+
uglifier (4.1.20)
281287
execjs (>= 0.3.0, < 3)
282-
validate_url (1.0.2)
288+
validate_url (1.0.8)
283289
activemodel (>= 3.0.0)
284-
addressable
285-
warden (1.2.6)
290+
public_suffix
291+
warden (1.2.7)
286292
rack (>= 1.0)
287-
websocket (1.2.3)
288-
wicked_pdf (1.0.6)
293+
websocket (1.2.8)
294+
wicked_pdf (1.1.0)
289295

290296
PLATFORMS
291297
ruby
292298

293299
DEPENDENCIES
294300
activeadmin (= 1.0.0.pre1)
295301
amoeba
302+
arbre (= 1.1.1)
296303
better_errors
297304
binding_of_caller
305+
bourbon (= 4.2.7)
298306
cancan
299307
ci_reporter (= 1.9.2)
300308
coffee-rails (~> 3.2.1)
@@ -320,24 +328,26 @@ DEPENDENCIES
320328
omniauth
321329
omniauth-shibboleth
322330
pdf-reader
331+
public_suffix (= 3.0.3)
323332
rails (~> 3.2.22)
324-
recaptcha
333+
rb-inotify (= 0.9.10)
334+
recaptcha (= 3.4.0)
325335
rolify
326336
rollbar
327337
rspec
328338
rspec-rails
329339
rubyzip (~> 1.2.3)
330340
sass
331341
sass-rails (~> 3.2.3)
332-
selenium-webdriver
342+
selenium-webdriver (= 2.53.4)
333343
syslog-logger
334344
therubyracer (= 0.11.4)
335345
thin
336346
tinymce-rails
337347
twitter-bootstrap-rails (~> 2.2.8)
338348
uglifier
339349
validate_url
340-
wicked_pdf
350+
wicked_pdf (= 1.1.0)
341351

342352
BUNDLED WITH
343353
1.16.6

0 commit comments

Comments
 (0)