Skip to content

Commit

Permalink
Merge pull request #273 from sul-dlss/dependencies
Browse files Browse the repository at this point in the history
Update jquery-rails and rest-client dependencies to address security …
  • Loading branch information
mejackreed committed Jun 18, 2015
2 parents 8c0b304 + cd2741a commit b7e1980
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ GEM
rails (>= 3.2, < 5.0)
diff-lcs (1.2.5)
docile (1.1.5)
domain_name (0.5.24)
unf (>= 0.0.5, < 1.0.0)
erubis (2.7.0)
execjs (2.5.2)
factory_girl (4.5.0)
Expand All @@ -145,6 +147,8 @@ GEM
globalid (0.3.5)
activesupport (>= 4.1.0)
hike (1.2.3)
http-cookie (1.0.2)
domain_name (~> 0.5)
i18n (0.7.0)
is_it_working (1.0.10)
jbuilder (2.2.8)
Expand All @@ -156,7 +160,7 @@ GEM
i18n
logger
rubyzip
jquery-rails (4.0.3)
jquery-rails (4.0.4)
rails-dom-testing (~> 1.0)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
Expand Down Expand Up @@ -184,7 +188,7 @@ GEM
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (2.9.2)
netrc (0.10.2)
netrc (0.10.3)
newrelic_rpm (3.10.0.279)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
Expand Down Expand Up @@ -230,7 +234,8 @@ GEM
ref (1.0.5)
responders (2.1.0)
railties (>= 4.2.0, < 5)
rest-client (1.7.3)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rsolr (1.0.12)
Expand Down Expand Up @@ -305,6 +310,9 @@ GEM
uglifier (2.7.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.1)
warden (1.2.3)
rack (>= 1.0)
websocket-driver (0.5.3)
Expand Down Expand Up @@ -353,4 +361,4 @@ DEPENDENCIES
uglifier (>= 1.3.0)

BUNDLED WITH
1.10.3
1.10.4

0 comments on commit b7e1980

Please sign in to comment.