Compare commits

...

7 Commits

Author SHA1 Message Date
Justin Li
27507d087e Bump version to 2.6.3 2015-07-23 17:00:30 -04:00
Justin Li
0d0ece6ece Update history for 2.6.3 2015-07-23 16:59:44 -04:00
Dylan Thacker-Smith
435babc051 Fix a timezone test failure. 2015-07-23 16:51:20 -04:00
Arthur Neves
4f33cd1eae Bump to version 2.6.2 2015-01-23 10:18:03 -05:00
Florian Weingarten
1854cd17ab Bump version to 2.6.1 2015-01-23 10:17:18 -05:00
Arthur Nogueira Neves
69c2575485 Merge pull request #503 from parkr/patch-1
Remove duplicate `index0` key in htmltags
2014-12-30 13:15:04 -05:00
Parker Moore
0e98b29665 Remove duplicate index0 key in htmltags
Half of #502.
2014-12-26 16:33:47 -05:00
4 changed files with 24 additions and 5 deletions

View File

@@ -3,7 +3,15 @@
IMPORTANT: Liquid 2.6 is going to be the last version of Liquid which maintains explicit Ruby 1.8 compatability.
The following releases will only be tested against Ruby 1.9 and Ruby 2.0 and are likely to break on Ruby 1.8.
## 2.6.1 / 2014-01-10 / branch "2-6-stable"
## 2.6.3 / 2015-07-23 / branch "2-6-stable"
* Fix test failure under certain timezones [Dylan Thacker-Smith]
## 2.6.2 / 2015-01-23
* Remove duplicate hash key [Parker Moore]
## 2.6.1 / 2014-01-10
Security fix, cherry-picked from master (4e14a65):
* Don't call to_sym when creating conditions for security reasons, see #273 [Bouke van der Bijl, bouk]

View File

@@ -43,7 +43,6 @@ module Liquid
'index0' => index,
'col' => col + 1,
'col0' => col,
'index0' => index,
'rindex' => length - index,
'rindex0' => length - index - 1,
'first' => (index == 0),

View File

@@ -1,4 +1,4 @@
# encoding: utf-8
module Liquid
VERSION = "2.6.0"
VERSION = "2.6.3"
end

View File

@@ -157,8 +157,10 @@ class StandardFiltersTest < Test::Unit::TestCase
assert_equal nil, @filters.date(nil, "%B")
assert_equal "07/05/2006", @filters.date(1152098955, "%m/%d/%Y")
assert_equal "07/05/2006", @filters.date("1152098955", "%m/%d/%Y")
with_timezone("UTC") do
assert_equal "07/05/2006", @filters.date(1152098955, "%m/%d/%Y")
assert_equal "07/05/2006", @filters.date("1152098955", "%m/%d/%Y")
end
end
@@ -248,4 +250,14 @@ class StandardFiltersTest < Test::Unit::TestCase
def test_cannot_access_private_methods
assert_template_result('a',"{{ 'a' | to_number }}")
end
private
def with_timezone(tz)
old_tz = ENV['TZ']
ENV['TZ'] = tz
yield
ensure
ENV['TZ'] = old_tz
end
end # StandardFiltersTest