Skip to content

Commit

Permalink
Merge pull request #141 from sul-dlss/update-activerecord
Browse files Browse the repository at this point in the history
update rails for vulnerabilities
  • Loading branch information
mejackreed authored Oct 26, 2016
2 parents db70a86 + 55432f0 commit 2e60914
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 44 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'rails', '~> 4.2.5'
gem 'rails', '~> 4.2.7.1'
gem 'responders', '~> 2.0'
gem 'grape'

Expand Down
84 changes: 41 additions & 43 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.5.2)
actionpack (= 4.2.5.2)
actionview (= 4.2.5.2)
activejob (= 4.2.5.2)
actionmailer (4.2.7.1)
actionpack (= 4.2.7.1)
actionview (= 4.2.7.1)
activejob (= 4.2.7.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.5.2)
actionview (= 4.2.5.2)
activesupport (= 4.2.5.2)
actionpack (4.2.7.1)
actionview (= 4.2.7.1)
activesupport (= 4.2.7.1)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.5.2)
activesupport (= 4.2.5.2)
actionview (4.2.7.1)
activesupport (= 4.2.7.1)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (4.2.5.2)
activesupport (= 4.2.5.2)
activejob (4.2.7.1)
activesupport (= 4.2.7.1)
globalid (>= 0.3.0)
activemodel (4.2.5.2)
activesupport (= 4.2.5.2)
activemodel (4.2.7.1)
activesupport (= 4.2.7.1)
builder (~> 3.1)
activerecord (4.2.5.2)
activemodel (= 4.2.5.2)
activesupport (= 4.2.5.2)
activerecord (4.2.7.1)
activemodel (= 4.2.7.1)
activesupport (= 4.2.7.1)
arel (~> 6.0)
activerecord-import (0.9.0)
activerecord (>= 3.0)
activesupport (4.2.5.2)
activesupport (4.2.7.1)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
Expand Down Expand Up @@ -103,7 +103,7 @@ GEM
coderay (1.1.1)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
concurrent-ruby (1.0.1)
concurrent-ruby (1.0.2)
config (1.0.0)
activesupport (>= 3.0)
deep_merge (~> 1.0.0)
Expand Down Expand Up @@ -162,7 +162,7 @@ GEM
multipart-post (>= 1.2, < 3)
font-awesome-rails (4.5.0.0)
railties (>= 3.2, < 5.0)
globalid (0.3.6)
globalid (0.3.7)
activesupport (>= 4.1.0)
grape (0.16.2)
activesupport
Expand Down Expand Up @@ -202,12 +202,12 @@ GEM
libv8 (3.16.14.13)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
mail (2.6.4)
mime-types (>= 1.16, < 4)
method_source (0.8.2)
mime-types (2.99.1)
mime-types (2.99.3)
mini_portile2 (2.1.0)
minitest (5.9.0)
minitest (5.9.1)
multi_json (1.12.1)
multi_xml (0.5.5)
multipart-post (2.0.0)
Expand All @@ -219,9 +219,8 @@ GEM
net-ssh (>= 2.6.5)
net-ssh (3.1.1)
netrc (0.10.3)
nokogiri (1.6.8)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
okcomputer (1.13.0)
paper_trail (4.0.0)
activerecord (>= 3.0, < 6.0)
Expand All @@ -230,7 +229,6 @@ GEM
parallel (1.6.0)
parser (2.3.0.6)
ast (~> 2.2)
pkg-config (1.1.7)
polyamorous (1.3.0)
activerecord (>= 3.0)
powerpack (0.1.1)
Expand All @@ -250,16 +248,16 @@ GEM
rack (>= 0.4)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.5.2)
actionmailer (= 4.2.5.2)
actionpack (= 4.2.5.2)
actionview (= 4.2.5.2)
activejob (= 4.2.5.2)
activemodel (= 4.2.5.2)
activerecord (= 4.2.5.2)
activesupport (= 4.2.5.2)
rails (4.2.7.1)
actionmailer (= 4.2.7.1)
actionpack (= 4.2.7.1)
actionview (= 4.2.7.1)
activejob (= 4.2.7.1)
activemodel (= 4.2.7.1)
activerecord (= 4.2.7.1)
activesupport (= 4.2.7.1)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.5.2)
railties (= 4.2.7.1)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
Expand All @@ -281,13 +279,13 @@ GEM
sass-rails
simple_form
terminal-table
railties (4.2.5.2)
actionpack (= 4.2.5.2)
activesupport (= 4.2.5.2)
railties (4.2.7.1)
actionpack (= 4.2.7.1)
activesupport (= 4.2.7.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.1.0)
rake (11.1.2)
rake (11.3.0)
ransack (1.7.0)
actionpack (>= 3.0)
activerecord (>= 3.0)
Expand Down Expand Up @@ -349,10 +347,10 @@ GEM
simplecov-html (0.10.0)
single_cov (0.4.0)
slop (3.6.0)
sprockets (3.5.2)
sprockets (3.7.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.0.4)
sprockets-rails (3.2.0)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
Expand Down Expand Up @@ -451,7 +449,7 @@ DEPENDENCIES
pry-doc
pry-rails
pubmed_search
rails (~> 4.2.5)
rails (~> 4.2.7.1)
rails_db
responders (~> 2.0)
rest-client
Expand All @@ -472,4 +470,4 @@ DEPENDENCIES
yaml_db

BUNDLED WITH
1.13.5
1.13.6

0 comments on commit 2e60914

Please sign in to comment.