OSDN Git Service
(root)
/
pettanr
/
pettanr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove counter api
[pettanr/pettanr.git]
/
Gemfile
diff --git
a/Gemfile
b/Gemfile
index
b9b9b40
..
a371da1
100644
(file)
--- a/
Gemfile
+++ b/
Gemfile
@@
-1,9
+1,15
@@
-source 'http://rubygems.org'
+source 'http
s
://rubygems.org'
-gem 'rails', '
3.1.1
'
+gem 'rails', '
~> 3.2.0
'
gem 'devise', '=1.5.2'
gem 'rest-client'
gem 'devise', '=1.5.2'
gem 'rest-client'
+gem 'underscore-rails'
+gem 'backbone-rails'
+gem 'rails-timeago'
+gem 'kaminari'
+gem 'sanitize'
gem 'aws-s3'
gem 'aws-s3'
+gem 'awesome_nested_set', '~> 2.0'
gem 'validates_existence'
gem "validate_url"
gem "pettanr_creative_commons_v30_licenses"
gem 'validates_existence'
gem "validate_url"
gem "pettanr_creative_commons_v30_licenses"
@@
-12,23
+18,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 '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'
# 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
# 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 'uglifier', '>= 1.0.3'
end
gem 'jquery-rails'
+gem 'jquery-ui-rails', '~> 5.0'
+gem "jquery-validation-rails"
# To use ActiveModel has_secure_password
# 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'
# Use unicorn as the web server
# gem 'unicorn'
@@
-42,6
+55,7
@@
gem 'jquery-rails'
group :production do
gem 'pg'
gem 'therubyracer-heroku'
group :production do
gem 'pg'
gem 'therubyracer-heroku'
+ #gem 'therubyracer'
end
group :mgk do
end
group :mgk do
@@
-51,18
+65,22
@@
end
group :development, :test do
gem 'sqlite3'
gem 'webrat'
group :development, :test do
gem 'sqlite3'
gem 'webrat'
- gem 'rspec', '~> 2.13.0'
- gem 'rspec-rails'
- gem 'cucumber'
- gem 'cucumber-rails'
gem 'moro-miso'
gem 'database_cleaner'
gem 'moro-miso'
gem 'database_cleaner'
- gem 'rails-erd'
- gem 'factory_girl'
+ #gem 'rails-erd'
end
group :test do
gem 'autotest'
end
group :test do
gem 'autotest'
+ gem 'spork'
+ gem 'guard'
+ gem 'guard-spork'
+ gem 'guard-rspec'
gem 'webmock'
gem 'webmock'
+ gem 'rspec'
+ gem 'rspec-rails'
+ gem 'cucumber'
+ gem 'cucumber-rails', require: false
+ gem 'factory_girl'
end
end