Skip to content
This repository has been archived by the owner on Mar 24, 2020. It is now read-only.

Commit

Permalink
Merge pull request #317 from ucsdlib/feature/upgrade_gem
Browse files Browse the repository at this point in the history
Fixes #313 - Upgrade gems to address security alerts.
  • Loading branch information
lsitu committed Jun 8, 2017
2 parents eeab34b + 711b5a1 commit 0fffff3
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ group :development, :test do
gem 'rspec-rails', '3.6.0'
gem 'rspec-activemodel-mocks', '~> 1.0'
gem 'simplecov', '~> 0.14.1'
gem 'rubocop', '0.48.1', require: false
gem 'rubocop', '0.49.1', require: false
gem 'rubocop-rspec', '1.15.1'
gem 'unicorn', '~> 5.3.0'
gem 'rspec_junit_formatter', '~> 0.2.3'
Expand Down
14 changes: 9 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -200,14 +200,15 @@ GEM
logstash-event (1.2.02)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.4)
mime-types (>= 1.16, < 4)
mail (2.7.0.rc1)
mini_mime (>= 0.1.1)
marc (1.0.0)
scrub_rb (>= 1.0.1, < 2)
unf
mediashelf-loggable (0.4.10)
method_source (0.8.2)
mime-types (2.99.3)
mini_mime (0.1.3)
mini_portile2 (2.1.0)
minitest (5.10.2)
multi_json (1.12.1)
Expand Down Expand Up @@ -237,6 +238,7 @@ GEM
omniauth-shibboleth (1.2.1)
omniauth (>= 1.0.0)
orm_adapter (0.5.0)
parallel (1.11.2)
parser (2.4.0.0)
ast (~> 2.2)
parslet (1.7.1)
Expand Down Expand Up @@ -333,7 +335,8 @@ GEM
rspec_junit_formatter (0.2.3)
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (0.48.1)
rubocop (0.49.1)
parallel (~> 1.10)
parser (>= 2.3.3.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
Expand All @@ -352,7 +355,7 @@ GEM
mime-types
nokogiri
rest-client
rubyzip (1.1.7)
rubyzip (1.2.1)
sass (3.4.22)
sass-rails (5.0.5)
railties (>= 4.0.0, < 6)
Expand Down Expand Up @@ -472,8 +475,9 @@ DEPENDENCIES
rspec-mocks (= 3.6.0)
rspec-rails (= 3.6.0)
rspec_junit_formatter (~> 0.2.3)
rubocop (= 0.48.1)
rubocop (= 0.49.1)
rubocop-rspec (= 1.15.1)
rubyzip (= 1.2.1)
sass-rails (~> 5.0.5)
selenium-webdriver (= 3.4.0)
share_notify (~> 0.2.0)
Expand Down

0 comments on commit 0fffff3

Please sign in to comment.