aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2017-04-02 21:31:52 +0930
committerMatthew Draper <matthew@trebex.net>2017-04-02 21:32:33 +0930
commit19ae6597b844e11842971c4f9298d5fc7014704d (patch)
treec1f6ea43fdf129be8f687d41a2ea47d77131310e
parent82a7593e3ac427215a280dae5bd6cd42f9404650 (diff)
downloadrails-19ae6597b844e11842971c4f9298d5fc7014704d.tar.gz
rails-19ae6597b844e11842971c4f9298d5fc7014704d.tar.bz2
rails-19ae6597b844e11842971c4f9298d5fc7014704d.zip
Revert "Avoid broken faraday 0.12.0 release"
This reverts commit 82a7593e3ac427215a280dae5bd6cd42f9404650.
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock1
2 files changed, 0 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 0b01b3ff5e..5077c257d9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -86,7 +86,6 @@ group :cable do
gem "blade", require: false, platforms: [:ruby]
gem "blade-sauce_labs_plugin", require: false, platforms: [:ruby]
- gem "faraday", "~> 0.11.0" # https://github.com/lostisland/faraday/issues/679
gem "sprockets-export", require: false
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 5448c2f966..4feb8e2968 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -390,7 +390,6 @@ DEPENDENCIES
delayed_job_active_record
em-hiredis
erubis (~> 2.7.0)
- faraday (~> 0.11.0)
hiredis
jquery-rails
json (>= 2.0.0)