From 661dc37e224efea0ef211d02afe5eda9501fd581 Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.c.richter@gmail.com>
Date: Mon, 20 Apr 2015 21:18:21 -0500
Subject: [PATCH] Fix bcrypt version again, sync gemfiles

---
 Gemfile                         |  4 ++--
 Gemfile.lock                    |  1 -
 gemfiles/rails-4.2.edge.gemfile | 16 +++++++---------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index 62fa9838..aad17e9c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,3 @@
-# Please be sure to update the experimental buildfiles in the gemfiles folder
-
 source 'https://rubygems.org'
 
 gem 'rails', '4.1.0'
@@ -32,3 +30,5 @@ group :test, :development do
   gem 'sqlite3'
   gem 'tzinfo-data' # addresses a bug when working on Windows
 end
+
+# Please be sure to update the experimental buildfiles in the gemfiles folder
diff --git a/Gemfile.lock b/Gemfile.lock
index f22009ef..e5fc9a18 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,6 @@ GEM
     aws-sdk-v1 (1.64.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
-    bcrypt (3.1.10)
     bcrypt (3.1.10-x86-mingw32)
     bootplus-rails (1.0.0)
     builder (3.2.2)
diff --git a/gemfiles/rails-4.2.edge.gemfile b/gemfiles/rails-4.2.edge.gemfile
index 3a68d6d0..1c1918f4 100644
--- a/gemfiles/rails-4.2.edge.gemfile
+++ b/gemfiles/rails-4.2.edge.gemfile
@@ -1,21 +1,19 @@
 source 'https://rubygems.org'
 
-source 'https://rubygems.org'
-
-gem 'bcrypt-ruby', '~> 3.0.1'
-gem 'rails', '4.1.0'
+gem 'rails', '4.2.1'
 gem 'jquery-rails'
-gem 'sass-rails', '~> 4.0.3', :require => 'sass'
+gem 'sass-rails', '~> 4.0.3', require: 'sass'
 gem 'coffee-rails', '~> 4.0.0'
 gem 'paperclip', '~> 4.2.0'
+gem 'rmagick', '2.13.4'
+gem 'aws-sdk', '~> 1.50'
+gem 'bcrypt', '~> 3.1.10'
 
 group :production do
   gem 'less-rails'
   gem 'less-rails-fontawesome'
   gem 'uglifier', '>= 1.3.0'
   gem 'bootplus-rails'
-  gem 'rmagick'
-  gem 'aws-sdk', '~> 1.50'
 end
 
 group :test, :production do
@@ -26,8 +24,8 @@ end
 group :test, :development do
   gem 'capybara'
   gem 'selenium-webdriver'
-  gem 'coveralls', :require => false
-  gem 'simplecov', :require => false
+  gem 'coveralls', require: false
+  gem 'simplecov', require: false
   gem 'rubocop', require: false
   gem 'sqlite3'
   gem 'tzinfo-data' # addresses a bug when working on Windows