Skip to content

Commit

Permalink
Merge pull request hotsh#803 from fmendez/fix-redirect-from-http-to-h…
Browse files Browse the repository at this point in the history
…ttps

Allows open-uri redirections between HTTP and HTTPS.
  • Loading branch information
wilkie committed Aug 5, 2014
2 parents fa2c05c + af53fda commit 72ac0dd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ gem "rsa", "~> 0.1.4"
gem "exceptional", "~> 2.0.32"
gem "newrelic_rpm", "~> 3.3.1"
gem "draper", "~> 0.11.1"
gem "open_uri_redirections", "~> 0.1.4"

# background job queue
gem "delayed_job", :git => "git://github.com/collectiveidea/delayed_job.git", :tag => "v2.1.4"
Expand Down
8 changes: 2 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ GEM
json (1.8.0)
launchy (2.0.5)
addressable (~> 2.2.6)
libv8 (3.11.8.17)
libxml-ruby (2.6.0)
mail (2.5.4)
mime-types (~> 1.16)
Expand Down Expand Up @@ -172,6 +171,7 @@ GEM
omniauth-twitter (1.0.0)
multi_json (~> 1.3)
omniauth-oauth (~> 1.0)
open_uri_redirections (0.1.4)
opub (0.0.1)
ostatus (0.0.12)
ratom (~> 0.7.0)
Expand Down Expand Up @@ -215,7 +215,6 @@ GEM
rdoc (3.12.2)
json (~> 1.4)
redcarpet (1.17.2)
ref (1.0.5)
rest-client (1.6.7)
mime-types (>= 1.16)
rsa (0.1.4)
Expand Down Expand Up @@ -243,9 +242,6 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
therubyracer (0.11.4)
libv8 (~> 3.11.8.12)
ref
thor (0.18.1)
tilt (1.4.1)
tire (0.4.3)
Expand Down Expand Up @@ -307,6 +303,7 @@ DEPENDENCIES
nokogiri (~> 1.5.0)
omniauth (~> 1.1.0)
omniauth-twitter (~> 1.0.0)
open_uri_redirections (~> 0.1.4)
opub (~> 0.0.1)
ostatus (~> 0.0.12)
osub (~> 0.0.6)
Expand All @@ -324,7 +321,6 @@ DEPENDENCIES
sass-rails (~> 3.2.5)
show_me_the_cookies (~> 1.1.0)
simplecov (~> 0.4.0)
therubyracer (~> 0.11.3)
tire (~> 0.4.1)
twitter (~> 4.8.0)
tzinfo (~> 0.3.29)
Expand Down

0 comments on commit 72ac0dd

Please sign in to comment.