Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Hyrax to 2.0.2 and upgrade gems with security vulnerabilities #1519

Merged
3 commits merged into from
Mar 22, 2018
+526 −327
Merged

Upgrade Hyrax to 2.0.2 and upgrade gems with security vulnerabilities #1519

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60f2e4b
update hyrax to 2.0.2
Mar 21, 2018
fa6321e
update rspec, rspec-rails and loofah bc of security alerts
Mar 21, 2018
944c36c
rubocop changes
Mar 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update rspec, rspec-rails and loofah bc of security alerts
Julie Allinson committed Mar 21, 2018
commit fa6321eb5f4354d948962beeaf31382c8d0147b9
4 changes: 2 additions & 2 deletions Gemfile
View file
Original file line number Diff line number Diff line change
@@ -47,8 +47,8 @@ group :development, :test do
gem 'fcrepo_wrapper', '~> 0.4'
gem 'solr_wrapper', '~> 1.0'

gem 'rubocop', '~> 0.47.0'
gem 'rubocop-rspec', '~> 1.10.0'
gem 'rubocop', '~> 0.50', '<= 0.52.1'
gem 'rubocop-rspec', '~> 1.22', '<= 1.22.2'
end

group :test do
22 changes: 12 additions & 10 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -504,7 +504,7 @@ GEM
actionpack (>= 4, < 5.2)
activesupport (>= 4, < 5.2)
railties (>= 4, < 5.2)
loofah (2.1.1)
loofah (2.2.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
@@ -557,8 +557,9 @@ GEM
rails (> 3.2.0)
orm_adapter (0.5.0)
os (0.9.6)
parser (2.4.0.0)
ast (~> 2.2)
parallel (1.12.1)
parser (2.4.0.2)
ast (~> 2.3)
peek (1.0.1)
concurrent-ruby (>= 0.9.0)
concurrent-ruby-ext (>= 0.9.0)
@@ -737,14 +738,15 @@ GEM
rspec-mocks (~> 3.6.0)
rspec-support (~> 3.6.0)
rspec-support (3.6.0)
rubocop (0.47.1)
parser (>= 2.3.3.1, < 3.0)
rubocop (0.52.1)
parallel (~> 1.10)
parser (>= 2.4.0.2, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
rubocop-rspec (1.10.0)
rubocop (>= 0.42.0)
rubocop-rspec (1.22.2)
rubocop (>= 0.52.1)
ruby-box (1.15.0)
addressable
json
@@ -937,8 +939,8 @@ DEPENDENCIES
rsolr (~> 2.0)
rspec
rspec-rails (>= 3.6.0)
rubocop (~> 0.47.0)
rubocop-rspec (~> 1.10.0)
rubocop (~> 0.50, <= 0.52.1)
rubocop-rspec (~> 1.22, <= 1.22.2)
sass-rails (~> 5.0)
scss_lint
secure_headers