Skip to content

Commit

Permalink
Merge pull request #8 from seatshare/fix-cve-2017-16516
Browse files Browse the repository at this point in the history
Fix CVE-2017-16516 (yajl-ruby)
  • Loading branch information
stephenyeargin authored Nov 29, 2017
2 parents 1ec392b + 6ca72b9 commit 5144a2c
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 20 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
# for a library or gem, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# Gemfile.lock
# .ruby-version
# .ruby-gemset
.ruby-version
.ruby-gemset

# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
.rvmrc
1 change: 0 additions & 1 deletion .ruby-version

This file was deleted.

5 changes: 2 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ source 'https://rubygems.org'
gem 'faraday', '~> 0.8.11'
gem 'multi_json', '~> 1.3.5'
gem 'rake', '~> 0.9.2'
gem 'yajl-ruby', '~> 1.1.0'
gem 'yajl-ruby', '~> 1.3.1'

group :test do
gem 'rspec', '~> 3.4.0'
end

group :no_travis do
gem 'awesome_print', '~> 1.6.1'
gem 'debugger', '~> 1.6.8'
gem 'awesome_print', '~> 1.8.0'
end

gemspec
20 changes: 6 additions & 14 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
seatgeek (0.1.3)
seatgeek (1.0.0)
faraday
multi_json
rake
Expand All @@ -10,14 +10,7 @@ PATH
GEM
remote: https://rubygems.org/
specs:
awesome_print (1.6.1)
columnize (0.9.0)
debugger (1.6.8)
columnize (>= 0.3.1)
debugger-linecache (~> 1.2.0)
debugger-ruby_core_source (~> 1.3.5)
debugger-linecache (1.2.0)
debugger-ruby_core_source (1.3.8)
awesome_print (1.8.0)
diff-lcs (1.2.5)
faraday (0.8.11)
multipart-post (~> 1.2.0)
Expand All @@ -37,20 +30,19 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.4.0)
rspec-support (3.4.1)
yajl-ruby (1.1.0)
yajl-ruby (1.3.1)

PLATFORMS
ruby

DEPENDENCIES
awesome_print (~> 1.6.1)
debugger (~> 1.6.8)
awesome_print (~> 1.8.0)
faraday (~> 0.8.11)
multi_json (~> 1.3.5)
rake (~> 0.9.2)
rspec (~> 3.4.0)
seatgeek!
yajl-ruby (~> 1.1.0)
yajl-ruby (~> 1.3.1)

BUNDLED WITH
1.11.2
1.15.4

0 comments on commit 5144a2c

Please sign in to comment.