From 39fa7d1eeb2dba52f0601128f3ac91f57d19866e Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 27 Mar 2020 12:07:43 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 Gemfile | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'Gemfile')

diff --git a/Gemfile b/Gemfile
index c3991a7b630..77d09d1a87f 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'
-- 
cgit v1.2.3