From e165f1de9ff92c697fa0a1a41c965f4768f190cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Tue, 12 Jan 2016 13:32:43 +0100 Subject: [PATCH] updates dependencies --- Gemfile | 2 +- Gemfile.lock | 40 ++++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Gemfile b/Gemfile index 9f03d3da7..5430c9c41 100644 --- a/Gemfile +++ b/Gemfile @@ -24,7 +24,7 @@ gem 'devise' gem 'omniauth' gem 'omniauth-twitter' gem 'omniauth-facebook', '~> 3.0.0' -gem 'omniauth-google-oauth2', '~> 0.2.10' +gem 'omniauth-google-oauth2', '~> 0.3.0' gem 'kaminari' gem 'ancestry' diff --git a/Gemfile.lock b/Gemfile.lock index f0f5a9dbe..4756e3aed 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -67,9 +67,9 @@ GEM arel (6.0.3) ast (2.2.0) bcrypt (3.1.10) - browser (1.0.1) + browser (1.1.0) builder (3.2.2) - bullet (4.14.10) + bullet (5.0.0) activesupport (>= 3.0.0) uniform_notifier (~> 1.9.0) byebug (8.2.1) @@ -96,7 +96,7 @@ GEM rack-test (>= 0.5.4) xpath (~> 2.0) chronic (0.10.2) - ckeditor (4.1.5) + ckeditor (4.1.6) cocaine orm_adapter (~> 0.5.0) climate_control (0.0.3) @@ -173,7 +173,7 @@ GEM fuubar (2.0.0) rspec (~> 3.0) ruby-progressbar (~> 1.4) - geocoder (1.2.13) + geocoder (1.2.14) globalid (0.3.6) activesupport (>= 4.1.0) groupdate (2.5.0) @@ -229,7 +229,7 @@ GEM multipart-post (2.0.0) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (3.0.1) + net-ssh (3.0.2) netrc (0.11.0) newrelic_rpm (3.14.1.311) nokogiri (1.6.7.1) @@ -247,23 +247,23 @@ GEM rack (>= 1.0, < 3) omniauth-facebook (3.0.0) omniauth-oauth2 (~> 1.2) - omniauth-google-oauth2 (0.2.10) + omniauth-google-oauth2 (0.3.0) addressable (~> 2.3) jwt (~> 1.0) multi_json (~> 1.3) omniauth (>= 1.1.1) - omniauth-oauth2 (~> 1.3.1) + omniauth-oauth2 (>= 1.3.1) omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.3.1) + omniauth-oauth2 (1.4.0) oauth2 (~> 1.0) omniauth (~> 1.2) omniauth-twitter (1.2.1) json (~> 1.3) omniauth-oauth (~> 1.1) orm_adapter (0.5.0) - paranoia (2.1.4) + paranoia (2.1.5) activerecord (~> 4.0) parser (2.2.3.0) ast (>= 1.1, < 3.0) @@ -310,9 +310,9 @@ GEM thor (>= 0.18.1, < 2.0) raindrops (0.15.0) rake (10.4.2) - redcarpet (3.3.3) + redcarpet (3.3.4) referer-parser (0.3.0) - request_store (1.2.1) + request_store (1.3.0) responders (2.1.1) railties (>= 4.2.0, < 5.1) rest-client (1.8.0) @@ -331,7 +331,7 @@ GEM rspec-expectations (3.4.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.4.0) - rspec-mocks (3.4.0) + rspec-mocks (3.4.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.4.0) rspec-rails (3.4.0) @@ -344,14 +344,14 @@ GEM rspec-support (~> 3.4.0) rspec-support (3.4.1) ruby-progressbar (1.7.5) - sass (3.4.20) + sass (3.4.21) sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sassc (1.8.2) + sassc (1.8.3) bundler ffi (~> 1.9.6) sass (>= 3.3.0) @@ -369,14 +369,14 @@ GEM nokogiri (>= 1.4.0) nori (~> 2.4) wasabi (~> 3.4) - simple_captcha2 (0.3.4) + simple_captcha2 (0.4.0) rails (>= 4.1) simplecov (0.11.1) docile (~> 1.1.0) json (~> 1.8) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) - spring (1.6.1) + spring (1.6.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) sprockets (3.5.2) @@ -395,11 +395,11 @@ GEM thor (0.19.1) thread (0.2.2) thread_safe (0.3.5) - tilt (2.0.1) + tilt (2.0.2) tins (1.6.0) turbolinks (2.5.3) coffee-rails - turnout (2.2.0) + turnout (2.2.1) rack (~> 1.3) rack-accept (~> 0.4) tzinfo (1.2.2) @@ -477,7 +477,7 @@ DEPENDENCIES newrelic_rpm (~> 3.14) omniauth omniauth-facebook (~> 3.0.0) - omniauth-google-oauth2 (~> 0.2.10) + omniauth-google-oauth2 (~> 0.3.0) omniauth-twitter paranoia pg @@ -504,4 +504,4 @@ DEPENDENCIES whenever BUNDLED WITH - 1.10.6 + 1.11.2