aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2015-12-16 10:33:09 -0700
committerSean Griffin <sean@seantheprogrammer.com>2015-12-16 10:33:09 -0700
commit48c4edc4a670d1646a153d928f18531f115c0666 (patch)
treefc49ac48a6820f7687021b744bd22c916892aba9 /Gemfile
parent7241498e51120b9847a8bc16cf48551db0f3e216 (diff)
downloadrails-48c4edc4a670d1646a153d928f18531f115c0666.tar.gz
rails-48c4edc4a670d1646a153d928f18531f115c0666.tar.bz2
rails-48c4edc4a670d1646a153d928f18531f115c0666.zip
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"
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 034f87748e..f23ca4d9c9 100644
--- a/Gemfile
+++ b/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