nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3497 from movilla/update_gem_typhoeus

Browse source 
update gem typhoeus 0.4.2 [ci skip]
This commit is contained in:
Maxwell Salzberg 2012-08-14 11:09:00 -07:00
commit caa3344dff
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -99,7 +99,7 @@ gem 'acts-as-taggable-on', :git => "https://github.com/mbleigh/acts-as-taggable-
gem 'addressable', '~> 2.2', :require => 'addressable/uri' gem 'addressable', '~> 2.2', :require => 'addressable/uri'
gem 'http_accept_language', '~> 1.0.2' gem 'http_accept_language', '~> 1.0.2'
gem 'typhoeus' gem 'typhoeus', '~> 0.4.2'
# views # views

4
Gemfile.lock
View file

@ -440,7 +440,7 @@ GEM
faraday (~> 0.7) faraday (~> 0.7)
multi_json (~> 1.0) multi_json (~> 1.0)
simple_oauth (~> 0.1) simple_oauth (~> 0.1)
typhoeus (0.3.3) typhoeus (0.4.2)
mime-types mime-types
tzinfo (0.3.33) tzinfo (0.3.33)
uglifier (1.2.4) uglifier (1.2.4)
@ -547,7 +547,7 @@ DEPENDENCIES
thin (~> 1.3.1) thin (~> 1.3.1)
timecop timecop
twitter (= 2.0.2) twitter (= 2.0.2)
typhoeus typhoeus (~> 0.4.2)
uglifier uglifier
unicorn (~> 4.3.0) unicorn (~> 4.3.0)
webmock (~> 1.7) webmock (~> 1.7)