Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Use excon gem

Now that the changes from Evan's fork have been pulled in and released,
we can use the excon gem again.
  • Loading branch information...
commit 968eeddc54e3dd507962349b5edcb8b033d03320 1 parent 63388a4
@sferik sferik authored
View
7 Gemfile
@@ -3,12 +3,7 @@ source 'https://rubygems.org'
gem 'rails', '~> 3.0.10'
gem 'clearance'
-# Use a fork of excon to resolve the issue discussed in:
-# https://github.com/geemus/excon/pull/87
-#
-# It's should be safe to remove this line once this pull request is merged and
-# a new gem version of excon is released.
-gem 'excon', :git => 'git://github.com/evanphx/excon.git'
+gem 'excon'
gem 'fog'
gem 'gchartrb', :require => 'google_chart'
gem 'gravtastic'
View
20 Gemfile.lock
@@ -1,9 +1,3 @@
-GIT
- remote: git://github.com/evanphx/excon.git
- revision: 24ffc60420c09cecb46e1d7c177a8919627057a9
- specs:
- excon (0.7.12)
-
GEM
remote: https://rubygems.org/
specs:
@@ -82,21 +76,21 @@ GEM
diff-lcs (1.1.3)
erubis (2.6.6)
abstract (>= 1.0.0)
+ excon (0.9.1)
factory_girl (2.3.2)
activesupport
factory_girl_rails (1.4.0)
factory_girl (~> 2.3.0)
railties (>= 3.0.0)
ffi (1.0.11)
- fog (1.1.1)
+ fog (0.7.2)
builder
- excon (~> 0.7.4)
- formatador (~> 0.2.0)
+ excon (>= 0.6.1)
+ formatador (>= 0.1.3)
+ json
mime-types
- multi_json (~> 1.0.3)
- net-scp (~> 1.0.4)
net-ssh (>= 2.1.3)
- nokogiri (~> 1.5.0)
+ nokogiri (>= 1.4.4)
ruby-hmac
formatador (0.2.1)
gchartrb (0.8)
@@ -234,7 +228,7 @@ DEPENDENCIES
database_cleaner
delayed_job (~> 3.0.0.pre)
delayed_job_active_record
- excon!
+ excon
factory_girl_rails
fog
gchartrb
View
BIN  vendor/cache/excon-0.9.1.gem
Binary file not shown
View
BIN  vendor/cache/fog-0.7.2.gem
Binary file not shown
View
BIN  vendor/cache/fog-1.1.1.gem
Binary file not shown
Please sign in to comment.
Something went wrong with that request. Please try again.