aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorT.J. Schuck <tj@getharvest.com>2014-02-21 15:58:09 -0500
committerT.J. Schuck <tj@getharvest.com>2014-02-25 09:52:32 -0500
commit53f1ab523bbf4f1764e3e24f26c4ed1db61b69e7 (patch)
tree17ea353cd0715cc7350989f649253588cfd3286e /Gemfile
parent6d35190bad0b054c9a1f4c736dc4dda32a7ebc91 (diff)
downloadrails-53f1ab523bbf4f1764e3e24f26c4ed1db61b69e7.tar.gz
rails-53f1ab523bbf4f1764e3e24f26c4ed1db61b69e7.tar.bz2
rails-53f1ab523bbf4f1764e3e24f26c4ed1db61b69e7.zip
Bump version of bcrypt gem
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 753b1d423a..4a891bf6b5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,11 +8,15 @@ gemspec
gem 'mocha', '~> 0.14', require: false
gem 'rack-cache', '~> 1.2'
-gem 'bcrypt-ruby', '~> 3.1.2'
gem 'jquery-rails', '~> 3.1.0'
gem 'turbolinks'
gem 'coffee-rails', '~> 4.0.0'
+# require: false so bcrypt is loaded only when has_secure_password is used.
+# This is to avoid ActiveModel (and by extension the entire framework)
+# being dependent on a binary library.
+gem 'bcrypt', '~> 3.1.7', require: false
+
# This needs to be with require false to avoid
# it being automatically loaded by sprockets
gem 'uglifier', '>= 1.3.0', require: false