summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-12 20:30:50 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-09 20:58:28 -0700
commitf5eb5fdd5e6d8bcf3ad52749e99a378e411ff8ad (patch)
tree8e94ced793aca0d961375d4c04767aa015765a72
parent21c99e6a7797edb6a857e90c83fee3e5f1051adc (diff)
downloadgitlab-ce-f5eb5fdd5e6d8bcf3ad52749e99a378e411ff8ad.tar.gz
Add simple_encrypt gem
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock2
2 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 462c932584d..897ad547c34 100644
--- a/Gemfile
+++ b/Gemfile
@@ -200,6 +200,7 @@ gem 'nprogress-rails'
gem 'request_store'
gem "virtus"
gem 'addressable'
+gem 'simple_encrypt'
group :development do
gem 'brakeman', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index cca8f59ac28..eb8d607c5fc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -551,6 +551,7 @@ GEM
json
redis (>= 3.0.6)
redis-namespace (>= 1.3.1)
+ simple_encrypt (0.0.1)
simple_oauth (0.1.9)
simplecov (0.9.0)
docile (~> 1.1.0)
@@ -774,6 +775,7 @@ DEPENDENCIES
settingslogic
shoulda-matchers (~> 2.7.0)
sidekiq (~> 3.3)
+ simple_encrypt
simplecov
sinatra
six