update gems
This commit is contained in:
parent
b05879afdc
commit
0af713b765
6
Gemfile
6
Gemfile
|
@ -1,9 +1,9 @@
|
|||
source 'http://rubygems.org'
|
||||
|
||||
gem 'rails', '3.2.6'
|
||||
gem 'rails', '3.2.7'
|
||||
gem 'sqlite3'
|
||||
gem 'mime-types', :require => 'mime/types'
|
||||
gem 'carrierwave', '0.6.2'
|
||||
gem 'carrierwave'
|
||||
gem 'dynamic_form'
|
||||
gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'
|
||||
gem 'princely'
|
||||
|
@ -11,7 +11,7 @@ gem 'unicorn'
|
|||
gem 'jquery-rails'
|
||||
gem 'jquery-ui-rails'
|
||||
gem 'twitter-bootstrap-rails', :git => 'git://github.com/seyhunak/twitter-bootstrap-rails.git'
|
||||
gem 'ajaxful_rating_jquery', :git => 'git://github.com/baxang/ajaxful_rating_jquery.git'#, :branch => 'rails3'
|
||||
gem 'ajaxful_rating_jquery', :git => 'git://github.com/greendog/ajaxful_rating_jquery.git'#, :branch => 'rails3'
|
||||
gem 'configatron', :git => 'git://github.com/markbates/configatron.git'
|
||||
gem 'plupload-rails', :git => 'git://github.com/bryanmig/plupload-rails.git'
|
||||
#gem 'sequel', :git => 'git://github.com/jeremyevans/sequel.git'
|
||||
|
|
86
Gemfile.lock
86
Gemfile.lock
|
@ -6,12 +6,6 @@ GIT
|
|||
actionpack (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/baxang/ajaxful_rating_jquery.git
|
||||
revision: b4a2c760cdbad9cd865fb18667d14045018287ed
|
||||
specs:
|
||||
ajaxful_rating_jquery (3.0.0.beta3)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/bryanmig/plupload-rails.git
|
||||
revision: 6d07d0f7e05d0b3fdc9b03b49d3a7c3aa1cd703b
|
||||
|
@ -21,7 +15,7 @@ GIT
|
|||
|
||||
GIT
|
||||
remote: git://github.com/capistrano/capistrano.git
|
||||
revision: dfb6295a5f649fc49449352c44ff7fbd2c54d3f8
|
||||
revision: 62a6cb723dc583468943fc642847791fb4ad2686
|
||||
specs:
|
||||
capistrano (2.12.0)
|
||||
highline
|
||||
|
@ -30,6 +24,12 @@ GIT
|
|||
net-ssh (>= 2.0.14)
|
||||
net-ssh-gateway (>= 1.1.0)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/greendog/ajaxful_rating_jquery.git
|
||||
revision: ae3314d3067d9f13a62675fa08afa4ecd31a7828
|
||||
specs:
|
||||
ajaxful_rating_jquery (3.0.0.beta3)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/greendog/devise_omniauth_engine.git
|
||||
revision: c46d449222133f709b5f0cafc31a57f1ae208f06
|
||||
|
@ -47,9 +47,9 @@ GIT
|
|||
|
||||
GIT
|
||||
remote: git://github.com/mamantoha/omniauth-vkontakte.git
|
||||
revision: 1d7fc5bdb3b90db2f51a9f3d5f4e6a14b97a2b41
|
||||
revision: b2b9f62972911ba328538368d13407b01bc9f297
|
||||
specs:
|
||||
omniauth-vkontakte (1.0.7)
|
||||
omniauth-vkontakte (1.0.9)
|
||||
multi_json
|
||||
omniauth (~> 1.1.0)
|
||||
omniauth-oauth2 (~> 1.0)
|
||||
|
@ -69,7 +69,7 @@ GIT
|
|||
|
||||
GIT
|
||||
remote: git://github.com/seyhunak/twitter-bootstrap-rails.git
|
||||
revision: 087c17e4294ce10aeb80d31fe7388a2a524460dd
|
||||
revision: 908e150800610138e2b48738f842afb85b3a832e
|
||||
specs:
|
||||
twitter-bootstrap-rails (2.1.1)
|
||||
actionpack (>= 3.1)
|
||||
|
@ -94,31 +94,31 @@ GIT
|
|||
GEM
|
||||
remote: http://rubygems.org/
|
||||
specs:
|
||||
actionmailer (3.2.6)
|
||||
actionpack (= 3.2.6)
|
||||
actionmailer (3.2.7)
|
||||
actionpack (= 3.2.7)
|
||||
mail (~> 2.4.4)
|
||||
actionpack (3.2.6)
|
||||
activemodel (= 3.2.6)
|
||||
activesupport (= 3.2.6)
|
||||
actionpack (3.2.7)
|
||||
activemodel (= 3.2.7)
|
||||
activesupport (= 3.2.7)
|
||||
builder (~> 3.0.0)
|
||||
erubis (~> 2.7.0)
|
||||
journey (~> 1.0.1)
|
||||
journey (~> 1.0.4)
|
||||
rack (~> 1.4.0)
|
||||
rack-cache (~> 1.2)
|
||||
rack-test (~> 0.6.1)
|
||||
sprockets (~> 2.1.3)
|
||||
activemodel (3.2.6)
|
||||
activesupport (= 3.2.6)
|
||||
activemodel (3.2.7)
|
||||
activesupport (= 3.2.7)
|
||||
builder (~> 3.0.0)
|
||||
activerecord (3.2.6)
|
||||
activemodel (= 3.2.6)
|
||||
activesupport (= 3.2.6)
|
||||
activerecord (3.2.7)
|
||||
activemodel (= 3.2.7)
|
||||
activesupport (= 3.2.7)
|
||||
arel (~> 3.0.2)
|
||||
tzinfo (~> 0.3.29)
|
||||
activeresource (3.2.6)
|
||||
activemodel (= 3.2.6)
|
||||
activesupport (= 3.2.6)
|
||||
activesupport (3.2.6)
|
||||
activeresource (3.2.7)
|
||||
activemodel (= 3.2.7)
|
||||
activesupport (= 3.2.7)
|
||||
activesupport (3.2.7)
|
||||
i18n (~> 0.6)
|
||||
multi_json (~> 1.0)
|
||||
arel (3.0.2)
|
||||
|
@ -144,15 +144,15 @@ GEM
|
|||
warden (~> 1.2.1)
|
||||
dynamic_form (1.1.4)
|
||||
erubis (2.7.0)
|
||||
excon (0.14.3)
|
||||
excon (0.15.5)
|
||||
execjs (1.4.0)
|
||||
multi_json (~> 1.0)
|
||||
faraday (0.8.1)
|
||||
multipart-post (~> 1.1)
|
||||
ffaker (1.15.0)
|
||||
fog (1.4.0)
|
||||
fog (1.5.0)
|
||||
builder
|
||||
excon (~> 0.14.0)
|
||||
excon (~> 0.14)
|
||||
formatador (~> 0.2.0)
|
||||
mime-types
|
||||
multi_json (~> 1.0)
|
||||
|
@ -170,10 +170,10 @@ GEM
|
|||
jquery-rails (2.0.2)
|
||||
railties (>= 3.2.0, < 5.0)
|
||||
thor (~> 0.14)
|
||||
jquery-ui-rails (1.0.0)
|
||||
jquery-ui-rails (1.1.0)
|
||||
jquery-rails
|
||||
railties (>= 3.1.0)
|
||||
json (1.7.3)
|
||||
json (1.7.4)
|
||||
jwt (0.1.5)
|
||||
multi_json (>= 1.0)
|
||||
kgio (2.7.4)
|
||||
|
@ -243,17 +243,17 @@ GEM
|
|||
rack
|
||||
rack-test (0.6.1)
|
||||
rack (>= 1.0)
|
||||
rails (3.2.6)
|
||||
actionmailer (= 3.2.6)
|
||||
actionpack (= 3.2.6)
|
||||
activerecord (= 3.2.6)
|
||||
activeresource (= 3.2.6)
|
||||
activesupport (= 3.2.6)
|
||||
rails (3.2.7)
|
||||
actionmailer (= 3.2.7)
|
||||
actionpack (= 3.2.7)
|
||||
activerecord (= 3.2.7)
|
||||
activeresource (= 3.2.7)
|
||||
activesupport (= 3.2.7)
|
||||
bundler (~> 1.0)
|
||||
railties (= 3.2.6)
|
||||
railties (3.2.6)
|
||||
actionpack (= 3.2.6)
|
||||
activesupport (= 3.2.6)
|
||||
railties (= 3.2.7)
|
||||
railties (3.2.7)
|
||||
actionpack (= 3.2.7)
|
||||
activesupport (= 3.2.7)
|
||||
rack-ssl (~> 1.3.2)
|
||||
rake (>= 0.8.7)
|
||||
rdoc (~> 3.4)
|
||||
|
@ -287,7 +287,7 @@ GEM
|
|||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
tzinfo (0.3.33)
|
||||
uglifier (1.2.6)
|
||||
uglifier (1.2.7)
|
||||
execjs (>= 0.3.0)
|
||||
multi_json (~> 1.3)
|
||||
unicorn (4.3.1)
|
||||
|
@ -310,7 +310,7 @@ DEPENDENCIES
|
|||
capistrano!
|
||||
capistrano-unicorn!
|
||||
capistrano_colors
|
||||
carrierwave (= 0.6.2)
|
||||
carrierwave
|
||||
coffee-rails
|
||||
configatron!
|
||||
devise_omniauth_engine!
|
||||
|
@ -331,7 +331,7 @@ DEPENDENCIES
|
|||
omniauth-vkontakte!
|
||||
plupload-rails!
|
||||
princely
|
||||
rails (= 3.2.6)
|
||||
rails (= 3.2.7)
|
||||
russian!
|
||||
rvm-capistrano
|
||||
sass-rails
|
||||
|
|
Loading…
Reference in a new issue