Merge d355b4b into eb48fd3

Gemfile

@@ -92,14 +92,15 @@ gem 'bootstrap-kaminari-views', '~> 0.0.3'
 gem 'bundler', '>= 1.5.0'
 gem 'coffee-rails', '~> 4.2'
 gem 'daemons', '~> 1.1.9'
-gem 'delayed_job', '~> 4.1.0'
+gem 'delayed_job', github: 'dsander/delayed_job', branch: 'rails51'
 gem 'delayed_job_active_record', github: 'dsander/delayed_job_active_record', branch: 'rails5'
-gem 'devise','~> 4.2.0'
+gem 'devise',github: 'jcoyne/devise', branch: 'rails-5.1'
+gem 'responders', github: 'plataformatec/responders', ref: '153f2c6'
 gem 'em-http-request', '~> 1.1.2'
 gem 'faraday', '~> 0.9'
 gem 'faraday_middleware', github: 'lostisland/faraday_middleware', branch: 'master'  # '>= 0.10.1'
 gem 'feedjira', '~> 2.1'
-gem 'font-awesome-sass', '~> 4.3.2'
+gem 'font-awesome-sass', '~> 4.7.0'
 gem 'foreman', '~> 0.63.0'
 gem 'geokit', '~> 1.8.4'
 gem 'geokit-rails', '~> 2.2.0'
@@ -117,9 +118,9 @@ gem 'mini_magick'
 gem 'multi_xml'
 gem 'nokogiri'
 gem 'omniauth', '~> 1.3.1'
-gem 'rails', '~> 5.0.1'
+gem 'rails', '~> 5.1.0'
 gem 'rufus-scheduler', '~> 3.3.2', require: false
-gem 'sass-rails',   '~> 5.0.6'
+gem 'sass-rails', '~> 5.0'
 gem 'select2-rails', '~> 3.5.4'
 gem 'spectrum-rails'
 gem 'therubyracer', '~> 0.12.2'
@@ -148,6 +149,7 @@ group :development do
 
   group :test do
     gem 'coveralls', '~> 0.7.4', require: false
+    gem 'capybara', '~> 2.13.0'
     gem 'capybara-select2', require: false
     gem 'delorean'
     gem 'poltergeist'
@@ -162,7 +164,6 @@ group :development do
     gem 'shoulda-matchers'
     gem 'vcr'
     gem 'webmock', '~> 1.17.4', require: false
-    gem 'database_cleaner', '~> 1.5.3'
   end
 end