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

Commit

Permalink
update some gem dependencies (#211)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
weiweishi authored Jun 4, 2019
1 parent 3fdc4da commit 4753290
Show file tree
Hide file tree
Showing 2 changed files with 82 additions and 61 deletions.
17 changes: 14 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,19 @@ gem 'rails', '~>3.2.22'
# pin this to post-CVE 2017-5946
gem 'rubyzip', '~> 1.2.3'

# pin the following dependencies to work with Ruby 2.1 and Rails 3
gem 'arbre','1.1.1'
gem 'rb-inotify','0.9.10'
gem 'public_suffix','3.0.3'
gem 'bourbon','4.2.7'

gem 'mysql2', '~>0.3.20'
gem 'omniauth'
gem 'omniauth-shibboleth'
gem 'recaptcha'

# pin recaptcha to work with Ruby 2.1 and Rails 3
# some work is required to upgrade to 4.9. So pinned it to 3.x for now
gem 'recaptcha', '3.4.0'
gem 'i18n'
gem 'globalize', '~>3.1.0'
gem 'dragonfly'
Expand Down Expand Up @@ -66,7 +75,8 @@ gem 'validate_url'
# gem 'sword2ruby'

gem 'thin'
gem 'wicked_pdf'
# Pinned this version for Ruby 2.1 and Rails 3
gem 'wicked_pdf','1.1.0'
gem 'htmltoword'
# To use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0'
Expand All @@ -86,7 +96,8 @@ gem 'htmltoword'
group :development, :test do
gem 'rspec-rails'
gem 'rspec'
gem 'selenium-webdriver'
# pinned this version to current version. Leave for the test setup to be completed
gem 'selenium-webdriver', '2.53.4'

# pint this to issue 115 - security warning
gem 'mail', '~> 2.5.5'
Expand Down
126 changes: 68 additions & 58 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -42,26 +42,27 @@ GEM
activesupport (3.2.22.5)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
addressable (2.4.0)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
afm (0.2.2)
amoeba (3.1.0)
activerecord (>= 3.2.6)
arbre (1.1.1)
activesupport (>= 3.0.0)
arel (3.0.3)
bcrypt (3.1.11)
bcrypt (3.1.13)
better_errors (2.5.1)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
binding_of_caller (0.7.2)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
bourbon (4.2.7)
sass (~> 3.4)
thor (~> 0.19)
builder (3.0.4)
cancan (1.6.10)
childprocess (0.5.9)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
ci_reporter (1.9.2)
builder (>= 2.1.2)
Expand All @@ -72,13 +73,13 @@ GEM
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.10.0)
coffee-script-source (1.12.2)
commonjs (0.2.7)
concurrent-ruby (1.1.5)
contact_us (0.5.0)
rails (>= 3.0.0)
daemons (1.2.4)
debug_inspector (0.0.2)
daemons (1.3.1)
debug_inspector (0.0.3)
devise (3.5.10)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
Expand All @@ -90,21 +91,21 @@ GEM
actionmailer (>= 3.2.6)
devise (>= 3.2.0)
diff-lcs (1.3)
dragonfly (1.0.12)
dragonfly (1.2.0)
addressable (~> 2.3)
multi_json (~> 1.0)
rack (>= 1.3.0)
rack (>= 1.3)
email_validator (2.0.1)
activemodel
erubi (1.8.0)
erubis (2.7.0)
eventmachine (1.2.0.1)
eventmachine (1.2.7)
exception_notification (4.1.1)
actionmailer (>= 3.0.4)
activesupport (>= 3.0.4)
execjs (2.7.0)
ffi (1.11.1)
formtastic (3.1.4)
formtastic (3.1.5)
actionpack (>= 3.2.13)
formtastic_i18n (0.6.0)
friendly_id (4.0.10.1)
Expand All @@ -118,20 +119,20 @@ GEM
hashery (2.1.2)
hashie (3.6.0)
hike (1.2.3)
htmltoword (0.5.1)
htmltoword (1.1.0)
actionpack
nokogiri
rubyzip (>= 1.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
inherited_resources (1.6.0)
actionpack (>= 3.2, < 5)
has_scope (~> 0.6.0.rc)
railties (>= 3.2, < 5)
inherited_resources (1.7.2)
actionpack (>= 3.2, < 5.2.x)
has_scope (~> 0.6)
railties (>= 3.2, < 5.2.x)
responders
jbuilder (2.6.0)
activesupport (>= 3.0.0, < 5.1)
multi_json (~> 1.2)
jbuilder (2.6.4)
activesupport (>= 3.0.0)
multi_json (>= 1.2)
journey (1.0.4)
jquery-rails (3.1.5)
railties (>= 3.0, < 5.0)
Expand All @@ -144,7 +145,7 @@ GEM
activesupport (>= 3.0.0)
launchy (2.4.3)
addressable (~> 2.3)
ledermann-rails-settings (2.4.2)
ledermann-rails-settings (2.4.3)
activerecord (>= 3.1)
less (2.6.0)
commonjs (~> 0.2.7)
Expand All @@ -166,7 +167,7 @@ GEM
omniauth (1.4.2)
hashie (>= 1.2, < 4)
rack (>= 1.0, < 3)
omniauth-shibboleth (1.2.1)
omniauth-shibboleth (1.3.0)
omniauth (>= 1.0.0)
orm_adapter (0.5.0)
pdf-reader (2.2.0)
Expand All @@ -175,9 +176,8 @@ GEM
hashery (~> 2.0)
ruby-rc4
ttfunk
polyamorous (1.3.1)
activerecord (>= 3.0)
polyglot (0.3.5)
public_suffix (3.0.3)
rack (1.4.7)
rack-cache (1.9.0)
rack (>= 0.4)
Expand All @@ -201,46 +201,52 @@ GEM
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (12.3.2)
ransack (1.8.2)
actionpack (>= 3.0)
activerecord (>= 3.0)
activesupport (>= 3.0)
ransack (1.8.10)
actionpack (>= 3.0, < 5.2)
activerecord (>= 3.0, < 5.2)
activesupport (>= 3.0, < 5.2)
i18n
polyamorous (~> 1.3)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rdoc (3.12.2)
json (~> 1.4)
recaptcha (3.3.0)
recaptcha (3.4.0)
json
ref (2.0.0)
responders (1.1.2)
railties (>= 3.2, < 4.2)
rolify (5.2.0)
rollbar (2.20.1)
multi_json
rspec (3.5.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.5.0)
rspec-core (3.5.4)
rspec-support (~> 3.5.0)
rspec-expectations (3.5.0)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-core (3.8.0)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
rspec-mocks (3.5.0)
rspec-support (~> 3.8.0)
rspec-mocks (3.8.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
rspec-rails (3.5.2)
rspec-support (~> 3.8.0)
rspec-rails (3.8.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.5.0)
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.0)
ruby-rc4 (0.1.5)
rubyzip (1.2.3)
sass (3.4.22)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
Expand All @@ -258,14 +264,14 @@ GEM
therubyracer (0.11.4)
libv8 (~> 3.11.8.12)
ref
thin (1.7.0)
thin (1.7.2)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
thor (0.20.3)
thread_safe (0.3.5)
thread_safe (0.3.6)
tilt (1.4.1)
tinymce-rails (4.4.1)
tinymce-rails (5.0.5)
railties (>= 3.1.1)
treetop (1.4.15)
polyglot
Expand All @@ -277,24 +283,26 @@ GEM
rails (>= 3.1)
railties (>= 3.1)
tzinfo (0.3.55)
uglifier (3.0.1)
uglifier (4.1.20)
execjs (>= 0.3.0, < 3)
validate_url (1.0.2)
validate_url (1.0.8)
activemodel (>= 3.0.0)
addressable
warden (1.2.6)
public_suffix
warden (1.2.7)
rack (>= 1.0)
websocket (1.2.3)
wicked_pdf (1.0.6)
websocket (1.2.8)
wicked_pdf (1.1.0)

PLATFORMS
ruby

DEPENDENCIES
activeadmin (= 1.0.0.pre1)
amoeba
arbre (= 1.1.1)
better_errors
binding_of_caller
bourbon (= 4.2.7)
cancan
ci_reporter (= 1.9.2)
coffee-rails (~> 3.2.1)
Expand All @@ -320,24 +328,26 @@ DEPENDENCIES
omniauth
omniauth-shibboleth
pdf-reader
public_suffix (= 3.0.3)
rails (~> 3.2.22)
recaptcha
rb-inotify (= 0.9.10)
recaptcha (= 3.4.0)
rolify
rollbar
rspec
rspec-rails
rubyzip (~> 1.2.3)
sass
sass-rails (~> 3.2.3)
selenium-webdriver
selenium-webdriver (= 2.53.4)
syslog-logger
therubyracer (= 0.11.4)
thin
tinymce-rails
twitter-bootstrap-rails (~> 2.2.8)
uglifier
validate_url
wicked_pdf
wicked_pdf (= 1.1.0)

BUNDLED WITH
1.16.6

0 comments on commit 4753290

Please sign in to comment.