diff --git a/Gemfile b/Gemfile index b54512c7a..d877dac1f 100644 --- a/Gemfile +++ b/Gemfile @@ -33,7 +33,7 @@ gem 'omniauth-facebook' gem 'omniauth-linkedin' gem 'omniauth-google-oauth2' -gem 'twitter', '~> 5.13.0' +gem 'twitter' gem 'koala' gem 'mail', '~> 2.5.0' diff --git a/Gemfile.lock b/Gemfile.lock index e07a56aff..7096bb583 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -41,12 +41,12 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.3.8) + addressable (2.4.0) arel (6.0.3) ast (2.1.0) astrolabe (1.3.1) parser (~> 2.2) - autoprefixer-rails (6.1.1) + autoprefixer-rails (6.1.2) execjs json biz (1.3.3) @@ -70,10 +70,11 @@ GEM coffee-script-source execjs coffee-script-source (1.10.0) - coffeelint (1.11.0) + coffeelint (1.14.0) coffee-script execjs json + concurrent-ruby (1.0.0) daemons (1.2.3) delayed_job (4.1.1) activesupport (>= 3.0, < 5.0) @@ -82,6 +83,8 @@ GEM delayed_job (>= 3.0, < 5) diffy (3.0.7) docile (1.1.5) + domain_name (0.5.25) + unf (>= 0.0.5, < 1.0.0) eco (1.0.0) coffee-script eco-source @@ -90,7 +93,7 @@ GEM em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) - equalizer (0.0.11) + equalizer (0.0.10) erubis (2.7.0) eventmachine (1.0.8) execjs (2.6.0) @@ -116,8 +119,14 @@ GEM guard-compat (~> 1.0) multi_json (~> 1.8) hashie (3.4.3) - http (0.6.4) + http (0.9.8) + 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_parser.rb (0.6.0) i18n (0.7.0) icalendar (2.3.0) @@ -243,7 +252,7 @@ GEM tins (<= 1.6.0) ruby-progressbar (1.7.5) rubyzip (1.1.7) - sass (3.4.19) + sass (3.4.20) sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) sass (~> 3.1) @@ -258,7 +267,7 @@ GEM shellany (0.0.1) simple-rss (1.3.1) simple_oauth (0.3.1) - simplecov (0.11.0) + simplecov (0.11.1) docile (~> 1.1.0) json (~> 1.8) simplecov-html (~> 0.10.0) @@ -266,8 +275,9 @@ GEM simplecov-rcov (0.2.3) simplecov (>= 0.4.1) slop (3.6.0) - spring (1.4.4) - sprockets (3.4.1) + spring (1.5.0) + sprockets (3.5.2) + concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (2.3.3) actionpack (>= 3.0) @@ -286,12 +296,12 @@ GEM treetop (1.4.15) polyglot polyglot (>= 0.3.1) - twitter (5.13.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) @@ -302,6 +312,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) websocket (1.2.2) writeexcel (1.0.5) @@ -355,9 +368,9 @@ DEPENDENCIES sqlite3 test-unit therubyracer - twitter (~> 5.13.0) + twitter uglifier writeexcel BUNDLED WITH - 1.10.5 + 1.10.6