X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=blobdiff_plain;f=Gemfile;h=3e4e281bcfdcf7e85617204d8c46ec2e9ca0fcac;hp=8f22731430989cc5f659c5b50bea7b20dd6c21f4;hb=279324e2ea829a8e13358a850335cbd765e98fe5;hpb=2e1fe642e8bf2e237f6bcfb605d4d26da96fe2e9

diff --git a/Gemfile b/Gemfile
index 8f227314..3e4e281b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,15 +1,20 @@
+ruby '2.1.6'
 source 'https://rubygems.org'
+gem 'specific_install'
 
-gem 'rails', '~> 3.2.0'
-gem 'devise', '=1.5.2'
+gem 'rails', '~> 4.1.0'
+gem 'devise'
+gem 'omniauth'
+gem 'omniauth-twitter'
+gem 'omniauth-google-oauth2'
 gem 'rest-client'
 gem 'underscore-rails'
-gem 'backbone-rails'
-gem 'backbone-relational-rails'
+# gem 'backbone-rails'
+gem 'rails-timeago'
 gem 'kaminari'
 gem 'sanitize'
-gem 'aws-s3'
-gem 'awesome_nested_set'
+gem 'aws-sdk', '~> 2.0'
+gem 'awesome_nested_set', '~> 3.0'
 gem 'validates_existence'
 gem "validate_url"
 gem "pettanr_creative_commons_v30_licenses"
@@ -27,17 +32,20 @@ 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
 
 gem 'jquery-rails'
-gem 'jquery-ui-rails'
+gem 'jquery-ui-rails',   '~> 5.0'
 gem "jquery-validation-rails"
 
 # To use ActiveModel has_secure_password
@@ -52,9 +60,12 @@ gem 'bcrypt-ruby', '~> 3.0.0'
 # To use debugger
 # gem 'ruby-debug19', :require => 'ruby-debug'
 
+# gem 'therubyracer', :path => '../therubyracer-0.11.0beta1-x86-mingw32'
+
 group :production do
-  gem 'pg'
-  gem 'therubyracer-heroku'
+  #gem 'pg'
+  #gem 'therubyracer-heroku'
+  #gem 'rails_12factor'
 end
 
 group :mgk do
@@ -66,7 +77,7 @@ group :development, :test do
   gem 'webrat'
   gem 'moro-miso'
   gem 'database_cleaner'
-  gem 'rails-erd'
+  #gem 'rails-erd'
 end
 
 group :test do
@@ -83,3 +94,4 @@ group :test do
   gem 'factory_girl'
 end
 
+gem 'tzinfo-data'