From 9c63899a81a251d60e510512b8168d528f8d5b9d Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Sat, 11 May 2019 20:07:21 +0200
Subject: Upgrade/replace bcrypt-ruby with bcrypt gem, be less anal about
 capistrano version.

---
 Gemfile          | 2 +-
 Gemfile.lock     | 8 +++++---
 config/deploy.rb | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 65b78ad..f21dc0f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -37,7 +37,7 @@ end
 gem 'jquery-rails', '~> 2.3.0'
 
 # To use ActiveModel has_secure_password
-gem 'bcrypt-ruby', '~> 3.0.0'
+gem 'bcrypt', '~> 3.1.0'
 
 # Use unicorn as the app server
 gem 'puma'
diff --git a/Gemfile.lock b/Gemfile.lock
index cef8b81..742c15c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -75,7 +75,9 @@ GEM
     awesome_nested_set (2.1.6)
       activerecord (>= 3.0.0)
     babosa (1.0.2)
-    bcrypt-ruby (3.0.1)
+    bcrypt (3.1.12)
+    bcrypt-ruby (3.1.5)
+      bcrypt (>= 3.1.3)
     builder (3.0.4)
     byebug (10.0.2)
     capistrano (3.10.2)
@@ -273,7 +275,7 @@ PLATFORMS
 
 DEPENDENCIES
   SyslogLogger
-  bcrypt-ruby (~> 3.0.0)
+  bcrypt (~> 3.1.0)
   byebug
   capistrano (~> 3.10.0)
   capistrano-bundler
@@ -307,4 +309,4 @@ DEPENDENCIES
   uglifier (>= 1.0.3)
 
 BUNDLED WITH
-   1.16.4
+   1.17.0
diff --git a/config/deploy.rb b/config/deploy.rb
index f4b1fd9..524405f 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-lock '3.10.1'
+lock '~> 3.10.0'
 
 set :application, 'hmno'
 set :repo_url, 'http://code.volse.no/hmnoweb.git'
-- 
cgit v1.2.3