X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Gemfile;h=77dce6c1859d0df615af2b6036fcc02fc66c6ddd;hb=c34d9fccbf3ae4574e81fea35371ed9c5dd1bd15;hp=4040f94dd1000edac0898a4a7bdebc6a0d988156;hpb=135599effaad9a0b15ad52e46355e885ec0ddc94;p=pettanr%2Fpettanr.git

diff --git a/Gemfile b/Gemfile
index 4040f94d..77dce6c1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,9 +1,14 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
-gem 'rails', '3.1.1'
+gem 'rails', '~> 3.2.0'
 gem 'devise', '=1.5.2'
 gem 'rest-client'
+gem 'underscore-rails'
+gem 'backbone-rails'
+gem 'kaminari'
+gem 'sanitize'
 gem 'aws-s3'
+gem 'awesome_nested_set'
 gem 'validates_existence'
 gem "validate_url"
 gem "pettanr_creative_commons_v30_licenses"
@@ -12,23 +17,30 @@ gem 'pettanr_pettan_protected_v01_licenses'
 gem 'pettanr_pettan_public_v01_licenses'
 gem 'pettanr_public_domain_v01_licenses'
 gem 'pettanr_unknown_v01_licenses'
+gem 'circle_speech_balloon'
+gem 'plain_speech_balloon'
+gem 'square_speech_balloon'
+gem 'test_speech_balloon'
+gem 'pettanr_simple_format'
 
 # Bundle edge Rails instead:
 # gem 'rails',     :git => 'git://github.com/rails/rails.git'
-
+gem 'i18n-js'
 
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails',   '~> 3.1.4'
-  gem 'coffee-rails', '~> 3.1.1'
+  gem 'sass-rails',   '~> 3.0'
+  gem 'coffee-rails', '~> 3.0'
   gem 'uglifier', '>= 1.0.3'
 end
 
 gem 'jquery-rails'
+gem 'jquery-ui-rails'
+gem "jquery-validation-rails"
 
 # To use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.0.0'
+gem 'bcrypt-ruby', '~> 3.0.0'
 
 # Use unicorn as the web server
 # gem 'unicorn'
@@ -51,18 +63,22 @@ end
 group :development, :test do
   gem 'sqlite3'
   gem 'webrat'
-  gem 'rspec'
-   gem 'rspec-rails'
-   gem 'cucumber'
-   gem 'cucumber-rails'
   gem 'moro-miso'
   gem 'database_cleaner'
   gem 'rails-erd'
-  gem 'factory_girl'
 end
 
 group :test do
   gem 'autotest'
+  gem 'spork'
+  gem 'guard'
+  gem 'guard-spork'
+  gem 'guard-rspec'
   gem 'webmock'
+  gem 'rspec'
+   gem 'rspec-rails'
+   gem 'cucumber'
+   gem 'cucumber-rails', require: false
+  gem 'factory_girl'
 end