Restore removal of div and style elements when sanitizing HTML

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 76f1d32744518938219ab89a54b1fdba79a6f8cb..51e8b49a4d1b3b42fd0d981afc0e0044b81098f8 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 # Require rails
-gem 'rails', '4.1.6'
+gem 'rails', '4.1.9'
 
 # Require things which have moved to gems in ruby 1.9
 gem 'bigdecimal', "~> 1.1.0", :platforms => :ruby_19
@@ -44,7 +44,7 @@ gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
 gem 'oauth-plugin', '>= 0.5.1'
 gem 'open_id_authentication', '>= 1.1.0'
 gem 'validates_email_format_of', '>= 1.5.1'
-gem 'composite_primary_keys', '~> 7.0.10'
+gem 'composite_primary_keys', '~> 7.0.11'
 gem 'http_accept_language', '~> 2.0.0'
 gem 'paperclip', '~> 4.0'
 gem 'deadlock_retry', '>= 1.2.0'