From e8082e76104bca38e7ea14655223b27b7dbfa5af Mon Sep 17 00:00:00 2001 From: echarp Date: Sun, 6 Sep 2015 18:47:06 +0200 Subject: [PATCH] Bundle update --- Gemfile.lock | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6cb7a815..719d82f1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -131,12 +131,14 @@ GEM devise-i18n (0.12.1) differ (0.1.2) docile (1.1.5) + domain_name (0.5.24) + unf (>= 0.0.5, < 1.0.0) em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) email_validator (1.6.0) activemodel - equalizer (0.0.11) + equalizer (0.0.10) erubis (2.7.0) eventmachine (1.0.8) execjs (2.6.0) @@ -206,8 +208,14 @@ GEM haml (~> 4.0.0) nokogiri (~> 1.6.0) ruby_parser (~> 3.5) - http (0.6.4) + http (0.9.4) + addressable (~> 2.3) + http-cookie (~> 1.0) + http-form_data (~> 1.0.1) http_parser.rb (~> 0.6.0) + http-cookie (1.0.2) + domain_name (~> 0.5) + http-form_data (1.0.1) http_accept_language (2.0.5) http_parser.rb (0.6.0) i18n (0.7.0) @@ -301,7 +309,7 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.2) loofah (~> 2.0) - rails-i18n (4.0.4) + rails-i18n (4.0.5) i18n (~> 0.6) railties (~> 4.0) railties (4.2.4) @@ -387,18 +395,18 @@ GEM thor (0.19.1) thread_safe (0.3.5) tilt (1.4.1) - tinymce-rails (4.2.4) + tinymce-rails (4.2.5) railties (>= 3.1.1) tinymce-rails-langs (4.20140129) tinymce-rails (~> 4.0) turbolinks (2.5.3) coffee-rails - twitter (5.14.0) + twitter (5.15.0) addressable (~> 2.3) buftok (~> 0.2.0) - equalizer (~> 0.0.9) + equalizer (= 0.0.10) faraday (~> 0.9.0) - http (~> 0.6.0) + http (>= 0.4, < 0.10) http_parser.rb (~> 0.6.0) json (~> 1.8) memoizable (~> 0.4.0) @@ -409,6 +417,9 @@ GEM uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.1) warden (1.2.3) rack (>= 1.0) web-console (2.2.1)