aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Eilertsen <haraldei@anduin.net>2019-05-11 20:35:09 +0200
committerHarald Eilertsen <haraldei@anduin.net>2019-05-11 20:35:09 +0200
commitbdfb10eddf79184dbb5a198b07816faf563f0eef (patch)
treeacd4686c8e1261d2828827578268055f1a3e8289
parent9c63899a81a251d60e510512b8168d528f8d5b9d (diff)
downloadhmnoweb-bdfb10eddf79184dbb5a198b07816faf563f0eef.tar.gz
hmnoweb-bdfb10eddf79184dbb5a198b07816faf563f0eef.tar.bz2
hmnoweb-bdfb10eddf79184dbb5a198b07816faf563f0eef.zip
Use git version of bcrypt until a gem with FreeBSD 12.x support is released.
-rw-r--r--Gemfile4
-rw-r--r--Gemfile.lock9
2 files changed, 10 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index f21dc0f..0724c02 100644
--- a/Gemfile
+++ b/Gemfile
@@ -37,7 +37,9 @@ end
gem 'jquery-rails', '~> 2.3.0'
# To use ActiveModel has_secure_password
-gem 'bcrypt', '~> 3.1.0'
+# Use git version for FreeBSD 12.x compatibility until new
+# gem (> 3.1.12) is released.
+gem 'bcrypt', '~> 3.1.0', git: "https://github.com/codahale/bcrypt-ruby.git"
# Use unicorn as the app server
gem 'puma'
diff --git a/Gemfile.lock b/Gemfile.lock
index 742c15c..b833fe5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,6 +7,12 @@ GIT
refinerycms-pages (~> 2.1.0)
GIT
+ remote: https://github.com/codahale/bcrypt-ruby.git
+ revision: 7644e3684d96fb49f5aa20cb5f547cb1b56b3f38
+ specs:
+ bcrypt (3.1.12)
+
+GIT
remote: https://github.com/refinery/refinerycms-acts-as-indexed.git
revision: 47cd0b6427a1ee7c513124c7a56c7cb5f93716f6
branch: 1-0-stable
@@ -75,7 +81,6 @@ GEM
awesome_nested_set (2.1.6)
activerecord (>= 3.0.0)
babosa (1.0.2)
- bcrypt (3.1.12)
bcrypt-ruby (3.1.5)
bcrypt (>= 3.1.3)
builder (3.0.4)
@@ -275,7 +280,7 @@ PLATFORMS
DEPENDENCIES
SyslogLogger
- bcrypt (~> 3.1.0)
+ bcrypt (~> 3.1.0)!
byebug
capistrano (~> 3.10.0)
capistrano-bundler