Skip to content

Commit

Permalink
MASTER: Remove restriction to unsafe yajl version
Browse files Browse the repository at this point in the history
  • Loading branch information
will3216 committed Nov 30, 2017
1 parent 320c078 commit 0f67fc8
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
16 changes: 9 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
trubl (1.9.14)
trubl (1.9.15)
activesupport (~> 4.2)
faraday (~> 0.12.2)
hashie (~> 3.5.6)
Expand All @@ -11,7 +11,7 @@ PATH
oauth2 (~> 1.0)
rake
typhoeus (= 0.6.8)
yajl-ruby (~> 1.2.1)
yajl-ruby

GEM
remote: https://rubygems.org/
Expand All @@ -24,11 +24,12 @@ GEM
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
coderay (1.1.2)
concurrent-ruby (1.0.5)
crack (0.4.3)
safe_yaml (~> 1.0.0)
diff-lcs (1.3)
docile (1.1.5)
ethon (0.10.1)
ethon (0.11.0)
ffi (>= 1.3.0)
faraday (0.12.2)
multipart-post (>= 1.2, < 3)
Expand All @@ -41,7 +42,8 @@ GEM
multipart-post
httparty (0.15.6)
multi_xml (>= 0.5.2)
i18n (0.8.6)
i18n (0.9.1)
concurrent-ruby (~> 1.0)
json (1.8.6)
jwt (1.5.6)
method_source (0.9.0)
Expand All @@ -61,7 +63,7 @@ GEM
method_source (~> 0.9.0)
public_suffix (3.0.0)
rack (2.0.3)
rake (12.1.0)
rake (12.3.0)
rspec (3.6.0)
rspec-core (~> 3.6.0)
rspec-expectations (~> 3.6.0)
Expand Down Expand Up @@ -89,13 +91,13 @@ GEM
timecop (0.9.1)
typhoeus (0.6.8)
ethon (>= 0.7.0)
tzinfo (1.2.3)
tzinfo (1.2.4)
thread_safe (~> 0.1)
webmock (1.24.6)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
yajl-ruby (1.2.2)
yajl-ruby (1.3.1)
yard (0.9.9)

PLATFORMS
Expand Down
2 changes: 1 addition & 1 deletion lib/trubl/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module Trubl
class Version
MAJOR = 1 unless defined? Trubl::Version::MAJOR
MINOR = 9 unless defined? Trubl::Version::MINOR
PATCH = 14 unless defined? Trubl::Version::PATCH
PATCH = 15 unless defined? Trubl::Version::PATCH

class << self

Expand Down
2 changes: 1 addition & 1 deletion trubl.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Gem::Specification.new do |spec|

if RUBY_ENGINE == 'ruby'
spec.add_dependency 'typhoeus', '0.6.8'
spec.add_dependency 'yajl-ruby', '~> 1.2.1'
spec.add_dependency 'yajl-ruby'
end

spec.add_development_dependency 'yard'
Expand Down

0 comments on commit 0f67fc8

Please sign in to comment.