upgrade rails 3.2

[pettanr/pettanr.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 160f94e..a6f9b75 100644 (file)
--- 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,25 +17,31 @@ 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 'square_speech_balloon'
+gem 'pettanr_simple_format'
 
 # Bundle edge Rails instead:
 # gem 'rails',     :git => 'git://github.com/rails/rails.git'
 
-gem 'sqlite3'
-
 
 # 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,8 +62,9 @@ group :mgk do
 end
 
 group :development, :test do
+  gem 'sqlite3'
   gem 'webrat'
-  gem 'rspec'
+  gem 'rspec',   '~> 2.0'
    gem 'rspec-rails'
    gem 'cucumber'
    gem 'cucumber-rails'