mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Fixed require of bluecloth and redcloth when gems haven't been loaded (closes #4446) [murphy@cYcnus.de]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4070 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
c9c185200d
commit
80081d18f2
2 changed files with 4 additions and 2 deletions
|
@ -1,5 +1,7 @@
|
||||||
*SVN*
|
*SVN*
|
||||||
|
|
||||||
|
* Fixed require of bluecloth and redcloth when gems haven't been loaded #4446 [murphy@cYcnus.de]
|
||||||
|
|
||||||
* Update to Prototype 1.5.0_pre1 [Sam Stephenson]
|
* Update to Prototype 1.5.0_pre1 [Sam Stephenson]
|
||||||
|
|
||||||
* Change #form_for and #fields_for so that the second argument is not required [Dave Thomas]
|
* Change #form_for and #fields_for so that the second argument is not required [Dave Thomas]
|
||||||
|
|
|
@ -77,7 +77,7 @@ module ActionView
|
||||||
end
|
end
|
||||||
|
|
||||||
begin
|
begin
|
||||||
require "redcloth"
|
require_library_or_gem "redcloth"
|
||||||
|
|
||||||
# Returns the text with all the Textile codes turned into HTML-tags.
|
# Returns the text with all the Textile codes turned into HTML-tags.
|
||||||
# <i>This method is only available if RedCloth can be required</i>.
|
# <i>This method is only available if RedCloth can be required</i>.
|
||||||
|
@ -104,7 +104,7 @@ module ActionView
|
||||||
end
|
end
|
||||||
|
|
||||||
begin
|
begin
|
||||||
require "bluecloth"
|
require_library_or_gem "bluecloth"
|
||||||
|
|
||||||
# Returns the text with all the Markdown codes turned into HTML-tags.
|
# Returns the text with all the Markdown codes turned into HTML-tags.
|
||||||
# <i>This method is only available if BlueCloth can be required</i>.
|
# <i>This method is only available if BlueCloth can be required</i>.
|
||||||
|
|
Loading…
Reference in a new issue