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
add: short cut
[pettanr/pettanr.git]
/
Gemfile
diff --git
a/Gemfile
b/Gemfile
index
9eb0e40
..
90b68a2
100644
(file)
--- a/
Gemfile
+++ b/
Gemfile
@@
-4,11
+4,12
@@
gem 'rails', '~> 3.2.0'
gem 'devise', '=1.5.2'
gem 'rest-client'
gem 'underscore-rails'
gem 'devise', '=1.5.2'
gem 'rest-client'
gem 'underscore-rails'
-gem 'backbone-rails'
+# gem 'backbone-rails'
+gem 'rails-timeago'
gem 'kaminari'
gem 'sanitize'
gem 'aws-s3'
gem 'kaminari'
gem 'sanitize'
gem 'aws-s3'
-gem 'awesome_nested_set'
+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"
@@
-21,7
+22,6
@@
gem 'circle_speech_balloon'
gem 'plain_speech_balloon'
gem 'square_speech_balloon'
gem 'test_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 'pettanr_simple_format'
# Bundle edge Rails instead:
@@
-34,10
+34,12
@@
group :assets do
gem 'sass-rails', '~> 3.0'
gem 'coffee-rails', '~> 3.0'
gem 'uglifier', '>= 1.0.3'
gem 'sass-rails', '~> 3.0'
gem 'coffee-rails', '~> 3.0'
gem 'uglifier', '>= 1.0.3'
+ # http://qiita.com/scivola/items/ec7625118fcf6de5203a
+ gem 'coffee-script-source', '~> 1.8.0'
end
gem 'jquery-rails'
end
gem 'jquery-rails'
-gem 'jquery-ui-rails'
+gem 'jquery-ui-rails'
, '~> 5.0'
gem "jquery-validation-rails"
# To use ActiveModel has_secure_password
gem "jquery-validation-rails"
# To use ActiveModel has_secure_password
@@
-55,6
+57,7
@@
gem 'bcrypt-ruby', '~> 3.0.0'
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
@@
-66,7
+69,7
@@
group :development, :test do
gem 'webrat'
gem 'moro-miso'
gem 'database_cleaner'
gem 'webrat'
gem 'moro-miso'
gem 'database_cleaner'
- gem 'rails-erd'
+
#
gem 'rails-erd'
end
group :test do
end
group :test do