kotovalexarian-likes-github/haml--haml
1
0
Fork 0
mirror of https://github.com/haml/haml.git synced 2022-11-09 12:33:31 -05:00
Code Releases Activity

Merge branch 'stable'

Browse source 
Conflicts:
	doc-src/HAML_CHANGELOG.md
	doc-src/SASS_CHANGELOG.md
This commit is contained in:
Nathan Weizenbaum 2010-03-14 17:19:50 -07:00
commit 690b80a137
4 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
doc-src/HAML_CHANGELOG.md
View file

@ -252,6 +252,11 @@ that surrounds the filtered text with `<style>` and CDATA tags.
* The `puts` helper has been removed.
Use {Haml::Helpers#haml\_concat} instead.
## 2.2.22 (Unreleased)
* Add a railtie so Haml and Sass will be automatically loaded in Rails 3.
Thanks to [Daniel Neighman](http://pancakestacks.wordpress.com/).
## 2.2.21
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.21).

5
doc-src/SASS_CHANGELOG.md
View file

@ -230,6 +230,11 @@ Several bug fixes and minor improvements have been made, including:
and `tealbang(12)` now renders as `tealbang(12)`
rather than `teal bang(12)`.
## 2.2.22 (Unreleased)
* Add a railtie so Haml and Sass will be automatically loaded in Rails 3.
Thanks to [Daniel Neighman](http://pancakestacks.wordpress.com/).
## 2.2.21
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.21).

1
lib/haml.rb
View file

@ -38,3 +38,4 @@ end
require 'haml/util'
require 'haml/engine'
require 'haml/railtie'

14
lib/haml/railtie.rb Normal file
View file

@ -0,0 +1,14 @@
# This file is here to integrate with Rails 3,
# since there's no better way to do so as of 14 March 2010.
# Yehuda promises there will be soon,
# and once there is we should switch to that.
if defined?(Rails::Railtie)
module Haml
class Railtie < Rails::Railtie
initializer :haml do
Haml.init_rails(binding)
end
end
end
end