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
t#31671:add elm copy
[pettanr/pettanr.git]
/
Gemfile
diff --git
a/Gemfile
b/Gemfile
index
bc23565
..
f654fe9
100644
(file)
--- a/
Gemfile
+++ b/
Gemfile
@@
-3,6
+3,7
@@
source 'http://rubygems.org'
gem 'rails', '3.1.1'
gem 'devise', '=1.5.2'
gem 'rest-client'
gem 'rails', '3.1.1'
gem 'devise', '=1.5.2'
gem 'rest-client'
+gem 'kaminari'
gem 'aws-s3'
gem 'validates_existence'
gem "validate_url"
gem 'aws-s3'
gem 'validates_existence'
gem "validate_url"
@@
-12,6
+13,9
@@
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'
# 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'
@@
-26,9
+30,10
@@
group :assets do
end
gem 'jquery-rails'
end
gem 'jquery-rails'
+gem 'jquery-ui-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'
@@
-51,7
+56,7
@@
end
group :development, :test do
gem 'sqlite3'
gem 'webrat'
group :development, :test do
gem 'sqlite3'
gem 'webrat'
- gem 'rspec', '~> 2.1
2
.0'
+ gem 'rspec', '~> 2.1
3
.0'
gem 'rspec-rails'
gem 'cucumber'
gem 'cucumber-rails'
gem 'rspec-rails'
gem 'cucumber'
gem 'cucumber-rails'