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
fix:error dlg
[pettanr/pettanr.git]
/
Gemfile
diff --git
a/Gemfile
b/Gemfile
index
3304693
..
3e4e281
100644
(file)
--- a/
Gemfile
+++ b/
Gemfile
@@
-1,17
+1,19
@@
+ruby '2.1.6'
source 'https://rubygems.org'
source 'https://rubygems.org'
+gem 'specific_install'
gem 'rails', '~> 4.1.0'
gem 'devise'
gem 'omniauth'
gem 'omniauth-twitter'
gem 'rails', '~> 4.1.0'
gem 'devise'
gem 'omniauth'
gem 'omniauth-twitter'
+gem 'omniauth-google-oauth2'
gem 'rest-client'
gem 'underscore-rails'
# gem 'backbone-rails'
gem 'rails-timeago'
gem 'kaminari'
gem 'sanitize'
gem 'rest-client'
gem 'underscore-rails'
# gem 'backbone-rails'
gem 'rails-timeago'
gem 'kaminari'
gem 'sanitize'
-#gem 'aws-s3'
-gem 'aws-sdk', '< 2.0'
+gem 'aws-sdk', '~> 2.0'
gem 'awesome_nested_set', '~> 3.0'
gem 'validates_existence'
gem "validate_url"
gem 'awesome_nested_set', '~> 3.0'
gem 'validates_existence'
gem "validate_url"
@@
-63,6
+65,7
@@
gem 'bcrypt-ruby', '~> 3.0.0'
group :production do
#gem 'pg'
#gem 'therubyracer-heroku'
group :production do
#gem 'pg'
#gem 'therubyracer-heroku'
+ #gem 'rails_12factor'
end
group :mgk do
end
group :mgk do