diff --git a/Gemfile.lock b/Gemfile.lock index 25bed6d..43a7f2f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -34,7 +34,6 @@ GEM sass (>= 3.2) ansi (1.4.3) arel (4.0.0) - atomic (1.1.12) bcrypt-ruby (3.1.1) bootstrap_helper (4.2.2.3) railties (= 4.0.0) @@ -50,10 +49,11 @@ GEM net-ssh-gateway (>= 1.1.0) capistrano-ext (1.2.1) capistrano (>= 1.0.0) - carrierwave (0.9.0) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) - json (>= 1.7) + carrierwave (1.3.2) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) + mime-types (>= 1.16) + ssrf_filter (~> 1.0) carrierwave-meta (0.0.5) activesupport (>= 3.0) carrierwave (>= 0.5.7) @@ -76,6 +76,7 @@ GEM sass (~> 3.1) compass-rails (1.0.3) compass (>= 0.12.2, < 0.14) + concurrent-ruby (1.1.8) devise (3.0.2) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) @@ -100,14 +101,15 @@ GEM high_voltage (1.2.4) highline (1.6.19) hike (1.2.3) - i18n (0.6.4) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jbuilder (1.5.0) activesupport (>= 3.0.0) multi_json (>= 1.2.0) jquery-rails (3.0.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.0) + json (2.5.1) kgio (2.8.0) listen (1.2.3) rb-fsevent (>= 0.9.3) @@ -123,7 +125,7 @@ GEM mini_magick (3.6.0) subexec (~> 0.2.1) minitest (4.7.5) - multi_json (1.7.8) + multi_json (1.15.0) net-scp (1.1.2) net-ssh (>= 2.6.5) net-sftp (2.1.2) @@ -206,17 +208,17 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) + ssrf_filter (1.0.7) subexec (0.2.3) thor (0.18.1) - thread_safe (0.1.2) - atomic + thread_safe (0.3.6) tilt (1.4.1) treetop (1.4.14) polyglot polyglot (>= 0.3.1) turn (0.9.6) ansi - tzinfo (0.3.37) + tzinfo (0.3.60) uglifier (2.1.2) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2)