forked from OpenNeo/impress
Upgrade haml
I was hoping this would fix a character encoding bug, it didn't really? but it doesn't seem to hurt and is probably good to do
This commit is contained in:
parent
14f66b1e9e
commit
5d12ca0b7d
5 changed files with 6 additions and 3 deletions
2
Gemfile
2
Gemfile
|
@ -8,7 +8,7 @@ gem 'rails', '= 4.0.13'
|
||||||
#gem 'sqlite3-ruby', '~> 1.3.1', :require => 'sqlite3'
|
#gem 'sqlite3-ruby', '~> 1.3.1', :require => 'sqlite3'
|
||||||
gem 'mysql2', '>= 0.3.11'
|
gem 'mysql2', '>= 0.3.11'
|
||||||
|
|
||||||
gem 'haml', '~> 4.0.0'
|
gem 'haml', '~> 6.1', '>= 6.1.1'
|
||||||
gem 'rdiscount', '~> 1.6.5'
|
gem 'rdiscount', '~> 1.6.5'
|
||||||
gem 'will_paginate', '~> 3.0.pre2'
|
gem 'will_paginate', '~> 3.0.pre2'
|
||||||
gem 'devise', '~> 3.5.10'
|
gem 'devise', '~> 3.5.10'
|
||||||
|
|
|
@ -112,7 +112,9 @@ GEM
|
||||||
globalize (4.0.3)
|
globalize (4.0.3)
|
||||||
activemodel (>= 4.0.0, < 5)
|
activemodel (>= 4.0.0, < 5)
|
||||||
activerecord (>= 4.0.0, < 5)
|
activerecord (>= 4.0.0, < 5)
|
||||||
haml (4.0.6)
|
haml (6.1.1)
|
||||||
|
temple (>= 0.8.2)
|
||||||
|
thor
|
||||||
tilt
|
tilt
|
||||||
highline (1.7.2)
|
highline (1.7.2)
|
||||||
hike (1.2.3)
|
hike (1.2.3)
|
||||||
|
@ -244,6 +246,7 @@ GEM
|
||||||
ssrf_filter (1.0.8)
|
ssrf_filter (1.0.8)
|
||||||
subexec (0.2.3)
|
subexec (0.2.3)
|
||||||
swf_converter (0.0.3)
|
swf_converter (0.0.3)
|
||||||
|
temple (0.8.2)
|
||||||
thor (1.2.2)
|
thor (1.2.2)
|
||||||
thread_safe (0.3.6)
|
thread_safe (0.3.6)
|
||||||
tilt (1.4.1)
|
tilt (1.4.1)
|
||||||
|
@ -277,7 +280,7 @@ DEPENDENCIES
|
||||||
factory_girl_rails (~> 1.0)
|
factory_girl_rails (~> 1.0)
|
||||||
fog (~> 1.8.0)
|
fog (~> 1.8.0)
|
||||||
globalize (~> 4.0.3)
|
globalize (~> 4.0.3)
|
||||||
haml (~> 4.0.0)
|
haml (~> 6.1, >= 6.1.1)
|
||||||
http_accept_language!
|
http_accept_language!
|
||||||
letter_opener
|
letter_opener
|
||||||
memcache-client (~> 1.8.5)
|
memcache-client (~> 1.8.5)
|
||||||
|
|
BIN
vendor/cache/haml-4.0.6.gem
vendored
BIN
vendor/cache/haml-4.0.6.gem
vendored
Binary file not shown.
BIN
vendor/cache/haml-6.1.1.gem
vendored
Normal file
BIN
vendor/cache/haml-6.1.1.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/temple-0.8.2.gem
vendored
Normal file
BIN
vendor/cache/temple-0.8.2.gem
vendored
Normal file
Binary file not shown.
Loading…
Reference in a new issue