Merge branch 'v06sheet' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06sheet

[pettanr/pettanr.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index cb69f09..80208ee 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,9 +1,10 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gem 'rails', '3.1.1'
 gem 'devise', '=1.5.2'
 gem 'rest-client'
 gem 'kaminari'
+gem 'sanitize'
 gem 'aws-s3'
 gem 'validates_existence'
 gem "validate_url"
@@ -16,6 +17,7 @@ gem 'pettanr_unknown_v01_licenses'
 gem 'circle_speech_balloon'
 gem 'plain_speech_balloon'
 gem 'square_speech_balloon'
+gem 'pettanr_simple_format'
 
 # Bundle edge Rails instead:
 # gem 'rails',     :git => 'git://github.com/rails/rails.git'
@@ -30,9 +32,11 @@ group :assets do
 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'