From 46ac35f4e515544d311e2bdeaf592b86443e02dd Mon Sep 17 00:00:00 2001
From: Alishan Ladhani <aladhani@gitlab.com>
Date: Thu, 5 Mar 2020 15:05:59 -0500
Subject: [PATCH] Add lockbox gem
To be used for encrypting terraform state files. See
https://gitlab.com/gitlab-org/gitlab/issues/207401.
---
Gemfile | 3 +++
Gemfile.lock | 2 ++
2 files changed, 5 insertions(+)
diff --git a/Gemfile b/Gemfile
index 414a8a6774430..53754392fcae9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -493,3 +493,6 @@ gem 'erubi', '~> 1.9.0'
# Monkey-patched in `config/initializers/mail_encoding_patch.rb`
# See https://gitlab.com/gitlab-org/gitlab/issues/197386
gem 'mail', '= 2.7.1'
+
+# File encryption
+gem 'lockbox', '~> 0.3.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index bb64fb09649fd..9e5c29dc82082 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -605,6 +605,7 @@ GEM
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
locale (2.1.2)
+ lockbox (0.3.3)
lograge (0.10.0)
actionpack (>= 4)
activesupport (>= 4)
@@ -1280,6 +1281,7 @@ DEPENDENCIES
license_finder (~> 5.4)
licensee (~> 8.9)
liquid (~> 4.0)
+ lockbox (~> 0.3.3)
lograge (~> 0.5)
loofah (~> 2.2)
lru_redux
--
GitLab