diff --git a/Gemfile b/Gemfile index 9458fcd..14f9c09 100644 --- a/Gemfile +++ b/Gemfile @@ -26,7 +26,7 @@ gem 'simple_form', '3.1.0' gem 'nested_form', '0.3.2' gem 'cancancan', '1.9.2' gem 'validates_timeliness', '3.0.14' -gem 'carrierwave', '0.10.0' +gem 'carrierwave', '1.3.2' gem 'time_date_helpers', '0.0.2' # Additional gems that are very useful in Rails development diff --git a/Gemfile.lock b/Gemfile.lock index 77241ae..d064a93 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -46,11 +46,11 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - carrierwave (0.10.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) chronic (0.10.2) coderay (1.1.0) coffee-rails (4.0.1) @@ -60,6 +60,7 @@ GEM coffee-script-source execjs coffee-script-source (1.9.1.1) + concurrent-ruby (1.1.8) cucumber (1.3.19) builder (>= 2.1.2) diff-lcs (>= 1.1.3) @@ -90,14 +91,15 @@ GEM gherkin (2.12.2) multi_json (~> 1.3) hirb (0.7.2) - i18n (0.7.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jbuilder (1.5.3) activesupport (>= 3.0.0) multi_json (>= 1.2.0) jquery-rails (3.1.0) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.2) + json (1.8.6) launchy (2.4.3) addressable (~> 2.3) mail (2.6.3) @@ -107,12 +109,12 @@ GEM rack-contrib (~> 1.1) railties (>= 3.0.0, < 5.0.0) metaclass (0.0.4) - mime-types (2.5) + mime-types (2.99.3) mini_portile (0.6.2) minitest (4.7.5) mocha (1.1.0) metaclass (~> 0.0.1) - multi_json (1.11.0) + multi_json (1.15.0) multi_test (0.1.2) nested_form (0.3.2) nokogiri (1.6.6.2) @@ -172,12 +174,13 @@ GEM activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) sqlite3 (1.3.10) + ssrf_filter (1.0.7) thin (1.6.3) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0) rack (~> 1.0) thor (0.19.1) - thread_safe (0.3.5) + thread_safe (0.3.6) tilt (1.4.1) time_date_helpers (0.0.2) chronic @@ -185,7 +188,7 @@ GEM turn (0.9.7) ansi minitest (~> 4) - tzinfo (0.3.44) + tzinfo (0.3.60) uglifier (2.5.0) execjs (>= 0.3.0) json (>= 1.8.0) @@ -205,7 +208,7 @@ DEPENDENCIES binding_of_caller (= 0.7.2) cancancan (= 1.9.2) capybara - carrierwave (= 0.10.0) + carrierwave (= 1.3.2) chronic (= 0.10.2) coffee-rails (= 4.0.1) cucumber-rails