Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update Rails to 3.2.x

  • Loading branch information...
commit 5821f29d70571d755cdc13694fece86bfdc92f21 1 parent c51aaee
Jason Lee huacnlee authored
Showing with 75 additions and 83 deletions.
  1. +12 −10 Gemfile
  2. +62 −58 Gemfile.lock
  3. +1 −15 config/environments/development.rb
22 Gemfile
View
@@ -1,6 +1,6 @@
source 'http://ruby.taobao.org'
-gem "rails", "3.1.3"
+gem "rails", "3.2.1"
gem "bson_ext", "1.5.2"
gem "mongoid", "2.3.4"
@@ -21,14 +21,14 @@ gem 'will_paginate', '3.0.2'
gem 'bootstrap-will_paginate', '0.0.3'
# 三方平台 OAuth 验证登陆
-gem "omniauth"
-gem 'omniauth-openid'
-gem "omniauth-github"
-gem "omniauth-twitter"
+gem "omniauth", "~> 1.0.1"
+gem 'omniauth-openid', "~> 1.0.1"
+gem "omniauth-github", "~> 1.0.0"
+gem "omniauth-twitter", "~> 0.0.7"
gem "omniauth-douban", :git => "git://github.com/ballantyne/omniauth-douban.git"
# permission
-gem "cancan"
+gem "cancan", "~> 1.6.7"
# Rails I18n
gem "rails-i18n","0.1.8"
@@ -47,7 +47,7 @@ gem "jquery-rails", "1.0.16"
gem "rails_autolink", ">= 1.0.4"
# YAML 配置信息
gem "settingslogic", "~> 2.0.6"
-gem "cells", "3.6.7"
+gem "cells", "3.7.1"
gem "resque", "~> 1.19.0", :require => "resque/server"
gem "resque_mailer", '2.0.2'
gem "aws-ses", "~> 0.4.3"
@@ -63,11 +63,13 @@ gem 'simple_form', :git => "git://github.com/plataformatec/simple_form.git"
gem 'bootstrap-rails', :require => 'bootstrap-rails', :git => 'git://github.com/xdite/bootstrap-rails.git'
gem 'sunspot_rails', "~> 1.3.0"
gem 'sunspot_solr'
+# 禁用 assets 日志
+gem 'quiet_assets', :git => 'git://github.com/AgilionApps/quiet_assets.git'
group :assets do
- gem 'sass-rails', " ~> 3.1.4"
- gem 'coffee-rails', "~> 3.1.1"
- gem 'uglifier'
+ gem 'sass-rails', " ~> 3.2.3"
+ gem 'coffee-rails', "~> 3.2.1"
+ gem 'uglifier', '>= 1.0.3'
end
group :development do
120 Gemfile.lock
View
@@ -5,6 +5,12 @@ GIT
mail_view (1.0.1)
GIT
+ remote: git://github.com/AgilionApps/quiet_assets.git
+ revision: b699ee6c8aac59dc2e1405e98aef82802e8b8098
+ specs:
+ quiet_assets (0.0.1)
+
+GIT
remote: git://github.com/ballantyne/omniauth-douban.git
revision: 7affc4a09216f1c82a271a691ade3ba990e20a24
specs:
@@ -32,36 +38,35 @@ GIT
GEM
remote: http://ruby.taobao.org/
specs:
- actionmailer (3.1.3)
- actionpack (= 3.1.3)
- mail (~> 2.3.0)
- actionpack (3.1.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
+ actionmailer (3.2.1)
+ actionpack (= 3.2.1)
+ mail (~> 2.4.0)
+ actionpack (3.2.1)
+ activemodel (= 3.2.1)
+ activesupport (= 3.2.1)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- i18n (~> 0.6)
- rack (~> 1.3.5)
+ journey (~> 1.0.1)
+ rack (~> 1.4.0)
rack-cache (~> 1.1)
- rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.0.3)
- activemodel (3.1.3)
- activesupport (= 3.1.3)
+ sprockets (~> 2.1.2)
+ activemodel (3.2.1)
+ activesupport (= 3.2.1)
builder (~> 3.0.0)
- i18n (~> 0.6)
- activerecord (3.1.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
- arel (~> 2.2.1)
+ activerecord (3.2.1)
+ activemodel (= 3.2.1)
+ activesupport (= 3.2.1)
+ arel (~> 3.0.0)
tzinfo (~> 0.3.29)
- activeresource (3.1.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
- activesupport (3.1.3)
+ activeresource (3.2.1)
+ activemodel (= 3.2.1)
+ activesupport (= 3.2.1)
+ activesupport (3.2.1)
+ i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.2.6)
- arel (2.2.1)
+ arel (3.0.0)
aws-ses (0.4.4)
builder
mail (> 2.2.5)
@@ -87,17 +92,17 @@ GEM
carrierwave-mongoid (0.1.2)
carrierwave (>= 0.5.6)
mongoid (~> 2.1)
- cells (3.6.7)
+ cells (3.7.1)
actionpack (~> 3.0)
railties (~> 3.0)
chunky_png (1.2.5)
- coffee-rails (3.1.1)
+ coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
- railties (~> 3.1.0)
+ railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.1.3)
+ coffee-script-source (1.2.0)
daemon-spawn (0.4.2)
dalli (1.1.1)
devise (1.5.2)
@@ -125,12 +130,13 @@ GEM
hike (1.2.1)
hpricot (0.8.5)
i18n (0.6.0)
+ journey (1.0.1)
jquery-rails (1.0.16)
railties (~> 3.0)
thor (~> 0.14)
- json (1.6.4)
+ json (1.6.5)
kgio (2.6.0)
- mail (2.3.0)
+ mail (2.4.1)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
@@ -188,11 +194,9 @@ GEM
options (~> 2.3.0)
pygments.rb (0.2.4)
rubypython (~> 0.5.3)
- rack (1.3.6)
+ rack (1.4.1)
rack-cache (1.1)
rack (>= 0.4)
- rack-mount (0.8.3)
- rack (>= 1.0.0)
rack-openid (1.3.1)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
@@ -202,21 +206,21 @@ GEM
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.1.3)
- actionmailer (= 3.1.3)
- actionpack (= 3.1.3)
- activerecord (= 3.1.3)
- activeresource (= 3.1.3)
- activesupport (= 3.1.3)
+ rails (3.2.1)
+ actionmailer (= 3.2.1)
+ actionpack (= 3.2.1)
+ activerecord (= 3.2.1)
+ activeresource (= 3.2.1)
+ activesupport (= 3.2.1)
bundler (~> 1.0)
- railties (= 3.1.3)
+ railties (= 3.2.1)
rails-i18n (0.1.8)
i18n (~> 0.5)
rails_autolink (1.0.4)
rails (>= 3.1.0)
- railties (3.1.3)
- actionpack (= 3.1.3)
- activesupport (= 3.1.3)
+ railties (3.2.1)
+ actionpack (= 3.2.1)
+ activesupport (= 3.2.1)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -258,12 +262,11 @@ GEM
rubypython (0.5.3)
blankslate (>= 2.1.2.3)
ffi (~> 1.0.7)
- sass (3.1.11)
- sass-rails (3.1.5)
- actionpack (~> 3.1.0)
- railties (~> 3.1.0)
- sass (~> 3.1.10)
- tilt (~> 1.3.2)
+ sass (3.1.12)
+ sass-rails (3.2.4)
+ railties (~> 3.2.0)
+ sass (>= 3.1.10)
+ tilt (~> 1.3)
settingslogic (2.0.6)
sinatra (1.3.1)
rack (~> 1.3, >= 1.3.4)
@@ -271,7 +274,7 @@ GEM
tilt (~> 1.3, >= 1.3.3)
social-share-button (0.0.3)
sprite-factory (1.4.1)
- sprockets (2.0.3)
+ sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
@@ -313,13 +316,13 @@ DEPENDENCIES
bootstrap-rails!
bootstrap-will_paginate (= 0.0.3)
bson_ext (= 1.5.2)
- cancan
+ cancan (~> 1.6.7)
capistrano (= 2.9.0)
carrierwave (= 0.5.6)
carrierwave-mongoid (= 0.1.2)
- cells (= 3.6.7)
+ cells (= 3.7.1)
chunky_png (= 1.2.5)
- coffee-rails (~> 3.1.1)
+ coffee-rails (~> 3.2.1)
daemon-spawn (~> 0.4.2)
dalli (= 1.1.1)
devise (= 1.5.2)
@@ -333,14 +336,15 @@ DEPENDENCIES
mongoid (= 2.3.4)
mongoid_auto_increment_id (= 0.3.1)
nokogiri (= 1.5.0)
- omniauth
+ omniauth (~> 1.0.1)
omniauth-douban!
- omniauth-github
- omniauth-openid
- omniauth-twitter
+ omniauth-github (~> 1.0.0)
+ omniauth-openid (~> 1.0.1)
+ omniauth-twitter (~> 0.0.7)
progress_bar
pygments.rb
- rails (= 3.1.3)
+ quiet_assets!
+ rails (= 3.2.1)
rails-i18n (= 0.1.8)
rails_autolink (>= 1.0.4)
redcarpet (~> 2.0.0)
@@ -349,13 +353,13 @@ DEPENDENCIES
resque (~> 1.19.0)
resque_mailer (= 2.0.2)
rspec-rails (~> 2.8.1)
- sass-rails (~> 3.1.4)
+ sass-rails (~> 3.2.3)
settingslogic (~> 2.0.6)
simple_form!
social-share-button (~> 0.0.3)
sprite-factory (= 1.4.1)
sunspot_rails (~> 1.3.0)
sunspot_solr
- uglifier
+ uglifier (>= 1.0.3)
unicorn
will_paginate (= 3.0.2)
16 config/environments/development.rb
View
@@ -28,18 +28,4 @@
config.assets.compress = false
config.assets.debug = true
-
- config.after_initialize do |app|
- app.assets.logger = Logger.new('/dev/null')
- end
-
- config.mongoid.logger = Logger.new($stdout, :warn)
-end
-
-
-Rails::Rack::Logger.class_eval do
- def before_dispatch_with_quiet_assets(env)
- before_dispatch_without_quiet_assets(env) unless env['PATH_INFO'].index("/assets/") == 0
- end
- alias_method_chain :before_dispatch, :quiet_assets
-end
+end
Please sign in to comment.
Something went wrong with that request. Please try again.