Commit 091c4260 authored by Dennis Schubert's avatar Dennis Schubert
Browse files

Merge pull request #6672 from k0kubun/hamlit 

Use Hamlit to render Haml
parents 51366e28 3028f8e9

Gemfile

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ gem "typhoeus", "0.8.0" 
# Views



gem "gon",                     "6.0.1"

gem "haml",                    "4.0.7"

gem "hamlit",                  "2.2.1"

gem "mobile-fu",               "1.3.1"

gem "will_paginate",           "3.1.0"

gem "rails-timeago",           "2.11.0"

Gemfile.lock

+6 −1
Original line number Diff line number Diff line
@@ -395,6 +395,10 @@ GEM 
      haml (~> 4.0)

      rubocop (>= 0.25.0)

      sysexits (~> 1.1)

    hamlit (2.2.1)

      temple (~> 0.7.6)

      thor

      tilt

    handlebars_assets (0.23.0)

      execjs (~> 2.0)

      multi_json (~> 1.0)
@@ -821,6 +825,7 @@ GEM 
      json (>= 1.4.3)

    sysexits (1.2.0)

    systemu (2.6.5)

    temple (0.7.6)

    terminal-table (1.5.2)

    test_after_commit (0.4.2)

      activerecord (>= 3.2)
@@ -933,8 +938,8 @@ DEPENDENCIES 
  guard-jshintrb (= 1.1.1)

  guard-rspec (= 4.6.4)

  guard-rubocop (= 1.2.0)

  haml (= 4.0.7)

  haml_lint (= 0.15.2)

  hamlit (= 2.2.1)

  handlebars_assets (= 0.23.0)

  http_accept_language (= 2.0.5)

  i18n-inflector-rails (= 1.0.7)

config/initializers/haml.rb

+2 −2
Original line number Diff line number Diff line 
Haml::Template.options[:format] = :html5

Haml::Template.options[:escape_html] = true
 
Hamlit::Engine.options[:format] = :html

Hamlit::Engine.options[:escape_html] = true