From d3469f524a3c3b2f5ef917cbab451ab89649fc5f Mon Sep 17 00:00:00 2001 From: Alexander Machehin Date: Tue, 19 Mar 2013 15:15:14 +0600 Subject: [PATCH] update rails to 3.2.13 && gems update --- Gemfile | 7 +-- Gemfile.lock | 151 ++++++++++++++++++++++++--------------------------- 2 files changed, 72 insertions(+), 86 deletions(-) diff --git a/Gemfile b/Gemfile index 5307bf515..fab457c41 100644 --- a/Gemfile +++ b/Gemfile @@ -1,11 +1,8 @@ source 'https://rubygems.org' -gem 'rails', '3.2.12' #, :git => 'git://github.com/rails/rails.git' +gem 'rails', '3.2.13' #, :git => 'git://github.com/rails/rails.git' gem 'pg', '~> 0.14.0' -# gem 'silent-postgres', :git => 'git://github.com/dolzenko/silent-postgres.git' #'~> 0.1.1' -gem 'redhillonrails_core', :git => 'git://github.com/warpc/redhillonrails_core.git', :branch => 'rails31' # '~> 2.0.0.pre' # deprecated -# gem 'schema_plus', '~> 0.2.1' # buggy shit! gem 'devise', '~> 2.1.2' gem 'omniauth', '~> 1.1.0' @@ -22,11 +19,9 @@ gem 'russian', '~> 0.6.0' gem 'highline', '~> 1.6.11' gem 'state_machine' -# gem 'rugged', '~> 0.16.0' gem 'grack', :git => 'git://github.com/rdblue/grack.git', :require => 'git_http' gem "grit", :git => 'git://github.com/warpc/grit.git' #, :path => '~/Sites/code/grit' gem 'charlock_holmes', '~> 0.6.9' #, :git => 'git://github.com/brianmario/charlock_holmes.git', :branch => 'bundle-icu' -# gem 'ruby-filemagic', '~> 0.4.2', :require => 'filemagic/ext' gem 'github-linguist', '~> 2.2.1', :require => 'linguist' gem 'diff-display', '~> 0.0.1' diff --git a/Gemfile.lock b/Gemfile.lock index f0d3d512d..ce5f26d62 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,24 +13,16 @@ GIT mime-types (~> 1.15) posix-spawn (~> 0.3.6) -GIT - remote: git://github.com/warpc/redhillonrails_core.git - revision: c0945a4c6ad4bae4ca2750b105efcff162408b15 - branch: rails31 - specs: - redhillonrails_core (2.0.0.pre) - activerecord (>= 3.1.0.rc) - GEM remote: https://rubygems.org/ specs: RedCloth (4.2.9) - actionmailer (3.2.12) - actionpack (= 3.2.12) - mail (~> 2.4.4) - actionpack (3.2.12) - activemodel (= 3.2.12) - activesupport (= 3.2.12) + actionmailer (3.2.13) + actionpack (= 3.2.13) + mail (~> 2.5.3) + actionpack (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -38,21 +30,21 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.12) - activesupport (= 3.2.12) + activemodel (3.2.13) + activesupport (= 3.2.13) builder (~> 3.0.0) - activerecord (3.2.12) - activemodel (= 3.2.12) - activesupport (= 3.2.12) + activerecord (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.12) - activemodel (= 3.2.12) - activesupport (= 3.2.12) - activesupport (3.2.12) - i18n (~> 0.6) + activeresource (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) + activesupport (3.2.13) + i18n (= 0.6.1) multi_json (~> 1.0) - airbrake (3.1.7) + airbrake (3.1.8) activesupport builder json @@ -63,24 +55,24 @@ GEM encryptor (>= 1.1.1) bcrypt-ruby (3.0.1) blankslate (3.1.2) - bluepill (0.0.60) + bluepill (0.0.62) activesupport (>= 3.0.0) - daemons (~> 1.1.4, <= 1.1.6) + daemons (~> 1.1.4) i18n (>= 0.5.0) state_machine (~> 1.1.0) - bourne (1.1.2) - mocha (= 0.10.5) + bourne (1.2.1) + mocha (= 0.12.7) builder (3.0.4) cancan (1.6.7) - cape (1.6.0) - capistrano (2.14.1) + cape (1.7.0) + capistrano (2.14.2) highline net-scp (>= 1.0.0) net-sftp (>= 2.0.0) net-ssh (>= 2.0.14) net-ssh-gateway (>= 1.1.0) capistrano_colors (0.5.5) - charlock_holmes (0.6.9) + charlock_holmes (0.6.9.1) chronic (0.6.7) chunky_png (1.2.7) cocaine (0.4.2) @@ -90,7 +82,7 @@ GEM coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.4.0) + coffee-script-source (1.6.1) compass (0.12.2) chunky_png (~> 1.2) fssm (>= 0.2.7) @@ -98,7 +90,7 @@ GEM compass-rails (1.0.3) compass (>= 0.12.2, < 0.14) creole (0.5.0) - daemons (1.1.6) + daemons (1.1.9) devise (2.1.3) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) @@ -110,7 +102,7 @@ GEM encryptor (1.1.3) erubis (2.7.0) escape_utils (0.2.4) - eventmachine (1.0.0) + eventmachine (1.0.3) execjs (1.4.0) multi_json (~> 1.0) expression_parser (0.9.0) @@ -140,14 +132,14 @@ GEM sinatra (~> 1.0) stringex (~> 1.4.0) useragent (~> 0.4.9) - haml (3.1.7) + haml (3.1.8) haml-rails (0.3.5) actionpack (>= 3.1, < 4.1) activesupport (>= 3.1, < 4.1) haml (~> 3.1) railties (>= 3.1, < 4.1) hashie (1.2.0) - highline (1.6.15) + highline (1.6.16) hike (1.2.1) hirb (0.7.1) i18n (0.6.1) @@ -162,14 +154,14 @@ GEM libv8 (3.3.10.4) macaddr (1.6.1) systemu (~> 2.5.0) - mail (2.4.4) + mail (2.5.3) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mailcatcher (0.5.10) + mailcatcher (0.5.11) activesupport (~> 3.0) eventmachine (~> 1.0.0) - haml (~> 3.1) + haml (>= 3.1, < 5) mail (~> 2.3) sinatra (~> 1.2) skinny (~> 0.2.3) @@ -179,21 +171,21 @@ GEM actionpack metaclass (0.0.1) mime-types (1.21) - mocha (0.10.5) + mocha (0.12.7) metaclass (~> 0.0.1) mock_redis (0.6.2) - multi_json (1.5.1) + multi_json (1.7.1) mustache (0.99.4) - net-scp (1.0.4) - net-ssh (>= 1.99.1) - net-sftp (2.0.5) - net-ssh (>= 2.0.9) - net-ssh (2.6.3) - net-ssh-gateway (1.1.0) - net-ssh (>= 1.99.1) + net-scp (1.1.0) + net-ssh (>= 2.6.5) + net-sftp (2.1.1) + net-ssh (>= 2.6.5) + net-ssh (2.6.6) + net-ssh-gateway (1.2.0) + net-ssh (>= 2.6.5) newrelic_rpm (3.5.5.38) - nokogiri (1.5.6) - omniauth (1.1.1) + nokogiri (1.5.7) + omniauth (1.1.3) hashie (~> 1.2) rack omniauth-openid (1.0.1) @@ -221,7 +213,7 @@ GEM rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) - rack-protection (1.3.2) + rack-protection (1.5.0) rack rack-ssl (1.3.3) rack @@ -229,36 +221,36 @@ GEM rack (>= 1.0) rack-throttle (0.3.0) rack (>= 1.0.0) - rails (3.2.12) - actionmailer (= 3.2.12) - actionpack (= 3.2.12) - activerecord (= 3.2.12) - activeresource (= 3.2.12) - activesupport (= 3.2.12) + rails (3.2.13) + actionmailer (= 3.2.13) + actionpack (= 3.2.13) + activerecord (= 3.2.13) + activeresource (= 3.2.13) + activesupport (= 3.2.13) bundler (~> 1.0) - railties (= 3.2.12) + railties (= 3.2.13) rails-backbone (0.7.2) coffee-script (~> 2.2.0) ejs (~> 1.0.0) railties (>= 3.1.0) rails3-generators (1.0.0) railties (>= 3.0.0) - rails3-jquery-autocomplete (1.0.10) + rails3-jquery-autocomplete (1.0.11) rails (~> 3.0) - railties (3.2.12) - actionpack (= 3.2.12) - activesupport (= 3.2.12) + railties (3.2.13) + actionpack (= 3.2.13) + activesupport (= 3.2.13) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) raindrops (0.10.0) rake (10.0.3) - rdiscount (2.0.7) - rdoc (3.12.1) + rdiscount (2.0.7.1) + rdoc (3.12.2) json (~> 1.4) redcarpet (2.1.1) - redis (3.0.2) + redis (3.0.3) redis-namespace (1.2.1) redis (~> 3.0.0) redisk (0.2.2) @@ -294,7 +286,7 @@ GEM ruby-haml-js (0.0.3) execjs sprockets (>= 2.0.0) - ruby-openid (2.2.2) + ruby-openid (2.2.3) rubypython (0.5.3) blankslate (>= 2.1.2.3) ffi (~> 1.0.7) @@ -304,21 +296,21 @@ GEM capistrano (>= 2.0.0) sanitize (2.0.3) nokogiri (>= 1.4.4, < 1.6) - sass (3.2.5) + sass (3.2.7) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) shotgun (0.9) rack (>= 1.0) - shoulda (3.3.2) - shoulda-context (~> 1.0.1) - shoulda-matchers (~> 1.4.1) + shoulda (3.4.0) + shoulda-context (~> 1.0, >= 1.0.1) + shoulda-matchers (~> 1.0, >= 1.4.1) shoulda-context (1.0.2) - shoulda-matchers (1.4.2) + shoulda-matchers (1.5.0) activesupport (>= 3.0.0) - bourne (~> 1.1.2) - sinatra (1.3.4) + bourne (~> 1.2.0) + sinatra (1.3.6) rack (~> 1.4) rack-protection (~> 1.3) tilt (~> 1.3, >= 1.3.3) @@ -336,19 +328,19 @@ GEM systemu (2.5.2) therubyracer (0.10.2) libv8 (~> 3.3.10) - thin (1.5.0) + thin (1.5.1) daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) thor (0.17.0) - tilt (1.3.3) + tilt (1.3.5) treetop (1.4.12) polyglot polyglot (>= 0.3.1) turbo-sprockets-rails3 (0.3.6) railties (> 3.2.8, < 4.0.0) sprockets (>= 2.0.0) - tzinfo (0.3.35) + tzinfo (0.3.37) uglifier (1.2.7) execjs (>= 0.3.0) multi_json (~> 1.3) @@ -357,7 +349,7 @@ GEM rack raindrops (~> 0.7) useragent (0.4.16) - uuid (2.3.5) + uuid (2.3.7) macaddr (~> 1.0) vegas (0.1.11) rack (>= 1.0.0) @@ -410,13 +402,12 @@ DEPENDENCIES perform_later (~> 1.3.0) pg (~> 0.14.0) rack-throttle - rails (= 3.2.12) + rails (= 3.2.13) rails-backbone (~> 0.7.2) rails3-generators rails3-jquery-autocomplete (~> 1.0.7) rdiscount redcarpet (~> 2.1.1) - redhillonrails_core! resque (~> 1.21.0) resque-status (~> 0.3.3) resque_mailer (~> 2.1.0)