Merge pull request #12173 from arunagw/fixes_reverted_by_revert_commit
Revert fixes
This commit is contained in:
commit
005b33222d
@ -5,7 +5,7 @@
|
||||
s.name = 'actionview'
|
||||
s.version = version
|
||||
s.summary = 'Rendering framework putting the V in MVC (part of Rails).'
|
||||
s.description = ''
|
||||
s.description = 'Simple, battle-tested conventions and helpers for building web pages.'
|
||||
|
||||
s.required_ruby_version = '>= 1.9.3'
|
||||
|
||||
|
@ -106,7 +106,11 @@ module LibXML end
|
||||
module Nokogiri end
|
||||
|
||||
setup do
|
||||
@xml = ActiveSupport::XmlMini
|
||||
@xml, @default_backend = ActiveSupport::XmlMini, ActiveSupport::XmlMini.backend
|
||||
end
|
||||
|
||||
teardown do
|
||||
ActiveSupport::XmlMini.backend = @default_backend
|
||||
end
|
||||
|
||||
test "#with_backend should switch backend and then switch back" do
|
||||
@ -135,7 +139,11 @@ module REXML end
|
||||
module LibXML end
|
||||
|
||||
setup do
|
||||
@xml = ActiveSupport::XmlMini
|
||||
@xml, @default_backend = ActiveSupport::XmlMini, ActiveSupport::XmlMini.backend
|
||||
end
|
||||
|
||||
teardown do
|
||||
ActiveSupport::XmlMini.backend = @default_backend
|
||||
end
|
||||
|
||||
test "#with_backend should be thread-safe" do
|
||||
|
@ -16,8 +16,7 @@ class Task < RDoc::Task
|
||||
:include => %w(
|
||||
README.rdoc
|
||||
lib/active_record/**/*.rb
|
||||
),
|
||||
:exclude => 'lib/active_record/vendor/*'
|
||||
)
|
||||
},
|
||||
|
||||
'activemodel' => {
|
||||
@ -33,23 +32,22 @@ class Task < RDoc::Task
|
||||
lib/abstract_controller/**/*.rb
|
||||
lib/action_controller/**/*.rb
|
||||
lib/action_dispatch/**/*.rb
|
||||
),
|
||||
:exclude => 'lib/action_controller/vendor/*'
|
||||
)
|
||||
},
|
||||
|
||||
'actionview' => {
|
||||
:include => %w(
|
||||
README.rdoc
|
||||
lib/action_view/**/*.rb
|
||||
)
|
||||
),
|
||||
:exclude => 'lib/action_view/vendor/*'
|
||||
},
|
||||
|
||||
'actionmailer' => {
|
||||
:include => %w(
|
||||
README.rdoc
|
||||
lib/action_mailer/**/*.rb
|
||||
),
|
||||
:exclude => 'lib/action_mailer/vendor/*'
|
||||
)
|
||||
},
|
||||
|
||||
'railties' => {
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
module Rails
|
||||
module AppRailsLoader
|
||||
RUBY = File.join(*RbConfig::CONFIG.values_at("bindir", "ruby_install_name")) + RbConfig::CONFIG["EXEEXT"]
|
||||
RUBY = Gem.ruby
|
||||
EXECUTABLES = ['bin/rails', 'script/rails']
|
||||
BUNDLER_WARNING = <<EOS
|
||||
Looks like your app's ./bin/rails is a stub that was generated by Bundler.
|
||||
|
Loading…
Reference in New Issue
Block a user