Avoid conditionals in the Gemfile

"conditionals in the gemfile creates conditional code in the Gemfile.lock.
Since it is checked in the repository I think it is better to avoid it"

Gemfile

@@ -27,9 +27,11 @@ gem 'sass-rails', github: 'rails/sass-rails', branch: 'master'
 # require: false so bcrypt is loaded only when has_secure_password is used.
 # This is to avoid Active Model (and by extension the entire framework)
 # being dependent on a binary library.
-if Bundler::WINDOWS
+platforms :mingw, :x64_mingw, :mswin, :mswin64 do
   gem 'bcrypt-ruby', '~> 3.0.0', require: false
-else
+end
+
+platforms :ruby, :jruby, :rbx do
   gem 'bcrypt', '~> 3.1.10', require: false
 end
 

Gemfile.lock

@@ -168,9 +168,8 @@ GEM
     backburner (1.1.0)
       beaneater (~> 1.0)
       dante (> 0.1.5)
-    bcrypt (3.1.10)
-    bcrypt (3.1.10-x64-mingw32)
-    bcrypt (3.1.10-x86-mingw32)
+    bcrypt-ruby (3.0.1)
+    bcrypt-ruby (3.0.1-x86-mingw32)
     beaneater (1.0.0)
     benchmark-ips (2.3.0)
     builder (3.2.2)
@@ -238,10 +237,16 @@ GEM
     multi_json (1.11.2)
     mustache (1.0.2)
     mysql (2.9.1)
-    mysql2 (0.4.1)
+    mysql2 (0.4.2-x64-mingw32)
     nokogiri (1.6.7)
       mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.6.7-x64-mingw32)
+      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.6.7-x86-mingw32)
+      mini_portile2 (~> 2.0.0.rc2)
     pg (0.18.3)
+    pg (0.18.3-x64-mingw32)
+    pg (0.18.3-x86-mingw32)
     psych (2.0.15)
     que (0.11.2)
     racc (1.4.13)
@@ -299,6 +304,8 @@ GEM
       thor
       thread (~> 0.1.7)
     sqlite3 (1.3.11)
+    sqlite3 (1.3.11-x64-mingw32)
+    sqlite3 (1.3.11-x86-mingw32)
     stackprof (0.2.7)
     sucker_punch (1.6.0)
       celluloid (~> 0.17.2)
@@ -332,6 +339,7 @@ DEPENDENCIES
   arel!
   backburner
   bcrypt (~> 3.1.10)
+  bcrypt-ruby (~> 3.0.0)
   benchmark-ips
   byebug
   coffee-rails (~> 4.1.0)