1 files changed, 13 insertions, 10 deletions

diff --git a/Gemfile b/Gemfile
index 594f94e..f00395b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,26 +1,29 @@
 source 'https://rubygems.org'
 
-gem 'rails', '3.2.22.5'
+gem 'rails', '4.2.11.3'
 
 gem 'pg', '~> 0.17.0'
 
-# from your vendor/plugins, now as gems:
 gem 'acts-as-taggable-on', '~> 3.5'
-gem 'awesome_nested_set', '~> 2.1'
+gem 'awesome_nested_set', '~> 3.1'
 gem 'acts_as_list'
-gem 'globalize3', '~> 0.3.0'
-gem 'routing-filter', '~> 0.3'
+gem 'globalize', '~> 5.0'
+gem 'routing-filter', '~> 0.6'
 gem 'paperclip', '~> 3.5'
 gem 'will_paginate', '~> 3.0'
 gem 'exception_notification'
 gem 'libxml-ruby', :require => 'xml'
 
-# gem 'thinking-sphinx', '1.5.0', :require => 'thinking_sphinx'
+gem 'nokogiri', '~> 1.10.10'
+gem 'loofah', '~> 2.20.0'
+gem 'rails-html-sanitizer', '~> 1.4.4'
+gem 'jquery-rails'
+
 gem 'unicorn', '~> 1.1'
 
 group :assets do
-  gem 'sass-rails',   '~> 3.2.3'
-  gem 'coffee-rails', '~> 3.2.1'
+  gem 'sass-rails',   '~> 4.0'
+  gem 'coffee-rails', '~> 4.0'
   gem 'uglifier', '>= 1.0.3'
 end
 
@@ -28,5 +31,5 @@ group :test do
   gem 'test-unit', '~> 3.5'
 end
 
-gem 'chaos_calendar', :git => 'https://github.com/erdgeist/chaoscalendar.git', :require => 'chaos_calendar', :branch => 'erdgeist-ruby1.9'
-
+gem 'chaos_calendar', :git => 'https://github.com/erdgeist/chaoscalendar.git',
+    :require => 'chaos_calendar', :branch => 'erdgeist-ruby1.9'