From 0cc00e75e1c5574e48f9252e6272f6c1774d3050 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Sat, 19 Mar 2016 12:12:58 +0100
Subject: [PATCH 1/3] updates dependencies

---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 6ffbb5c1d..ccc231b18 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -201,8 +201,8 @@ GEM
       terminal-table (>= 1.5.1)
     initialjs-rails (0.2.0.1)
       railties (>= 3.1, < 5.0)
-    jquery-rails (4.1.0)
-      rails-dom-testing (~> 1.0)
+    jquery-rails (4.1.1)
+      rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (5.0.5)
@@ -311,7 +311,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.15.0)
-    rake (11.0.1)
+    rake (11.1.1)
     redcarpet (3.3.4)
     referer-parser (0.3.0)
     request_store (1.3.0)

From 5b44de3bba95337307f838fead46940bb1a75c12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Sat, 19 Mar 2016 12:15:02 +0100
Subject: [PATCH 2/3] makes description nil if blank

---
 app/controllers/admin/valuators_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/admin/valuators_controller.rb b/app/controllers/admin/valuators_controller.rb
index 0f35dc676..4561e7579 100644
--- a/app/controllers/admin/valuators_controller.rb
+++ b/app/controllers/admin/valuators_controller.rb
@@ -27,6 +27,7 @@ class Admin::ValuatorsController < Admin::BaseController
 
   private
     def create_params
+      params[:valuator][:description] = nil if params[:valuator][:description].blank?
       params.require(:valuator).permit(:user_id, :description)
     end
 end

From e7deea8d026a70fad1fdc9170eb991315f37ad6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Sat, 19 Mar 2016 12:23:50 +0100
Subject: [PATCH 3/3] updates gemfile

---
 Gemfile      |  2 +-
 Gemfile.lock | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5efa7d67b..675e738b1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,7 +25,7 @@ gem 'devise', '~> 3.5.6'
 gem 'omniauth'
 gem 'omniauth-twitter'
 gem 'omniauth-facebook', '~> 3.0.0'
-gem 'omniauth-google-oauth2', '~> 0.3.0'
+gem 'omniauth-google-oauth2', '~> 0.4.0'
 
 gem 'kaminari'
 gem 'ancestry'
diff --git a/Gemfile.lock b/Gemfile.lock
index ccc231b18..18fa95bd9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -208,7 +208,7 @@ GEM
     jquery-ui-rails (5.0.5)
       railties (>= 3.2.16)
     json (1.8.3)
-    jwt (1.5.1)
+    jwt (1.5.3)
     kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -239,19 +239,19 @@ GEM
       mini_portile2 (~> 2.0.0.rc2)
     nori (2.6.0)
     oauth (0.5.0)
-    oauth2 (1.1.0)
+    oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0, < 1.5.2)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
+      rack (~> 1.2)
     omniauth (1.3.1)
       hashie (>= 1.2, < 4)
       rack (>= 1.0, < 3)
     omniauth-facebook (3.0.0)
       omniauth-oauth2 (~> 1.2)
-    omniauth-google-oauth2 (0.3.1)
-      jwt (~> 1.0)
+    omniauth-google-oauth2 (0.4.1)
+      jwt (~> 1.5.2)
       multi_json (~> 1.3)
       omniauth (>= 1.1.1)
       omniauth-oauth2 (>= 1.3.1)
@@ -471,7 +471,7 @@ DEPENDENCIES
   newrelic_rpm (~> 3.14)
   omniauth
   omniauth-facebook (~> 3.0.0)
-  omniauth-google-oauth2 (~> 0.3.0)
+  omniauth-google-oauth2 (~> 0.4.0)
   omniauth-twitter
   paranoia
   pg