fixes conflicts with master

Gemfile

@@ -24,7 +24,7 @@ gem 'devise'
 gem 'omniauth'
 gem 'omniauth-twitter'
 gem 'omniauth-facebook'
-gem 'omniauth-google-oauth2'
+gem 'omniauth-google-oauth2', '~> 0.2.7'
 
 gem 'kaminari'
 gem 'ancestry'
@@ -44,7 +44,7 @@ gem 'rinku', require: 'rails_rinku'
 gem 'savon'
 gem 'dalli'
 gem 'rollbar', '~> 2.3.0'
-gem 'delayed_job_active_record'
+gem 'delayed_job_active_record', '~> 4.1.0'
 gem 'daemons'
 gem 'devise-async'
 gem 'newrelic_rpm', '~> 3.13.1'

Gemfile.lock

@@ -123,11 +123,11 @@ GEM
     dalli (2.7.4)
     database_cleaner (1.5.0)
     debug_inspector (0.0.2)
-    delayed_job (4.0.6)
+    delayed_job (4.1.1)
       activesupport (>= 3.0, < 5.0)
-    delayed_job_active_record (4.0.3)
+    delayed_job_active_record (4.1.0)
-      activerecord (>= 3.0, < 5.0)
+      activerecord (>= 3.0, < 5)
-      delayed_job (>= 3.0, < 4.1)
+      delayed_job (>= 3.0, < 5)
     devise (3.5.2)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -245,9 +245,12 @@ GEM
       rack (~> 1.0)
     omniauth-facebook (2.0.1)
       omniauth-oauth2 (~> 1.2)
-    omniauth-google-oauth2 (0.2.6)
+    omniauth-google-oauth2 (0.2.7)
-      omniauth (> 1.0)
+      addressable (~> 2.3)
-      omniauth-oauth2 (~> 1.1)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      omniauth (>= 1.1.1)
+      omniauth-oauth2 (>= 1.1.1)
     omniauth-oauth (1.1.0)
       oauth
       omniauth (~> 1.0)
@@ -430,7 +433,7 @@ DEPENDENCIES
   daemons
   dalli
   database_cleaner
-  delayed_job_active_record
+  delayed_job_active_record (~> 4.1.0)
   devise
   devise-async
   email_spec
@@ -449,7 +452,7 @@ DEPENDENCIES
   newrelic_rpm (~> 3.13.1)
   omniauth
   omniauth-facebook
-  omniauth-google-oauth2
+  omniauth-google-oauth2 (~> 0.2.7)
   omniauth-twitter
   paranoia
   pg

db/migrate/20150926115929_adds_resilient_locked_until_default.rb

@@ -0,0 +1,11 @@
+class AddsResilientLockedUntilDefault < ActiveRecord::Migration
+
+  def up
+    change_column_default :locks, :locked_until, Time.new(2000, 1, 1,  1,  1,  1)
+  end
+
+  def down
+    change_column_default :locks, :locked_until, Time.now
+  end
+
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150926113052) do
+ActiveRecord::Schema.define(version: 20150926115929) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -161,7 +161,7 @@ ActiveRecord::Schema.define(version: 20150926113052) do
   create_table "locks", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "tries",        default: 0
-    t.datetime "locked_until", default: '2015-09-15 07:56:29', null: false
+    t.datetime "locked_until", default: '2000-01-01 00:01:01', null: false
     t.datetime "created_at",                                   null: false
     t.datetime "updated_at",                                   null: false
   end