diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-12 10:41:24 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-12 10:41:24 +0300 |
| commit | 22badc13136369e202dc6df06a62456110879ee4 (patch) | |
| tree | 8b25124257cfc8086566c435711e6759c2cb6ac1 | |
| parent | 24bef5e67a81c5edf9dacb65ecc091cac1f4c528 (diff) | |
| download | gitlab-ce-22badc13136369e202dc6df06a62456110879ee4.tar.gz | |
Bump attr_encrypted
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 12 |
2 files changed, 4 insertions, 10 deletions
@@ -37,7 +37,7 @@ gem "rack-oauth2", "~> 1.0.5" # Two-factor authentication gem 'devise-two-factor' gem 'rqrcode-rails3' -gem 'attr_encrypted', git: 'https://github.com/attr-encrypted/attr_encrypted.git', ref: '94d901df2ccbc579b981091d53dd641f9bed4c1d' +gem 'attr_encrypted', '1.3.4' # Browser detection gem "browser" diff --git a/Gemfile.lock b/Gemfile.lock index 672bd9950ed..0ea8021815d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,11 +1,3 @@ -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: @@ -54,6 +46,8 @@ GEM ast (2.0.0) astrolabe (1.3.0) parser (>= 2.2.0.pre.3, < 3.0) + attr_encrypted (1.3.4) + encryptor (>= 1.3.0) attr_required (1.0.0) autoprefixer-rails (5.1.11) execjs @@ -690,7 +684,7 @@ DEPENDENCIES annotate (~> 2.6.0.beta2) asana (~> 0.0.6) asciidoctor (= 0.1.4) - attr_encrypted! + attr_encrypted (= 1.3.4) awesome_print better_errors binding_of_caller |