rails upgrade to 4

[pettanr/pettanr.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 8951587..0f08acd 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 3.2.0'
+gem 'rails', '~> 4.1.0'
 gem 'devise'
-# gem 'devise_token_auth'
+gem 'devise_token_auth'
 gem 'rest-client'
 gem 'underscore-rails'
 # gem 'backbone-rails'
@@ -10,7 +10,8 @@ gem 'rails-timeago'
 gem 'kaminari'
 gem 'sanitize'
 gem 'aws-s3'
-gem 'awesome_nested_set', '~> 2.0'
+gem 'aws-sdk', '< 2.0'
+gem 'awesome_nested_set', '~> 3.0'
 gem 'validates_existence'
 gem "validate_url"
 gem "pettanr_creative_commons_v30_licenses"
@@ -28,13 +29,14 @@ gem 'pettanr_simple_format'
 # Bundle edge Rails instead:
 # gem 'rails',     :git => 'git://github.com/rails/rails.git'
 gem 'i18n-js'
+gem 'nokogiri'
 
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails',   '~> 3.0'
-  gem 'coffee-rails', '~> 3.0'
-  gem 'uglifier', '>= 1.0.3'
+  gem 'sass-rails',   '~> 4.0'
+  gem 'coffee-rails', '~> 4.0'
+  gem 'uglifier', '>= 1.3.0'
   # http://qiita.com/scivola/items/ec7625118fcf6de5203a
   gem 'coffee-script-source', '~> 1.8.0'
 end
@@ -87,3 +89,4 @@ group :test do
   gem 'factory_girl'
 end
 
+gem 'tzinfo-data'