aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2017-04-02 18:18:52 +0930
committerMatthew Draper <matthew@trebex.net>2017-04-02 18:18:52 +0930
commit82a7593e3ac427215a280dae5bd6cd42f9404650 (patch)
treeb4b72d03a942a69a26c8ecfb0b512505d62407cc
parent2458e078187369c20957cf555902cf00b96aa4df (diff)
downloadrails-82a7593e3ac427215a280dae5bd6cd42f9404650.tar.gz
rails-82a7593e3ac427215a280dae5bd6cd42f9404650.tar.bz2
rails-82a7593e3ac427215a280dae5bd6cd42f9404650.zip
Avoid broken faraday 0.12.0 release
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock3
2 files changed, 3 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 5077c257d9..0b01b3ff5e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -86,6 +86,7 @@ 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 0c9337bf2a..5448c2f966 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -390,6 +390,7 @@ DEPENDENCIES
delayed_job_active_record
em-hiredis
erubis (~> 2.7.0)
+ faraday (~> 0.11.0)
hiredis
jquery-rails
json (>= 2.0.0)
@@ -433,4 +434,4 @@ DEPENDENCIES
websocket-client-simple!
BUNDLED WITH
- 1.14.5
+ 1.14.6