Update "rails" and "json" gems

This commit is contained in:
Vokhmin Alexey V 2013-02-12 12:57:03 +04:00
parent 6478f4a3b1
commit 8aeda1f087
2 changed files with 33 additions and 31 deletions

View File

@ -1,6 +1,6 @@
source 'http://rubygems.org' source 'http://rubygems.org'
gem 'rails', '3.2.11' #, :git => 'git://github.com/rails/rails.git' gem 'rails', '3.2.12' #, :git => 'git://github.com/rails/rails.git'
gem 'pg', '~> 0.14.0' gem 'pg', '~> 0.14.0'
# gem 'silent-postgres', :git => 'git://github.com/dolzenko/silent-postgres.git' #'~> 0.1.1' # gem 'silent-postgres', :git => 'git://github.com/dolzenko/silent-postgres.git' #'~> 0.1.1'
@ -57,6 +57,7 @@ gem 'rack-throttle'
gem 'rest-client', '~> 1.6.6' gem 'rest-client', '~> 1.6.6'
gem 'attr_encrypted', '1.2.1' gem 'attr_encrypted', '1.2.1'
gem 'json', '~> 1.7.7'
group :assets do group :assets do
gem 'sass-rails', '~> 3.2.5' gem 'sass-rails', '~> 3.2.5'

View File

@ -25,31 +25,31 @@ GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
RedCloth (4.2.9) RedCloth (4.2.9)
actionmailer (3.2.11) actionmailer (3.2.12)
actionpack (= 3.2.11) actionpack (= 3.2.12)
mail (~> 2.4.4) mail (~> 2.4.4)
actionpack (3.2.11) actionpack (3.2.12)
activemodel (= 3.2.11) activemodel (= 3.2.12)
activesupport (= 3.2.11) activesupport (= 3.2.12)
builder (~> 3.0.0) builder (~> 3.0.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
journey (~> 1.0.4) journey (~> 1.0.4)
rack (~> 1.4.0) rack (~> 1.4.5)
rack-cache (~> 1.2) rack-cache (~> 1.2)
rack-test (~> 0.6.1) rack-test (~> 0.6.1)
sprockets (~> 2.2.1) sprockets (~> 2.2.1)
activemodel (3.2.11) activemodel (3.2.12)
activesupport (= 3.2.11) activesupport (= 3.2.12)
builder (~> 3.0.0) builder (~> 3.0.0)
activerecord (3.2.11) activerecord (3.2.12)
activemodel (= 3.2.11) activemodel (= 3.2.12)
activesupport (= 3.2.11) activesupport (= 3.2.12)
arel (~> 3.0.2) arel (~> 3.0.2)
tzinfo (~> 0.3.29) tzinfo (~> 0.3.29)
activeresource (3.2.11) activeresource (3.2.12)
activemodel (= 3.2.11) activemodel (= 3.2.12)
activesupport (= 3.2.11) activesupport (= 3.2.12)
activesupport (3.2.11) activesupport (3.2.12)
i18n (~> 0.6) i18n (~> 0.6)
multi_json (~> 1.0) multi_json (~> 1.0)
airbrake (3.1.7) airbrake (3.1.7)
@ -178,11 +178,11 @@ GEM
meta-tags (1.2.6) meta-tags (1.2.6)
actionpack actionpack
metaclass (0.0.1) metaclass (0.0.1)
mime-types (1.20.1) mime-types (1.21)
mocha (0.10.5) mocha (0.10.5)
metaclass (~> 0.0.1) metaclass (~> 0.0.1)
mock_redis (0.6.2) mock_redis (0.6.2)
multi_json (1.5.0) multi_json (1.5.1)
mustache (0.99.4) mustache (0.99.4)
net-scp (1.0.4) net-scp (1.0.4)
net-ssh (>= 1.99.1) net-ssh (>= 1.99.1)
@ -215,7 +215,7 @@ GEM
posix-spawn (0.3.6) posix-spawn (0.3.6)
pygments.rb (0.2.13) pygments.rb (0.2.13)
rubypython (~> 0.5.3) rubypython (~> 0.5.3)
rack (1.4.4) rack (1.4.5)
rack-cache (1.2) rack-cache (1.2)
rack (>= 0.4) rack (>= 0.4)
rack-openid (1.3.1) rack-openid (1.3.1)
@ -229,14 +229,14 @@ GEM
rack (>= 1.0) rack (>= 1.0)
rack-throttle (0.3.0) rack-throttle (0.3.0)
rack (>= 1.0.0) rack (>= 1.0.0)
rails (3.2.11) rails (3.2.12)
actionmailer (= 3.2.11) actionmailer (= 3.2.12)
actionpack (= 3.2.11) actionpack (= 3.2.12)
activerecord (= 3.2.11) activerecord (= 3.2.12)
activeresource (= 3.2.11) activeresource (= 3.2.12)
activesupport (= 3.2.11) activesupport (= 3.2.12)
bundler (~> 1.0) bundler (~> 1.0)
railties (= 3.2.11) railties (= 3.2.12)
rails-backbone (0.7.2) rails-backbone (0.7.2)
coffee-script (~> 2.2.0) coffee-script (~> 2.2.0)
ejs (~> 1.0.0) ejs (~> 1.0.0)
@ -245,9 +245,9 @@ GEM
railties (>= 3.0.0) railties (>= 3.0.0)
rails3-jquery-autocomplete (1.0.10) rails3-jquery-autocomplete (1.0.10)
rails (~> 3.0) rails (~> 3.0)
railties (3.2.11) railties (3.2.12)
actionpack (= 3.2.11) actionpack (= 3.2.12)
activesupport (= 3.2.11) activesupport (= 3.2.12)
rack-ssl (~> 1.3.2) rack-ssl (~> 1.3.2)
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
@ -255,7 +255,7 @@ GEM
raindrops (0.10.0) raindrops (0.10.0)
rake (10.0.3) rake (10.0.3)
rdiscount (2.0.7) rdiscount (2.0.7)
rdoc (3.12) rdoc (3.12.1)
json (~> 1.4) json (~> 1.4)
redcarpet (2.1.1) redcarpet (2.1.1)
redis (3.0.2) redis (3.0.2)
@ -400,6 +400,7 @@ DEPENDENCIES
hirb hirb
jbuilder (~> 0.8.2) jbuilder (~> 0.8.2)
jquery-rails (~> 2.0.2) jquery-rails (~> 2.0.2)
json (~> 1.7.7)
mailcatcher mailcatcher
meta-tags (~> 1.2.5) meta-tags (~> 1.2.5)
mock_redis (= 0.6.2) mock_redis (= 0.6.2)
@ -410,7 +411,7 @@ DEPENDENCIES
perform_later (~> 1.3.0) perform_later (~> 1.3.0)
pg (~> 0.14.0) pg (~> 0.14.0)
rack-throttle rack-throttle
rails (= 3.2.11) rails (= 3.2.12)
rails-backbone (~> 0.7.2) rails-backbone (~> 0.7.2)
rails3-generators rails3-generators
rails3-jquery-autocomplete (~> 1.0.7) rails3-jquery-autocomplete (~> 1.0.7)