rails 3.1.rc4 -> rails 3.1.rc6
This commit is contained in:
chris2tof
parent
e0e14ddfac
commit
090b1fdd7f
12
Gemfile
12
Gemfile
|
|
@ -4,7 +4,7 @@ gem 'rails', '>=3.1.0.rc4'
|
||||||
gem 'yajl-ruby', :require => 'yajl'
|
gem 'yajl-ruby', :require => 'yajl'
|
||||||
|
|
||||||
gem 'bson_ext'
|
gem 'bson_ext'
|
||||||
gem 'carrierwave'
|
gem 'carrierwave', '0.5.6'
|
||||||
gem 'ckeditor'
|
gem 'ckeditor'
|
||||||
gem 'devise'
|
gem 'devise'
|
||||||
gem 'mini_magick'
|
gem 'mini_magick'
|
||||||
|
|
@ -16,6 +16,16 @@ gem 'mongoid'
|
||||||
gem 'rake', '>=0.9.2'
|
gem 'rake', '>=0.9.2'
|
||||||
gem 'jquery-rails', '>= 1.0.3'
|
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+)
|
# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
|
||||||
# gem 'ruby-debug'
|
# gem 'ruby-debug'
|
||||||
gem 'ruby-debug19'
|
gem 'ruby-debug19'
|
||||||
|
|
|
||||||
136
Gemfile.lock
136
Gemfile.lock
|
|
@ -1,49 +1,55 @@
|
||||||
GEM
|
GEM
|
||||||
remote: http://rubygems.org/
|
remote: http://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (3.1.0.rc4)
|
actionmailer (3.1.0.rc6)
|
||||||
actionpack (= 3.1.0.rc4)
|
actionpack (= 3.1.0.rc6)
|
||||||
mail (~> 2.3.0)
|
mail (~> 2.3.0)
|
||||||
actionpack (3.1.0.rc4)
|
actionpack (3.1.0.rc6)
|
||||||
activemodel (= 3.1.0.rc4)
|
activemodel (= 3.1.0.rc6)
|
||||||
activesupport (= 3.1.0.rc4)
|
activesupport (= 3.1.0.rc6)
|
||||||
builder (~> 3.0.0)
|
builder (~> 3.0.0)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
i18n (~> 0.6)
|
i18n (~> 0.6)
|
||||||
rack (~> 1.3.0)
|
rack (~> 1.3.2)
|
||||||
rack-cache (~> 1.0.1)
|
rack-cache (~> 1.0.2)
|
||||||
rack-mount (~> 0.8.1)
|
rack-mount (~> 0.8.1)
|
||||||
rack-test (~> 0.6.0)
|
rack-test (~> 0.6.0)
|
||||||
sprockets (~> 2.0.0.beta.10)
|
sprockets (~> 2.0.0.beta.12)
|
||||||
tzinfo (~> 0.3.27)
|
activemodel (3.1.0.rc6)
|
||||||
activemodel (3.1.0.rc4)
|
activesupport (= 3.1.0.rc6)
|
||||||
activesupport (= 3.1.0.rc4)
|
|
||||||
bcrypt-ruby (~> 2.1.4)
|
bcrypt-ruby (~> 2.1.4)
|
||||||
builder (~> 3.0.0)
|
builder (~> 3.0.0)
|
||||||
i18n (~> 0.6)
|
i18n (~> 0.6)
|
||||||
activerecord (3.1.0.rc4)
|
activerecord (3.1.0.rc6)
|
||||||
activemodel (= 3.1.0.rc4)
|
activemodel (= 3.1.0.rc6)
|
||||||
activesupport (= 3.1.0.rc4)
|
activesupport (= 3.1.0.rc6)
|
||||||
arel (~> 2.1.1)
|
arel (~> 2.2.1)
|
||||||
tzinfo (~> 0.3.27)
|
tzinfo (~> 0.3.29)
|
||||||
activeresource (3.1.0.rc4)
|
activeresource (3.1.0.rc6)
|
||||||
activemodel (= 3.1.0.rc4)
|
activemodel (= 3.1.0.rc6)
|
||||||
activesupport (= 3.1.0.rc4)
|
activesupport (= 3.1.0.rc6)
|
||||||
activesupport (3.1.0.rc4)
|
activesupport (3.1.0.rc6)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
archive-tar-minitar (0.5.2)
|
archive-tar-minitar (0.5.2)
|
||||||
arel (2.1.3)
|
arel (2.2.1)
|
||||||
bcrypt-ruby (2.1.4)
|
bcrypt-ruby (2.1.4)
|
||||||
bcrypt-ruby (2.1.4-x86-mingw32)
|
|
||||||
bson (1.3.1)
|
bson (1.3.1)
|
||||||
bson_ext (1.3.1)
|
bson_ext (1.3.1)
|
||||||
builder (3.0.0)
|
builder (3.0.0)
|
||||||
carrierwave (0.5.4)
|
carrierwave (0.5.6)
|
||||||
activesupport (~> 3.0)
|
activesupport (~> 3.0)
|
||||||
chronic (0.5.0)
|
chronic (0.6.2)
|
||||||
ckeditor (3.5.4)
|
ckeditor (3.6.1)
|
||||||
mime-types (>= 1.16)
|
mime-types (~> 1.16)
|
||||||
columnize (0.3.2)
|
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)
|
delorean (1.1.0)
|
||||||
chronic
|
chronic
|
||||||
devise (1.4.2)
|
devise (1.4.2)
|
||||||
|
|
@ -52,13 +58,15 @@ GEM
|
||||||
warden (~> 1.0.3)
|
warden (~> 1.0.3)
|
||||||
diff-lcs (1.1.2)
|
diff-lcs (1.1.2)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
factory_girl (1.3.3)
|
execjs (1.2.4)
|
||||||
factory_girl_rails (1.0.1)
|
multi_json (~> 1.0)
|
||||||
factory_girl (~> 1.3)
|
factory_girl (2.0.4)
|
||||||
|
factory_girl_rails (1.1.0)
|
||||||
|
factory_girl (~> 2.0.0)
|
||||||
railties (>= 3.0.0)
|
railties (>= 3.0.0)
|
||||||
hike (1.1.0)
|
hike (1.2.1)
|
||||||
i18n (0.6.0)
|
i18n (0.6.0)
|
||||||
jquery-rails (1.0.12)
|
jquery-rails (1.0.13)
|
||||||
railties (~> 3.0)
|
railties (~> 3.0)
|
||||||
thor (~> 0.14)
|
thor (~> 0.14)
|
||||||
linecache19 (0.5.12)
|
linecache19 (0.5.12)
|
||||||
|
|
@ -72,40 +80,40 @@ GEM
|
||||||
subexec (~> 0.1.0)
|
subexec (~> 0.1.0)
|
||||||
mongo (1.3.1)
|
mongo (1.3.1)
|
||||||
bson (>= 1.3.1)
|
bson (>= 1.3.1)
|
||||||
mongoid (2.0.2)
|
mongoid (2.1.9)
|
||||||
activemodel (~> 3.0)
|
activemodel (~> 3.0)
|
||||||
mongo (~> 1.3)
|
mongo (~> 1.3)
|
||||||
tzinfo (~> 0.3.22)
|
tzinfo (~> 0.3.22)
|
||||||
multi_json (1.0.3)
|
multi_json (1.0.3)
|
||||||
orm_adapter (0.0.5)
|
orm_adapter (0.0.5)
|
||||||
polyglot (0.3.1)
|
polyglot (0.3.2)
|
||||||
rack (1.3.0)
|
rack (1.3.2)
|
||||||
rack-cache (1.0.2)
|
rack-cache (1.0.2)
|
||||||
rack (>= 0.4)
|
rack (>= 0.4)
|
||||||
rack-mount (0.8.1)
|
rack-mount (0.8.2)
|
||||||
rack (>= 1.0.0)
|
rack (>= 1.0.0)
|
||||||
rack-ssl (1.3.2)
|
rack-ssl (1.3.2)
|
||||||
rack
|
rack
|
||||||
rack-test (0.6.0)
|
rack-test (0.6.1)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (3.1.0.rc4)
|
rails (3.1.0.rc6)
|
||||||
actionmailer (= 3.1.0.rc4)
|
actionmailer (= 3.1.0.rc6)
|
||||||
actionpack (= 3.1.0.rc4)
|
actionpack (= 3.1.0.rc6)
|
||||||
activerecord (= 3.1.0.rc4)
|
activerecord (= 3.1.0.rc6)
|
||||||
activeresource (= 3.1.0.rc4)
|
activeresource (= 3.1.0.rc6)
|
||||||
activesupport (= 3.1.0.rc4)
|
activesupport (= 3.1.0.rc6)
|
||||||
bundler (~> 1.0)
|
bundler (~> 1.0)
|
||||||
railties (= 3.1.0.rc4)
|
railties (= 3.1.0.rc6)
|
||||||
railties (3.1.0.rc4)
|
railties (3.1.0.rc6)
|
||||||
actionpack (= 3.1.0.rc4)
|
actionpack (= 3.1.0.rc6)
|
||||||
activesupport (= 3.1.0.rc4)
|
activesupport (= 3.1.0.rc6)
|
||||||
rack-ssl (~> 1.3.2)
|
rack-ssl (~> 1.3.2)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
rdoc (~> 3.4)
|
rdoc (~> 3.4)
|
||||||
thor (~> 0.14.6)
|
thor (~> 0.14.6)
|
||||||
rake (0.9.2)
|
rake (0.9.2)
|
||||||
rcov (0.9.9)
|
rcov (0.9.10)
|
||||||
rdoc (3.8)
|
rdoc (3.9.2)
|
||||||
rspec (2.6.0)
|
rspec (2.6.0)
|
||||||
rspec-core (~> 2.6.0)
|
rspec-core (~> 2.6.0)
|
||||||
rspec-expectations (~> 2.6.0)
|
rspec-expectations (~> 2.6.0)
|
||||||
|
|
@ -130,33 +138,42 @@ GEM
|
||||||
ruby_core_source (0.1.5)
|
ruby_core_source (0.1.5)
|
||||||
archive-tar-minitar (>= 0.5.2)
|
archive-tar-minitar (>= 0.5.2)
|
||||||
rubyzip (0.9.4)
|
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)
|
sinatra (1.2.6)
|
||||||
rack (~> 1.1)
|
rack (~> 1.1)
|
||||||
tilt (>= 1.2.2, < 2.0)
|
tilt (< 2.0, >= 1.2.2)
|
||||||
sprockets (2.0.0.beta.10)
|
sprockets (2.0.0.beta.13)
|
||||||
hike (~> 1.0)
|
hike (~> 1.2)
|
||||||
rack (~> 1.0)
|
rack (~> 1.0)
|
||||||
tilt (!= 1.3.0, ~> 1.1)
|
tilt (!= 1.3.0, ~> 1.1)
|
||||||
subexec (0.1.0)
|
subexec (0.1.0)
|
||||||
thor (0.14.6)
|
thor (0.14.6)
|
||||||
tilt (1.3.2)
|
tilt (1.3.2)
|
||||||
treetop (1.4.9)
|
treetop (1.4.10)
|
||||||
|
polyglot
|
||||||
polyglot (>= 0.3.1)
|
polyglot (>= 0.3.1)
|
||||||
tzinfo (0.3.29)
|
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)
|
rack (>= 1.0)
|
||||||
watchr (0.7)
|
watchr (0.7)
|
||||||
yajl-ruby (0.8.2)
|
yajl-ruby (0.8.3)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
ruby
|
ruby
|
||||||
x86-mingw32
|
|
||||||
|
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
bson_ext
|
bson_ext
|
||||||
carrierwave
|
carrierwave (= 0.5.6)
|
||||||
ckeditor
|
ckeditor
|
||||||
|
coffee-rails (~> 3.1.0.rc)
|
||||||
delorean
|
delorean
|
||||||
devise
|
devise
|
||||||
factory_girl_rails
|
factory_girl_rails
|
||||||
|
|
@ -170,7 +187,10 @@ DEPENDENCIES
|
||||||
rspec-rails (~> 2.0)
|
rspec-rails (~> 2.0)
|
||||||
ruby-debug19
|
ruby-debug19
|
||||||
rubyzip
|
rubyzip
|
||||||
|
sass-rails (~> 3.1.0.rc)
|
||||||
shoulda-matchers
|
shoulda-matchers
|
||||||
sinatra
|
sinatra
|
||||||
|
sprockets (= 2.0.0.beta.13)
|
||||||
|
uglifier
|
||||||
watchr
|
watchr
|
||||||
yajl-ruby
|
yajl-ruby
|
||||||
|
|
|
||||||
|
|
@ -7,9 +7,10 @@ require "action_mailer/railtie"
|
||||||
require "active_resource/railtie"
|
require "active_resource/railtie"
|
||||||
require "rails/test_unit/railtie"
|
require "rails/test_unit/railtie"
|
||||||
|
|
||||||
# If you have a Gemfile, require the gems listed there, including any gems
|
# If you have a Gemfile, require the default gems, the ones in the
|
||||||
# you've limited to :test, :development, or :production.
|
# current environment and also include :assets gems if in development
|
||||||
Bundler.require(:default, Rails.env) if defined?(Bundler)
|
# or test environments.
|
||||||
|
Bundler.require *Rails.groups(:assets) if defined?(Bundler)
|
||||||
|
|
||||||
module PrototypeR4
|
module PrototypeR4
|
||||||
class Application < Rails::Application
|
class Application < Rails::Application
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue