Commit Graph

  • cf5ccede50 Avoid modifying the default resources limits hash. #453 Dylan Thacker-Smith 2014-10-01 18:51:06 -05:00
  • 23622a9739 Merge pull request #440 from Shopify/drop-tainting Evan Huus 2014-09-22 13:43:35 -04:00
  • 7ba5a6ab75 Merge pull request #450 from Shopify/additional_test_for_includes Florian Weingarten 2014-09-18 21:05:37 +02:00
  • be3d261e11 Regression test for including assignments #450 Florian Weingarten 2014-09-18 10:37:44 +00:00
  • eeb061ef44 Address code review comments #440 Evan Huus 2014-09-15 13:32:21 +00:00
  • 67b2c320a1 Add tainting tests Evan Huus 2014-09-12 17:35:10 +00:00
  • 1d151885be Auto-untaint variables passed through 'escape' Evan Huus 2014-09-12 17:34:53 +00:00
  • e836024dd9 Check and handle when a tainted variable is used Evan Huus 2014-09-12 17:34:33 +00:00
  • 638455ed92 Merge pull request #448 from Shopify/remove-unused-filter-not-found-error Dylan Thacker-Smith 2014-09-15 17:43:33 -04:00
  • b2a74883e9 Remove Liquid::FilterNotFoundError since it is never raised. #448 Dylan Thacker-Smith 2014-09-15 16:18:01 -04:00
  • 6875e5e16f Merge pull request #449 from Shopify/fix-flaky-total-render-time-test Dylan Thacker-Smith 2014-09-15 17:41:41 -04:00
  • a5717a3f8d Fix flaky test which assumes total_render_time can't be 0. #449 Dylan Thacker-Smith 2014-09-15 17:26:55 -04:00
  • 804fcfebd1 Merge pull request #444 from Shopify/remove-block-children Dylan Thacker-Smith 2014-09-15 09:56:08 -04:00
  • b37ee5684a Merge pull request #445 from Shopify/prefer-super-over-render-all Dylan Thacker-Smith 2014-09-15 09:53:54 -04:00
  • 0573b63b4c Use super rather than render_all in single block render classes. #445 Dylan Thacker-Smith 2014-02-27 21:38:49 -05:00
  • 29c21d7867 Avoid keeping track of two lists of nodes during parsing. #444 Dylan Thacker-Smith 2014-07-25 13:04:42 -04:00
  • d7234cb346 Benchmark marshal load and render against parse and render. #442 benchmark-load-render Dylan Thacker-Smith 2014-09-12 02:10:54 -04:00
  • 5077463ec6 Fixed tests and include tag code to use register's file_system include_parsing_at_parse_time James Reid-Smith 2014-09-12 02:06:45 +00:00
  • b765343ee2 Merge branch 'parse_partials_at_template_parse_time' into remove_context_from_read_template_file James Reid-Smith 2014-09-12 01:37:48 +00:00
  • cbd1a07c1c Removed context from read_template_file, fixed tests to match new arity James Reid-Smith 2014-09-11 23:27:08 +00:00
  • a5c1f7b6f5 Moved parsing of partials to parse time of include tags if it's possible (eg. context not required to know template name) parse_partials_at_template_parse_time James Reid-Smith 2014-09-11 23:07:54 +00:00
  • 478eb893a9 Merge pull request #439 from Shopify/default-resource-limits Dylan Thacker-Smith 2014-09-11 14:27:52 -04:00
  • eae29f8c48 Make it easy to set default resource limits. #439 Dylan Thacker-Smith 2014-09-11 13:42:49 -04:00
  • 4004cb63a5 Merge pull request #419 from Shopify/liquid_error_line_numbers Florian Weingarten 2014-09-08 23:15:53 +02:00
  • aafdf4adb0 Fix JRuby builds #419 Jason Hiltz-Laforge 2014-09-08 20:41:22 +00:00
  • 47a7e804a6 Let's see if this fixes JRuby #437 Jason Hiltz-Laforge 2014-09-08 16:15:56 +00:00
  • debac5dd0b Revert "move line number check" Florian Weingarten 2014-09-06 10:15:25 -04:00
  • ce06ed4bb1 merge conflicts Florian Weingarten 2014-09-05 14:16:20 +00:00
  • 939365c234 move line number check Florian Weingarten 2014-08-21 14:35:57 +00:00
  • c60fd0715d remove unnecessary nil Florian Weingarten 2014-08-20 17:45:24 +00:00
  • c83e1c7b6d prefix for Liquid::Error instances Florian Weingarten 2014-08-20 17:36:48 +00:00
  • aabbd8f1a1 remove unnecessary method Florian Weingarten 2014-08-20 17:15:14 +00:00
  • 60d8a213a5 Clean up Liquid::Error#render Florian Weingarten 2014-08-20 17:12:34 +00:00
  • 17cc8fdbb3 put line number in parentheses Florian Weingarten 2014-08-20 16:45:11 +00:00
  • 27c1019385 Add line numbers to warnings Tristan Hume 2014-08-14 16:23:38 -04:00
  • 3a0ee6ae91 Remove parser switching duplication Tristan Hume 2014-08-14 15:06:54 -04:00
  • 5eff375094 Optional line numbers for liquid errors Florian Weingarten 2014-08-14 16:11:21 +00:00
  • f7adc874e5 Use error mode selection helper #435 Tristan Hume 2014-08-29 11:40:18 -04:00
  • 6ce1123cf7 Try serializing with marshal Tristan Hume 2014-08-28 15:39:14 -04:00
  • 00473edc72 Try serializing with inspect Tristan Hume 2014-08-28 15:34:32 -04:00
  • 0d2e045871 Add comparison test Tristan Hume 2014-08-28 13:51:55 -04:00
  • 2df643ba18 Merge pull request #425 from Shopify/pass-options-include Tristan Hume 2014-08-26 13:40:06 -04:00
  • 68af2d6e2a Pass options to include tags #425 Tristan Hume 2014-08-21 11:37:09 -04:00
  • 175caea8dd Promote local to class variable to save a few object allocations #415 Jason Hiltz-Laforge 2014-08-21 20:49:16 +00:00
  • 1c05fbfc12 Reduce benchmark volatility by disabling GC #426 Jason Hiltz-Laforge 2014-08-21 17:25:50 +00:00
  • ec67ac8f57 Merge ae7d56330837811abbcb0189bf2de6e30b3ae744 into dfb6c2049344989b3a6fa7adb2bfa9a0c575494e #420 Jason Roelofs 2014-08-19 14:36:27 +00:00
  • dfb6c20493 Merge pull request #423 from bogdan/contains-with-integer Arthur Nogueira Neves 2014-08-18 14:58:08 -04:00
  • 4e9d414fde Fixed condition constains operator with wrong data type #423 Bogdan Gusiev 2014-08-18 16:18:55 +03:00
  • 6299a63924 Add Liquid::InternalError to avoid raising a runtime error. Dylan Thacker-Smith 2014-08-15 11:22:24 -07:00
  • 0dbba6dacc Flatten array of expression instructions to reduce object allocations. Dylan Thacker-Smith 2014-08-13 23:49:58 -07:00
  • a1a2e686cf Implement the stack based interpreter from the leg_c branch. Dylan Thacker-Smith 2014-08-12 03:12:42 -07:00
  • c0ec0652ae Merge pull request #421 from djreimer/url-encode-filter Florian Weingarten 2014-08-15 20:05:39 +02:00
  • f8c3cea09b Add url_encode filter to history #421 Derrick Reimer 2014-08-15 11:03:06 -07:00
  • 0b847e553c Add url_encode standard filter Derrick Reimer 2014-08-15 08:45:40 -07:00
  • ae7d563308 Include line numbers in included partials when profiling #420 Jason Roelofs 2014-08-15 11:03:30 -04:00
  • 10173c3315 Add line numbers to warnings warning-line-numbers Tristan Hume 2014-08-14 16:23:38 -04:00
  • 1c1aa4094a Remove parser switching duplication Tristan Hume 2014-08-14 15:06:54 -04:00
  • 627ef9e29d Optional line numbers for liquid errors Florian Weingarten 2014-08-14 16:11:21 +00:00
  • c2663258be Merge pull request #364 from collectiveidea/instrument-rendering-with-hooks Florian Weingarten 2014-08-13 23:04:29 +02:00
  • d4654d0062 Merge pull request #417 from Shopify/simplify-regex Tristan Hume 2014-08-13 12:07:35 -04:00
  • ffd4f9d959 Simplify secondary filter regex #417 Tristan Hume 2014-08-13 09:36:02 -04:00
  • 292161865d Simplify filter parse regex Tristan Hume 2014-08-13 09:28:01 -04:00
  • 35808390ee Merge pull request #414 from Shopify/to_liquid_context Florian Weingarten 2014-08-12 22:05:52 +02:00
  • 1678c07548 Call to_liquid in Context invoke #414 Florian Weingarten 2014-08-12 02:12:38 +00:00
  • 173a58d36a Profile liquid rendering #364 Jason Roelofs 2014-06-05 14:13:19 -04:00
  • f31e309770 Merge pull request #416 from Shopify/filter-quirks Tristan Hume 2014-08-12 10:08:05 -04:00
  • ffe1036e15 Make tests actual integration tests #416 Tristan Hume 2014-08-12 09:27:46 -04:00
  • d3b113d2e1 Merge pull request #391 from Shopify/extract-context-parse Dylan Thacker-Smith 2014-08-11 14:17:54 -07:00
  • 2aa9bbbac2 Separate expression parsing and rendering from Context#resolve. #391 Dylan Thacker-Smith 2014-07-21 22:16:24 -04:00
  • d5e57a8ea4 Merge pull request #412 from Shopify/assign-strict Tristan Hume 2014-08-11 15:37:49 -04:00
  • 5c0e0be639 Merge pull request #402 from Shopify/benchmark-ips Florian Weingarten 2014-08-11 21:22:43 +02:00
  • a74d40f1e5 benchmark/ips #402 Florian Weingarten 2014-07-28 20:33:30 +00:00
  • 79d4ec1a48 Merge pull request #413 from Shopify/filter-quirks Tristan Hume 2014-08-11 13:06:51 -04:00
  • 4db22be8ba Add tests for assign tag fix #412 Tristan Hume 2014-08-11 13:06:01 -04:00
  • dc58a4d648 Add quirks test for unanchored filter args #413 Tristan Hume 2014-08-11 11:58:36 -04:00
  • 2809ec780a Pass through options on assign tag Tristan Hume 2014-08-11 10:38:36 -04:00
  • ee4217be5e Merge e9d061a02e596711ab02de2215fdeebeb3315692 into 2d98392bf5d4e3ee475c7ed3840b483b0f2641de #410 Florian Weingarten 2014-08-09 22:03:51 +00:00
  • 2d98392bf5 Merge pull request #411 from Shopify/to-s-before-split Jean Boussier 2014-08-08 00:13:35 -04:00
  • df6b442816 Cast input to string before spliting #411 Jean Boussier 2014-08-07 13:58:28 -04:00
  • e9d061a02e Fix divided_by behaviour when mathn is loaded #410 Florian Weingarten 2014-08-06 15:46:39 +00:00
  • 4b22fc8d1b Merge pull request #407 from Shopify/slice_arrays Florian Weingarten 2014-08-05 20:00:45 +02:00
  • fb6f9c1c13 Slice filter for arrays. #407 Florian Weingarten 2014-08-05 16:44:59 +00:00
  • 66ae7f3ec0 Merge pull request #406 from Shopify/slice_filter Florian Weingarten 2014-08-05 17:14:01 +02:00
  • 0bea31d2ef Use Integer() instead of to_i #406 Florian Weingarten 2014-08-05 15:13:15 +00:00
  • e5b0487fef Merge pull request #312 from Shopify/uniq_filter Florian Weingarten 2014-08-05 16:22:48 +02:00
  • 9117722740 Use symbols in respond_to? #312 Florian Weingarten 2014-08-05 14:22:11 +00:00
  • baea0a6bf7 slice filter Florian Weingarten 2014-08-04 16:47:08 +00:00
  • 80e8ddc4a9 Merge 44f29c6b79ad95dd5d8dac742e1394a46f5b9429 into 17347d43de3d3fea768e1d7e0465bea1583d2e6c #403 Florian Weingarten 2014-07-30 18:35:35 +00:00
  • 17347d43de Merge pull request #400 from Shopify/lazy_stack Tom Burns 2014-07-30 11:43:31 -04:00
  • 794ca9f604 make the conditions around stack creation easier to read #400 Tom Burns 2014-07-30 15:42:24 +00:00
  • 15f6cabf83 avoid a hash comparison Tom Burns 2014-07-30 15:12:22 +00:00
  • e53d102a2c use 'unless' instead of 'if !' for simple conditional Tom Burns 2014-07-30 14:59:56 +00:00
  • 44f29c6b79 Call #to_liquid in "first" filter #403 Florian Weingarten 2014-07-29 13:25:03 +00:00
  • 33e7b8e373 uniq filter Florian Weingarten 2014-03-04 09:08:56 -05:00
  • 9b8e3d437e Merge pull request #401 from Shopify/ktdreyer-minitest Florian Weingarten 2014-07-29 15:05:23 +02:00
  • a2f0f2547d with_global_filter test helper #401 Florian Weingarten 2014-07-28 16:32:09 +00:00
  • 57d5426eed tests: reset Strainer's filters after modification Ken Dreyer 2014-05-17 22:26:36 -06:00
  • 3e3a415457 tests: fix whitespace in hash_ordering_test Ken Dreyer 2014-05-17 22:28:47 -06:00
  • deba039d6d tests: reset "contains" op during IfElseTagTest Ken Dreyer 2014-05-17 17:01:52 -06:00
  • ee4295c889 tests: switch to minitest Ken Dreyer 2014-07-28 16:33:42 +00:00