From 090b1fdd7fb822db4d40e8413320d03172070ff5 Mon Sep 17 00:00:00 2001 From: chris2tof Date: Tue, 23 Aug 2011 19:04:45 +0800 Subject: [PATCH] rails 3.1.rc4 -> rails 3.1.rc6 --- Gemfile | 12 +++- Gemfile.lock | 136 ++++++++++++++++++++++++------------------ config/application.rb | 7 ++- 3 files changed, 93 insertions(+), 62 deletions(-) diff --git a/Gemfile b/Gemfile index 05a549e38..a9813caa3 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ gem 'rails', '>=3.1.0.rc4' gem 'yajl-ruby', :require => 'yajl' gem 'bson_ext' -gem 'carrierwave' +gem 'carrierwave', '0.5.6' gem 'ckeditor' gem 'devise' gem 'mini_magick' @@ -16,6 +16,16 @@ gem 'mongoid' gem 'rake', '>=0.9.2' gem 'jquery-rails', '>= 1.0.3' +gem 'sprockets', '2.0.0.beta.13' + +# Gems used only for assets and not required +# in production environments by default. +group :assets do + gem 'sass-rails', "~> 3.1.0.rc" + gem 'coffee-rails', "~> 3.1.0.rc" + gem 'uglifier' +end + # To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+) # gem 'ruby-debug' gem 'ruby-debug19' diff --git a/Gemfile.lock b/Gemfile.lock index 00b661971..7177ff7e8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,49 +1,55 @@ GEM remote: http://rubygems.org/ specs: - actionmailer (3.1.0.rc4) - actionpack (= 3.1.0.rc4) + actionmailer (3.1.0.rc6) + actionpack (= 3.1.0.rc6) mail (~> 2.3.0) - actionpack (3.1.0.rc4) - activemodel (= 3.1.0.rc4) - activesupport (= 3.1.0.rc4) + actionpack (3.1.0.rc6) + activemodel (= 3.1.0.rc6) + activesupport (= 3.1.0.rc6) builder (~> 3.0.0) erubis (~> 2.7.0) i18n (~> 0.6) - rack (~> 1.3.0) - rack-cache (~> 1.0.1) + rack (~> 1.3.2) + rack-cache (~> 1.0.2) rack-mount (~> 0.8.1) rack-test (~> 0.6.0) - sprockets (~> 2.0.0.beta.10) - tzinfo (~> 0.3.27) - activemodel (3.1.0.rc4) - activesupport (= 3.1.0.rc4) + sprockets (~> 2.0.0.beta.12) + activemodel (3.1.0.rc6) + activesupport (= 3.1.0.rc6) bcrypt-ruby (~> 2.1.4) builder (~> 3.0.0) i18n (~> 0.6) - activerecord (3.1.0.rc4) - activemodel (= 3.1.0.rc4) - activesupport (= 3.1.0.rc4) - arel (~> 2.1.1) - tzinfo (~> 0.3.27) - activeresource (3.1.0.rc4) - activemodel (= 3.1.0.rc4) - activesupport (= 3.1.0.rc4) - activesupport (3.1.0.rc4) + activerecord (3.1.0.rc6) + activemodel (= 3.1.0.rc6) + activesupport (= 3.1.0.rc6) + arel (~> 2.2.1) + tzinfo (~> 0.3.29) + activeresource (3.1.0.rc6) + activemodel (= 3.1.0.rc6) + activesupport (= 3.1.0.rc6) + activesupport (3.1.0.rc6) multi_json (~> 1.0) archive-tar-minitar (0.5.2) - arel (2.1.3) + arel (2.2.1) bcrypt-ruby (2.1.4) - bcrypt-ruby (2.1.4-x86-mingw32) bson (1.3.1) bson_ext (1.3.1) builder (3.0.0) - carrierwave (0.5.4) + carrierwave (0.5.6) activesupport (~> 3.0) - chronic (0.5.0) - ckeditor (3.5.4) - mime-types (>= 1.16) - columnize (0.3.2) + chronic (0.6.2) + ckeditor (3.6.1) + mime-types (~> 1.16) + orm_adapter (~> 0.0.5) + coffee-rails (3.1.0.rc.6) + coffee-script (>= 2.2.0) + railties (~> 3.1.0.rc1) + coffee-script (2.2.0) + coffee-script-source + execjs + coffee-script-source (1.1.2) + columnize (0.3.4) delorean (1.1.0) chronic devise (1.4.2) @@ -52,13 +58,15 @@ GEM warden (~> 1.0.3) diff-lcs (1.1.2) erubis (2.7.0) - factory_girl (1.3.3) - factory_girl_rails (1.0.1) - factory_girl (~> 1.3) + execjs (1.2.4) + multi_json (~> 1.0) + factory_girl (2.0.4) + factory_girl_rails (1.1.0) + factory_girl (~> 2.0.0) railties (>= 3.0.0) - hike (1.1.0) + hike (1.2.1) i18n (0.6.0) - jquery-rails (1.0.12) + jquery-rails (1.0.13) railties (~> 3.0) thor (~> 0.14) linecache19 (0.5.12) @@ -72,40 +80,40 @@ GEM subexec (~> 0.1.0) mongo (1.3.1) bson (>= 1.3.1) - mongoid (2.0.2) + mongoid (2.1.9) activemodel (~> 3.0) mongo (~> 1.3) tzinfo (~> 0.3.22) multi_json (1.0.3) orm_adapter (0.0.5) - polyglot (0.3.1) - rack (1.3.0) + polyglot (0.3.2) + rack (1.3.2) rack-cache (1.0.2) rack (>= 0.4) - rack-mount (0.8.1) + rack-mount (0.8.2) rack (>= 1.0.0) rack-ssl (1.3.2) rack - rack-test (0.6.0) + rack-test (0.6.1) rack (>= 1.0) - rails (3.1.0.rc4) - actionmailer (= 3.1.0.rc4) - actionpack (= 3.1.0.rc4) - activerecord (= 3.1.0.rc4) - activeresource (= 3.1.0.rc4) - activesupport (= 3.1.0.rc4) + rails (3.1.0.rc6) + actionmailer (= 3.1.0.rc6) + actionpack (= 3.1.0.rc6) + activerecord (= 3.1.0.rc6) + activeresource (= 3.1.0.rc6) + activesupport (= 3.1.0.rc6) bundler (~> 1.0) - railties (= 3.1.0.rc4) - railties (3.1.0.rc4) - actionpack (= 3.1.0.rc4) - activesupport (= 3.1.0.rc4) + railties (= 3.1.0.rc6) + railties (3.1.0.rc6) + actionpack (= 3.1.0.rc6) + activesupport (= 3.1.0.rc6) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.6) rake (0.9.2) - rcov (0.9.9) - rdoc (3.8) + rcov (0.9.10) + rdoc (3.9.2) rspec (2.6.0) rspec-core (~> 2.6.0) rspec-expectations (~> 2.6.0) @@ -130,33 +138,42 @@ GEM ruby_core_source (0.1.5) archive-tar-minitar (>= 0.5.2) rubyzip (0.9.4) - shoulda-matchers (1.0.0.beta2) + sass (3.1.7) + sass-rails (3.1.0.rc.6) + actionpack (~> 3.1.0.rc6) + railties (~> 3.1.0.rc6) + sass (>= 3.1.4) + shoulda-matchers (1.0.0.beta3) sinatra (1.2.6) rack (~> 1.1) - tilt (>= 1.2.2, < 2.0) - sprockets (2.0.0.beta.10) - hike (~> 1.0) + tilt (< 2.0, >= 1.2.2) + sprockets (2.0.0.beta.13) + hike (~> 1.2) rack (~> 1.0) tilt (!= 1.3.0, ~> 1.1) subexec (0.1.0) thor (0.14.6) tilt (1.3.2) - treetop (1.4.9) + treetop (1.4.10) + polyglot polyglot (>= 0.3.1) tzinfo (0.3.29) - warden (1.0.4) + uglifier (1.0.1) + execjs (>= 0.3.0) + multi_json (>= 1.0.2) + warden (1.0.5) rack (>= 1.0) watchr (0.7) - yajl-ruby (0.8.2) + yajl-ruby (0.8.3) PLATFORMS ruby - x86-mingw32 DEPENDENCIES bson_ext - carrierwave + carrierwave (= 0.5.6) ckeditor + coffee-rails (~> 3.1.0.rc) delorean devise factory_girl_rails @@ -170,7 +187,10 @@ DEPENDENCIES rspec-rails (~> 2.0) ruby-debug19 rubyzip + sass-rails (~> 3.1.0.rc) shoulda-matchers sinatra + sprockets (= 2.0.0.beta.13) + uglifier watchr yajl-ruby diff --git a/config/application.rb b/config/application.rb index 421687cfd..3a0d774dd 100644 --- a/config/application.rb +++ b/config/application.rb @@ -7,9 +7,10 @@ require "action_mailer/railtie" require "active_resource/railtie" require "rails/test_unit/railtie" -# If you have a Gemfile, require the gems listed there, including any gems -# you've limited to :test, :development, or :production. -Bundler.require(:default, Rails.env) if defined?(Bundler) +# If you have a Gemfile, require the default gems, the ones in the +# current environment and also include :assets gems if in development +# or test environments. +Bundler.require *Rails.groups(:assets) if defined?(Bundler) module PrototypeR4 class Application < Rails::Application