diff --git a/Gemfile b/Gemfile index 7943910142..bfb18746ca 100644 --- a/Gemfile +++ b/Gemfile @@ -64,7 +64,7 @@ gem 'rack-ssl', require: 'rack/ssl' gem 'rack-rewrite' gem 'custom_error_message', github: 'jeremydurham/custom-err-msg' gem 'angularjs-file-upload-rails', '~> 1.1.6' -gem 'roadie-rails', '~> 1.0.3' +gem 'roadie-rails', '~> 1.1.1' gem 'figaro' gem 'blockenspiel' gem 'acts-as-taggable-on', '~> 3.4' diff --git a/Gemfile.lock b/Gemfile.lock index a60852d643..ab909b4cfb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -246,7 +246,7 @@ GEM sprockets (< 4.0) crack (0.4.3) safe_yaml (~> 1.0.0) - css_parser (1.3.5) + css_parser (1.6.0) addressable daemons (1.2.2) dalli (2.7.2) @@ -627,12 +627,12 @@ GEM rdoc (3.12.2) json (~> 1.4) redcarpet (3.2.3) - roadie (3.0.1) - css_parser (~> 1.3.4) - nokogiri (~> 1.6.0) - roadie-rails (1.0.3) - rails (>= 3.0, < 4.2) - roadie (~> 3.0) + roadie (3.4.0) + css_parser (~> 1.4) + nokogiri (~> 1.5) + roadie-rails (1.1.1) + railties (>= 3.0, < 5.1) + roadie (~> 3.1) roo (2.7.1) nokogiri (~> 1) rubyzip (~> 1.1, < 2.0.0) @@ -822,7 +822,7 @@ DEPENDENCIES rails (~> 3.2.22) rails-i18n (~> 3.0.0) redcarpet - roadie-rails (~> 1.0.3) + roadie-rails (~> 1.1.1) roo (~> 2.7.0) roo-xls (~> 1.1.0) rspec-rails (>= 3.5.2)