Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-09-12 23:40:45 -07:00
Code Issues Packages Projects Releases Wiki Activity
2,021 Commits 314 Branches 70 Tags
bump-5.13.0
Commit Graph
84 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Weingarten 4d6dec9b5a Fix chained access to multi-dimensional hash 2015-07-17 10:10:00 -04:00
Florian Weingarten 4920ec50e4 update changelog 2015-06-19 07:41:39 -04:00
Florian WeingartenandFlorian Weingarten e2323332cd Run tests with latest liquid/c gem 2015-06-08 18:38:35 +00:00
Florian Weingarten 1e23036b2d Fix uniq filter with string input 2015-06-04 22:55:03 -04:00
Florian Weingarten 5919626da4 Rename 'has_key?' and 'has_interrupt?' 2015-06-04 13:14:46 -04:00
Florian Weingarten 82269e2509 fix a few more rubocop offenses 2015-06-04 13:09:58 -04:00
Florian Weingarten e761a6864e clean up some rubocop stuff 2015-06-04 12:56:29 -04:00
Florian Weingarten 4c22cef341 blank and empty as variable names 2015-06-04 12:30:50 -04:00
Florian Weingarten c319240174 run rubocop on CI 2015-06-04 11:57:25 -04:00
Florian Weingarten 6ace095207 Avoid parallel assignments 2015-06-04 11:56:47 -04:00
Florian Weingarten e36f366c33 gitignore .bundle 2015-06-04 11:56:00 -04:00
Florian Weingarten 02729e89c0 make rubocop happy 2015-06-04 11:56:00 -04:00
Florian Weingarten debac5dd0b Revert "move line number check" 
This reverts commit 939365c234.

Conflicts:
	lib/liquid/template.rb
 2014-09-06 10:21:17 -04:00
Florian WeingartenandFlorian Weingarten 33e7b8e373 uniq filter 2014-07-29 13:09:34 +00:00
Florian WeingartenandArthur Neves 994f309465 Fix broken standardfilter test 2014-07-23 17:15:39 -04:00
Florian Weingarten 114a37d9ba add additional tests for https://github.com/jekyll/jekyll/pull/2505 2014-06-23 09:28:24 -04:00
Florian Weingarten 628ab3dc6a add test for numerical sort 2014-05-04 19:50:38 -04:00
Florian Weingarten 6a1c3cff1a update history.md 2014-04-29 15:26:22 -04:00
Florian Weingarten 2a12f253bf Fix broken rendering of variables which are equal to false (closes #345) 2014-04-29 14:33:30 -04:00
Florian Weingarten 3dbb35d823 Merge branch 'freeze_all_the_things' 
Conflicts:
	History.md
	lib/liquid/tags/assign.rb
	lib/liquid/tags/capture.rb
	lib/liquid/tags/decrement.rb
	lib/liquid/tags/if.rb
 2014-03-24 12:39:34 -04:00
Florian Weingarten 44f29a87a8 Update history 2014-03-24 12:35:47 -04:00
Florian Weingarten e190bbba9e move change to top 2014-03-19 18:15:31 -04:00
Florian Weingarten 0a7de51e2b Revert some freezes on non-literals 2014-01-27 14:56:07 -05:00
Florian Weingarten d2827bfa76 Add strip, lstrip, rstrip filters 2014-01-24 11:04:43 -05:00
Florian Weingarten 70d92b84ab Rename test 2014-01-24 10:55:45 -05:00
Florian Weingarten 17dae40707 Fix History.md ordering 2014-01-13 15:38:18 -05:00
Florian Weingarten 62a86a25ae update history 2014-01-08 13:37:24 -05:00
Florian Weingarten c6e0c1e490 Fix resource counting bug with respond_to?(:length) 2014-01-08 13:00:53 -05:00
Florian Weingarten 43ac8d560b Freeze all the things 2014-01-07 12:35:16 -05:00
Florian Weingarten 9ec2b9da2d Rename tests because of name clashes (same method name used twice) 2014-01-07 11:20:32 -05:00
Florian Weingarten 5ce36f79e9 Add Tom's slice loading change to History.md 2013-11-25 11:12:33 -05:00
Florian Weingarten 4647e6d86b Remove unnecessary comment, add joost's change to History.md 2013-11-25 10:52:46 -05:00
Florian Weingarten f5620d4670 Merge branch 'master' of github.com:joost/liquid into joost-master 2013-11-25 10:51:48 -05:00
Florian Weingarten f1a5f6899b Add raggi's change to History, remove Ruby 1.8 code from test 2013-11-25 10:48:03 -05:00
Florian Weingarten de497eaed2 Merge branch 'class_cache' of github.com:wildfireapp/liquid into wildfireapp-class_cache 2013-11-25 10:46:18 -05:00
Florian Weingarten f015d804ea Update history 2013-11-11 09:03:39 -05:00
Florian Weingarten a599a26f1a Remove some legacy Ruby 1.8 compatibility code 2013-10-31 15:35:12 -04:00
Florian Weingarten 96b30a89a9 Fix map filter on Hash inputs 2013-10-08 08:18:03 -04:00
Florian Weingarten 81d3733f57 Regression test for change of blank? default behaviour (2efe809e11) 2013-09-23 09:38:45 -04:00
Florian Weingarten 2efe809e11 Make blank? default to false for all tags to maintain backwards compatible 2013-09-23 08:43:26 -04:00
Florian Weingarten 5b172a4c05 Fix unknown tags in comment tags, second try 2013-09-11 12:31:54 -04:00
Florian Weingarten bd20595f1a Add regression test for comment tag 2013-09-11 12:14:27 -04:00
Florian Weingarten f938756a58 Revert "Merge pull request #256 from Shopify/unknown_tags_in_comments" 
This reverts commit 1ae8c0e90a, reversing
changes made to 01d352bc51.
 2013-09-11 12:13:55 -04:00
Florian Weingarten 45795f8766 Fix handling of unknown tags in comments 2013-09-11 10:40:33 -04:00
Florian Weingarten 01d352bc51 Move stuff in test around 2013-09-11 14:40:11 +02:00
Florian Weingarten a57d576708 Overwrite drop inspect 2013-08-19 12:08:27 -04:00
Florian Weingarten ed4b61bfd3 Fix broken map test and add sort test 2013-08-08 11:53:52 -04:00
Florian Weingarten 8f978ecd1a Make sort filter work on Enumerable drops 2013-08-08 11:47:26 -04:00
Florian Weingarten f98949117d Fix .include? method on Enumerable drops, used by "contains" conditions 2013-08-02 10:23:10 -04:00
Florian Weingarten 7fdb789eac Ruby 1.8.x compatibility 2013-08-01 13:56:01 -04:00
Florian Weingarten c92efd3ab9 Update some Drop tests 2013-08-01 13:46:55 -04:00
Florian Weingarten ff570c3ddc Fix clashing method names in enumerable drops 2013-08-01 13:17:02 -04:00
Florian Weingarten 07f7d63bea Use kind_of? instead of class.include? and rearrange stuff 2013-07-26 11:34:00 -04:00
Florian Weingarten 65dfd57bb5 Make 'map' filter work on Enumerable drops 2013-07-26 10:35:28 -04:00
Florian Weingarten 3e13ed4ba1 Fix mapping over procs 2013-07-25 22:11:44 -04:00
Florian Weingarten 182d3fefb6 Always call 'to_liquid' on staff in map filter and allow to_liquid to be called on drops 2013-07-25 17:10:19 -04:00
Florian Weingarten c7336e0cc1 Add license to gemspec, closes #231 2013-07-24 19:10:12 -04:00
Florian Weingarten f9027d54ab Use invoke_drop in map filter 2013-07-24 15:41:50 -04:00
Florian Weingarten fbfda1a189 Little cosmetic change 2013-07-05 11:30:50 -04:00
Florian Weingarten f0ecd02199 Fix some blank tests 2013-07-03 02:47:22 +02:00
Florian Weingarten 0f38fe3596 Add blank test for case tags 2013-07-02 18:08:20 -04:00
Florian Weingarten cd3f976288 Merge branch 'master' into dont_render_blank_blocks 
Conflicts:
	lib/liquid/tag.rb
 2013-07-02 14:00:30 -04:00
Florian Weingarten b53601100f Make sure include tags are never blank 2013-07-02 13:57:27 -04:00
Florian Weingarten 40a37c3fb6 Merge branch 'master' into dont_render_blank_blocks 
Conflicts:
	lib/liquid/tags/cycle.rb
	lib/liquid/tags/increment.rb
 2013-06-27 10:03:18 -04:00
Florian Weingarten 668ee5e1c4 Clean up whitespace collapsing 2013-06-27 14:06:05 +02:00
Florian Weingarten b4fbcea114 Cycle tags are never blank 2013-06-27 14:00:38 +02:00
Florian Weingarten c16697746b Clean up whitespace collapsing a bit 2013-06-27 13:57:26 +02:00
Florian Weingarten f01d0dbea6 More tests for whitespace collapsing 2013-06-27 13:39:04 +02:00
Florian Weingarten 10c151e3aa Some tests for whitespace collapsing 2013-06-26 22:30:33 -04:00
Florian Weingarten d6e13faa43 Don't render blank blocks 2013-06-26 22:21:47 -04:00
Florian Weingarten 0f5441b09e Convert legacy tab indentation to spaces and remove trailing whitespace from all lines 2013-06-26 19:53:09 -04:00
Florian Weingarten 8ca4868bff Merge branch 'master' of https://github.com/ndwebgroup/liquid into ndwebgroup-master 2013-06-18 04:13:49 +02:00
Florian Weingarten f92da6948d Merge branch 'strip-html-fix' of https://github.com/jamesallardice/liquid into jamesallardice-strip-html-fix 
Conflicts:
	lib/liquid/standardfilters.rb
 2013-06-18 04:11:11 +02:00
Florian Weingarten a1b156f0d4 strip_html multi-line comment test 2013-06-18 04:06:35 +02:00
Florian Weingarten eca520025c Merge branch 'strip-html' of https://github.com/joliss/liquid into joliss-strip-html 
Conflicts:
	lib/liquid/standardfilters.rb
 2013-06-18 04:04:49 +02:00
Florian Weingarten b81469d183 Make truncate work for Ruby 1.8 2013-06-17 12:05:02 -04:00
Florian Weingarten f488058789 UTF8 truncate test 2013-06-17 11:48:03 -04:00
Florian Weingarten e47d1af03a Fix broken 'raw' tag parsing (issue #204) 2013-06-14 12:47:27 -04:00
Florian Weingarten f7c4b0cdec Update History.md 2013-06-14 08:57:27 -04:00
Florian Weingarten 27db1def63 CONTRIBUTING.md 2013-06-14 02:41:08 +02:00
Florian Weingarten 1e8c081b42 Create new resource_limits hash on Template initialization 2013-05-31 09:41:59 -04:00
Florian Weingarten 2b17e24b16 Mutate resource_limits hash to flag that the limit was reached (for outside observation) 2013-05-31 09:34:23 -04:00
Florian Weingarten 9075b428b1 Resource limits: Don't raise Error but render error message (but abort after first error) 2013-05-31 09:25:25 -04:00
Florian Weingarten 8760b5e8c4 Add optional resource usage limitations to number of rendering calls, length of rendering output and/or number of variable/capture assignments 2013-05-30 17:04:26 -04:00