diff options
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 6a8c96913..7aa2e84b5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -238,6 +238,9 @@ GEM faraday_middleware (0.13.1) faraday (>= 0.7.4, < 1.0) ffi (1.12.2) + ffi-compiler (1.0.1) + ffi (>= 1.0.0) + rake fixture_builder (0.5.2) activerecord (>= 2) activesupport (>= 2) @@ -313,14 +316,16 @@ GEM tilt (>= 1.2) hashdiff (1.0.1) hashie (4.1.0) - http (3.3.0) + http (4.3.0) addressable (~> 2.3) http-cookie (~> 1.0) - http-form_data (~> 2.0) - http_parser.rb (~> 0.6.0) + http-form_data (~> 2.2) + http-parser (~> 1.2.0) http-cookie (1.0.3) domain_name (~> 0.5) http-form_data (2.3.0) + http-parser (1.2.1) + ffi-compiler (>= 1.0, < 2.0) http_accept_language (2.1.1) http_parser.rb (0.6.0) httparty (0.18.0) @@ -725,11 +730,11 @@ GEM sync to_regexp (0.2.1) turbo_dev_assets (0.0.2) - twitter (6.2.0) + twitter (7.0.0) addressable (~> 2.3) buftok (~> 0.2.0) equalizer (~> 0.0.11) - http (~> 3.0) + http (~> 4.0) http-form_data (~> 2.0) http_parser.rb (~> 0.6.0) memoizable (~> 0.4.0) @@ -920,7 +925,7 @@ DEPENDENCIES string-direction (= 1.2.2) timecop (= 0.9.1) turbo_dev_assets (= 0.0.2) - twitter (= 6.2.0) + twitter (= 7.0.0) twitter-text (= 1.14.7) typhoeus (= 1.3.1) uglifier (= 4.2.0) |