summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-07-27 17:35:08 +0000
committerRobert Speicher <robert@gitlab.com>2016-07-27 17:35:08 +0000
commit6985fea27b134675756eb9a79f1c23dc3fbdaf66 (patch)
treece94d66f5441fe117e508e43e1f1c9fb9c1471d4 /Gemfile.lock
parentb8c787208a85f6ccedab9aa3588482482303e08b (diff)
parent95ea2119bdcba43f08a5181c332207568a4e80ca (diff)
downloadgitlab-ce-6985fea27b134675756eb9a79f1c23dc3fbdaf66.tar.gz
Merge branch 'cs-upgrade-attr-encrypted' into 'master'
Update attr_encrypted from 3.0.1 to 3.0.2 This removes methods that were deprecated by Rails 5 so we won't have as many deprecation warnings when we update to Rails 5. Working toward #14286. Changelog: https://github.com/attr-encrypted/attr_encrypted/blob/master/CHANGELOG.md#302 See merge request !5438
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index b48c14148fe..670578dec6d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -59,7 +59,7 @@ GEM
oauth2 (~> 1.0)
asciidoctor (1.5.3)
ast (2.3.0)
- attr_encrypted (3.0.1)
+ attr_encrypted (3.0.3)
encryptor (~> 3.0.0)
attr_required (1.0.0)
autoprefixer-rails (6.2.3)