Florian Weingarten
|
2da9d49478
|
Merge pull request #465 from Shopify/avoid_multi_assigns
Avoid parallel assignments
|
2014-10-18 16:19:02 +02:00 |
|
Florian Weingarten
|
7196a2d58e
|
Avoid parallel assignments
|
2014-10-18 13:58:32 +00:00 |
|
Justin Li
|
a056f6521c
|
Merge pull request #463 from Shopify/stricter-identifiers
Separate ? and - into special tokens
|
2014-10-17 13:45:48 -04:00 |
|
Justin Li
|
de16db9b72
|
Don't allow - to end a variable name
|
2014-10-17 13:38:07 -04:00 |
|
Justin Li
|
b4ea483c4e
|
Separate ? and - into special tokens
|
2014-10-17 13:30:54 -04:00 |
|
Justin Li
|
7843bcca8d
|
Merge pull request #443 from Shopify/completely-parse-variables
Parse expressions in Liquid::Variable#parse.
|
2014-10-17 13:12:46 -04:00 |
|
Florian Weingarten
|
76ea5596ff
|
Merge pull request #462 from Shopify/flat_map
nodelist flat_map over map.flatten
|
2014-10-17 18:32:00 +02:00 |
|
Florian Weingarten
|
f9318e8c93
|
flat_map
|
2014-10-17 16:11:12 +00:00 |
|
Florian Weingarten
|
71253ec6f9
|
Merge pull request #459 from Shopify/pop_vs_shift
Use pop over shift to avoid reverse
|
2014-10-15 21:42:53 +02:00 |
|
Florian Weingarten
|
0fa075b879
|
Use pop over shift to avoid reverse
|
2014-10-15 19:26:39 +00:00 |
|
Dylan Thacker-Smith
|
6d080afd22
|
Merge pull request #446 from Shopify/remove-end-tag
Remove unused Block#end_tag method.
|
2014-10-14 03:03:31 -04:00 |
|
Dylan Thacker-Smith
|
a67e2a0a00
|
Remove unused Block#end_tag method.
Although the method is called, it is defined with an empty body and not
overridden to do anything else.
|
2014-10-14 02:58:11 -04:00 |
|
Dylan Thacker-Smith
|
f387508666
|
Parse expressions in Liquid::Variable#parse.
|
2014-10-08 21:06:59 -04:00 |
|
Florian Weingarten
|
632b1fb702
|
Merge pull request #455 from Shopify/parse_error_line_numbers
Line numbers for all parse errors
|
2014-10-04 17:53:30 +02:00 |
|
Dylan Thacker-Smith
|
d84870d7a5
|
Test line number of errors in nested blocks.
|
2014-10-03 16:25:12 -05:00 |
|
Florian Weingarten
|
584b492e70
|
Line numbers for all parse errors
|
2014-10-03 21:00:31 +00:00 |
|
Dylan Thacker-Smith
|
b79c9cb9bf
|
Merge pull request #453 from Shopify/no-modify-default-resource-limit
Avoid modifying the default resources limits hash.
|
2014-10-01 19:02:09 -05:00 |
|
Dylan Thacker-Smith
|
cf5ccede50
|
Avoid modifying the default resources limits hash.
|
2014-10-01 18:51:06 -05:00 |
|
Evan Huus
|
23622a9739
|
Merge pull request #440 from Shopify/drop-tainting
Variable tainting
|
2014-09-22 13:43:35 -04:00 |
|
Florian Weingarten
|
7ba5a6ab75
|
Merge pull request #450 from Shopify/additional_test_for_includes
Regression test for including assignments
|
2014-09-18 21:05:37 +02:00 |
|
Florian Weingarten
|
be3d261e11
|
Regression test for including assignments
|
2014-09-18 10:37:44 +00:00 |
|
Evan Huus
|
eeb061ef44
|
Address code review comments
- clean up comment wording
- fix potentially leaky tests
|
2014-09-16 17:23:26 +00:00 |
|
Evan Huus
|
67b2c320a1
|
Add tainting tests
|
2014-09-16 17:23:26 +00:00 |
|
Evan Huus
|
1d151885be
|
Auto-untaint variables passed through 'escape'
|
2014-09-16 17:23:26 +00:00 |
|
Evan Huus
|
e836024dd9
|
Check and handle when a tainted variable is used
|
2014-09-16 17:23:26 +00:00 |
|
Dylan Thacker-Smith
|
638455ed92
|
Merge pull request #448 from Shopify/remove-unused-filter-not-found-error
Remove Liquid::FilterNotFoundError since it is never raised.
|
2014-09-15 17:43:33 -04:00 |
|
Dylan Thacker-Smith
|
b2a74883e9
|
Remove Liquid::FilterNotFoundError since it is never raised.
|
2014-09-15 17:42:07 -04:00 |
|
Dylan Thacker-Smith
|
6875e5e16f
|
Merge pull request #449 from Shopify/fix-flaky-total-render-time-test
Fix flaky test which assumes total_render_time can't be 0.
|
2014-09-15 17:41:41 -04:00 |
|
Dylan Thacker-Smith
|
a5717a3f8d
|
Fix flaky test which assumes total_render_time can't be 0.
jruby has millisecond precision for Time.now, so total_render_time can be 0
due to this lack of precision.
|
2014-09-15 17:26:55 -04:00 |
|
Dylan Thacker-Smith
|
804fcfebd1
|
Merge pull request #444 from Shopify/remove-block-children
Avoid keeping track of two lists of nodes during parsing.
|
2014-09-15 09:56:08 -04:00 |
|
Dylan Thacker-Smith
|
b37ee5684a
|
Merge pull request #445 from Shopify/prefer-super-over-render-all
Use super rather than render_all in single block render classes.
|
2014-09-15 09:53:54 -04:00 |
|
Dylan Thacker-Smith
|
0573b63b4c
|
Use super rather than render_all in single block render classes.
|
2014-09-12 16:58:07 -04:00 |
|
Dylan Thacker-Smith
|
29c21d7867
|
Avoid keeping track of two lists of nodes during parsing.
|
2014-09-12 16:43:00 -04:00 |
|
Dylan Thacker-Smith
|
478eb893a9
|
Merge pull request #439 from Shopify/default-resource-limits
Make it easy to set default resource limits.
|
2014-09-11 14:27:52 -04:00 |
|
Dylan Thacker-Smith
|
eae29f8c48
|
Make it easy to set default resource limits.
|
2014-09-11 13:54:30 -04:00 |
|
Florian Weingarten
|
4004cb63a5
|
Merge pull request #419 from Shopify/liquid_error_line_numbers
Optional line numbers for liquid errors
|
2014-09-08 23:15:53 +02:00 |
|
Jason Hiltz-Laforge
|
aafdf4adb0
|
Fix JRuby builds
|
2014-09-08 20:41:22 +00: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 Weingarten
|
ce06ed4bb1
|
merge conflicts
|
2014-09-05 14:16:20 +00:00 |
|
Florian Weingarten
|
939365c234
|
move line number check
|
2014-09-05 14:12:30 +00:00 |
|
Florian Weingarten
|
c60fd0715d
|
remove unnecessary nil
|
2014-09-05 14:12:30 +00:00 |
|
Florian Weingarten
|
c83e1c7b6d
|
prefix for Liquid::Error instances
|
2014-09-05 14:12:30 +00:00 |
|
Florian Weingarten
|
aabbd8f1a1
|
remove unnecessary method
|
2014-09-05 14:12:30 +00:00 |
|
Florian Weingarten
|
60d8a213a5
|
Clean up Liquid::Error#render
|
2014-09-05 14:12:30 +00:00 |
|
Florian Weingarten
|
17cc8fdbb3
|
put line number in parentheses
|
2014-09-05 14:12:30 +00:00 |
|
Tristan Hume
|
27c1019385
|
Add line numbers to warnings
|
2014-09-05 14:12:30 +00:00 |
|
Tristan Hume
|
3a0ee6ae91
|
Remove parser switching duplication
|
2014-09-05 14:12:29 +00:00 |
|
Florian Weingarten
|
5eff375094
|
Optional line numbers for liquid errors
|
2014-09-05 14:12:29 +00:00 |
|
Tristan Hume
|
2df643ba18
|
Merge pull request #425 from Shopify/pass-options-include
Pass options through on include
|
2014-08-26 13:40:06 -04:00 |
|
Tristan Hume
|
68af2d6e2a
|
Pass options to include tags
|
2014-08-26 10:50:25 -04:00 |
|