summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-31 05:34:50 +0300
committerRobert Speicher <rspeicher@gmail.com>2015-05-09 17:31:11 -0400
commitb66be0a2b3351dd10d96e3d0d0576f6d1444f342 (patch)
tree94ef3f1ff85c4bc8c9cc5fc103ac93c57dd42f31 /Gemfile.lock
parentde9e1c3bad18e4ca00cfdced75e5cc4c42905761 (diff)
downloadgitlab-ce-b66be0a2b3351dd10d96e3d0d0576f6d1444f342.tar.gz
Use non-broken version of attr_encrypted
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock11
1 files changed, 9 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 35faa9895ba..672bd9950ed 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,11 @@
+GIT
+ remote: https://github.com/attr-encrypted/attr_encrypted.git
+ revision: 94d901df2ccbc579b981091d53dd641f9bed4c1d
+ ref: 94d901df2ccbc579b981091d53dd641f9bed4c1d
+ specs:
+ attr_encrypted (1.3.3)
+ encryptor (>= 1.3.0)
+
GEM
remote: https://rubygems.org/
specs:
@@ -46,8 +54,6 @@ GEM
ast (2.0.0)
astrolabe (1.3.0)
parser (>= 2.2.0.pre.3, < 3.0)
- attr_encrypted (1.3.3)
- encryptor (>= 1.3.0)
attr_required (1.0.0)
autoprefixer-rails (5.1.11)
execjs
@@ -684,6 +690,7 @@ DEPENDENCIES
annotate (~> 2.6.0.beta2)
asana (~> 0.0.6)
asciidoctor (= 0.1.4)
+ attr_encrypted!
awesome_print
better_errors
binding_of_caller