Commit Graph

  • d891c2b7ab Fix a timezone test failure. Dylan Thacker-Smith 2015-07-23 16:19:59 -04:00
  • fa187665b3 Merge pull request #631 from Shopify/fix-tz-test-failure Dylan Thacker-Smith 2015-07-23 16:34:48 -04:00
  • cd0c5e954c Fix a timezone test failure. #631 Dylan Thacker-Smith 2015-07-23 16:19:59 -04:00
  • 9cb2ac4671 Inject Liquid template name into Ruby backtrace #627 Florian Weingarten 2015-07-21 19:37:56 -04:00
  • 1b7f301417 Merge 74f9bad5133b148ecb707d2fbdd318d458aa98df into 490b45773843b65762c7231dd4cd27eeaf4e9789 #607 Justin Li 2015-07-18 12:05:13 +00:00
  • ebbfb54de4 Bump version v3.0.4 Florian Weingarten 2015-07-17 11:20:01 -04:00
  • 8f84ddb5ce Fix chained access to multi-dimensional hash Florian Weingarten 2015-07-17 10:08:09 -04:00
  • 490b457738 Merge pull request #626 from Shopify/fix_bracket_thing Florian Weingarten 2015-07-17 17:19:06 +02:00
  • 4d6dec9b5a Fix chained access to multi-dimensional hash #626 Florian Weingarten 2015-07-17 10:08:09 -04:00
  • 6a9a7ae8d2 Use tokenizer-quoted-strings liquid-c branch. #624 tokenizer-quoted-strings Dylan Thacker-Smith 2015-07-13 22:03:16 -04:00
  • 4a12fee1f5 Allow variable and tag end characters to be quoted. Dylan Thacker-Smith 2015-07-13 13:19:56 -04:00
  • ca21d7087f Allow use of curlies in a properly quoted string #623 Akinori MUSHA 2015-07-13 15:05:39 +09:00
  • 0b11b573d9 add global_filter #610 Loren Hale 2015-07-04 15:24:36 +08:00
  • 0e25e5d5e8 seperator -> separator #621 lax-parse-warnings Dylan Thacker-Smith 2015-07-09 17:03:03 -04:00
  • 77bdccf5ec Try to make the regexes more readable. Dylan Thacker-Smith 2015-07-09 15:42:22 -04:00
  • 87e3234b58 Add a lax warning mode to see where we can make the lax parser stricter. Dylan Thacker-Smith 2015-07-09 14:33:10 -04:00
  • b42d35ff36 Merge pull request #620 from Shopify/accept-invalid-range-args Justin Li 2015-07-09 13:24:28 -04:00
  • b4e133e26f Fix regression in range lookup #620 Justin Li 2015-07-09 13:21:46 -04:00
  • 1f9bd1d809 Add param to accept invalid input in to_integer Justin Li 2015-07-09 13:18:06 -04:00
  • e88be60818 Merge pull request #618 from Shopify/move-reraise-for-line-number Justin Li 2015-07-09 11:42:41 -04:00
  • 14416b3c49 Move the syntax error rescue for adding error line numbers. #618 Dylan Thacker-Smith 2015-07-09 11:25:05 -04:00
  • bde14a650d Merge pull request #617 from Shopify/rename-options-iv Dylan Thacker-Smith 2015-07-08 20:50:20 -04:00
  • c535af021a Rename options instance variable in Variable and Tag. #617 Dylan Thacker-Smith 2015-07-08 19:59:44 -04:00
  • 9c9345869b Merge pull request #614 from Shopify/remove-token-class Dylan Thacker-Smith 2015-07-08 19:48:55 -04:00
  • 73834a7e52 Use reject rather than dup and delete. #614 Dylan Thacker-Smith 2015-07-08 19:27:24 -04:00
  • c45310170b Use parse_context or options instead of @options. Dylan Thacker-Smith 2015-07-08 19:21:04 -04:00
  • 920e1df643 Rescue and re-raise syntax errors in Template#parse to add line numbers. Dylan Thacker-Smith 2015-07-05 16:07:47 -04:00
  • cebf75b8d7 Implement line numbers without the Liquid::Token class. Dylan Thacker-Smith 2015-07-04 20:10:15 -04:00
  • afda01adbb Merge pull request #616 from Shopify/handle-non-int-range-args Justin Li 2015-07-08 17:47:27 -04:00
  • 959cd6d2a2 Temporarily disable rubinius in CI Justin Li 2015-07-08 17:47:05 -04:00
  • 4c1b89e20e Add regression test for ranges on non-integer types #616 Justin Li 2015-07-08 17:41:18 -04:00
  • 83b6dd0268 Use to_integer for range lookup arguments Justin Li 2015-07-08 17:37:07 -04:00
  • 6fb402e60d Move to_integer, to_date, and to_number to Liquid::Utils Justin Li 2015-07-08 17:33:05 -04:00
  • 338287df5e Merge pull request #613 from Shopify/taint-context-warning Dylan Thacker-Smith 2015-07-07 16:23:10 -04:00
  • c4c398174b Use early returns rather than large if in Variable#taint_check #613 Dylan Thacker-Smith 2015-07-07 15:56:03 -04:00
  • 80b6ac3bc7 Add taint warnings to the context rather than the template. Dylan Thacker-Smith 2015-07-04 23:59:23 -04:00
  • 15974d9168 Merge pull request #612 from Shopify/fix-block-body-naming Dylan Thacker-Smith 2015-07-07 15:49:58 -04:00
  • f22ab4358b Merge pull request #611 from Shopify/no-escape-rescue Dylan Thacker-Smith 2015-07-07 15:49:43 -04:00
  • 9cf0d264e1 Require RuboCop v0.32.0 or later Justin Li 2015-07-06 15:58:36 -04:00
  • 575e3cae7a Remove class length metric cop Justin Li 2015-07-06 15:52:11 -04:00
  • fad3b8275c Use node to refer to objects from the nodelist rather than token. #612 Dylan Thacker-Smith 2015-07-04 20:57:35 -04:00
  • 5a071cb7f2 Remove standard exception rescue in escape filter. #611 Dylan Thacker-Smith 2015-07-04 13:48:25 -04:00
  • 8cb2364179 Merge pull request #608 from Shopify/tag-tag_name #605 Justin Li 2015-07-02 16:28:37 -04:00
  • 3c23cfc167 Add Liquid::Tag#tag_name #608 Gaurav Chande 2015-07-02 20:18:09 +00:00
  • 74f9bad513 Add spaceless tag #607 spaceless-tag Justin Li 2015-06-26 10:00:34 -07:00
  • 6a7542c9f3 inconsistancy with comparing identical strings made tests fail #604 Sam Volin 2015-06-23 14:14:27 -06:00
  • c17cd2b520 expanded the number of lines allowed for classes in the rubocop.yml file Sam Volin 2015-06-23 14:07:14 -06:00
  • b8b1dc0a4c nested sort looks good Sam Volin 2015-06-23 12:58:23 -06:00
  • 8a8de46c6a Merge pull request #603 from Shopify/format-history Justin Li 2015-06-23 07:40:05 -07:00
  • 58c7f226cc Format changelog attribution to include one name only #603 Justin Li 2015-06-19 11:45:37 -04:00
  • adfcd0ab13 Update history to reflect merge of #600 Justin Li 2015-06-19 11:38:59 -04:00
  • 30ef7d14b0 Merge pull request #600 from carsonreinke/filter-compact Justin Li 2015-06-19 11:38:14 -04:00
  • 4920ec50e4 update changelog Florian Weingarten 2015-06-19 07:41:39 -04:00
  • e395229283 Merge pull request #601 from Shopify/safe-to-integer David Cornu 2015-06-16 11:31:20 -04:00
  • 9470fba0c8 Exclude lib/liquid/standardfilters.rb from ModuleLength #601 David Cornu 2015-06-16 15:19:06 +00:00
  • bdd0487146 Merge 19524123d0c28d938a10eb3411baebae8a6f9959 into 504b6fb3c7fb4a6ccbeb30b0c106d43ac6a5df6b #602 Florian Weingarten 2015-06-16 15:09:31 +00:00
  • 19524123d0 Use to_integer for truncatewords filter #602 Florian Weingarten 2015-06-16 11:08:52 -04:00
  • ac180e8402 Use to_integer instead of to_i on arguments David Cornu 2015-06-16 15:08:29 +00:00
  • 7c5d54aced Ignore Rubocop Metrics/ModuleLength for now #600 Carson Reinke 2015-06-15 15:07:25 -04:00
  • 5fbb312a67 "Trailing whitespace detected." Carson Reinke 2015-06-15 14:27:48 -04:00
  • 8385099960 Added "compact" filter Carson Reinke 2015-06-15 14:14:28 -04:00
  • 504b6fb3c7 Merge pull request #596 from Shopify/liquid_c_tests #599 Florian Weingarten 2015-06-08 22:52:57 +02:00
  • 01420e8014 fix gem platforms #596 Florian Weingarten 2015-06-08 18:23:40 +00:00
  • dde35a2907 shut up rubocop Florian Weingarten 2015-06-08 18:16:33 +00:00
  • e2323332cd Run tests with latest liquid/c gem Florian Weingarten 2015-06-05 14:51:56 -04:00
  • 7b4398d0c4 Merge pull request #595 from Shopify/uniq_on_strings Florian Weingarten 2015-06-05 16:27:05 +02:00
  • 1e23036b2d Fix uniq filter with string input #595 Florian Weingarten 2015-06-04 22:54:19 -04:00
  • 57dad89139 Merge e0795d6e4cf97908f2170469068fed1891042345 into 13716fa68bf98a4702c8fece1210e282aef48563 #588 Loren Hale 2015-06-05 02:28:18 +00:00
  • e0795d6e4c add rake console #588 Loren Hale 2015-06-05 10:17:55 +08:00
  • c8bb462259 Include template name with line numbers in render errors. Dylan Thacker-Smith 2015-05-21 16:49:18 -04:00
  • fbd331978e Rename 'has_key?' and 'has_interrupt?' Florian Weingarten 2015-06-04 13:14:46 -04:00
  • fc08a8830e fix a few more rubocop offenses Florian Weingarten 2015-06-04 13:09:40 -04:00
  • db1d9e9f15 clean up some rubocop stuff Florian Weingarten 2015-06-04 12:56:29 -04:00
  • 2d5880381f blank and empty as variable names Florian Weingarten 2015-06-04 12:30:50 -04:00
  • 4cf901306a run rubocop on CI Florian Weingarten 2015-06-04 11:57:25 -04:00
  • 2000aef694 Avoid parallel assignments Florian Weingarten 2015-06-04 11:56:47 -04:00
  • 0b05463e55 gitignore .bundle Florian Weingarten 2015-06-04 11:55:57 -04:00
  • 6e9a0a8d5a make rubocop happy Florian Weingarten 2015-06-04 11:55:52 -04:00
  • 4380f71835 Change Tokenizer test to fetch tokens instead of exposing ivar Gaurav Chande 2015-06-04 05:48:39 +00:00
  • 31abd0677f Extract tag fetching into a method (which can be overriden then) Gaurav Chande 2015-06-03 19:44:52 +00:00
  • 44d7cd13d9 Move DEFAULT_OPTIONS related logic to Document Gaurav Chande 2015-06-03 19:42:16 +00:00
  • 052bc47538 Extract tokenize logic from Template to a RubyTokenizer Gaurav Chande 2015-06-03 19:40:49 +00:00
  • b9f9d43e8c Avoid an exception from checking if a string contains a non-string. Dylan Thacker-Smith 2015-06-03 02:21:51 -04:00
  • 13716fa68b Merge pull request #594 from boobooninja/rake_console Florian Weingarten 2015-06-05 04:21:01 +02:00
  • 232e8bb4cd add rake console #594 Loren Hale 2015-06-05 10:17:55 +08:00
  • 6968def5dd Merge pull request #574 from Shopify/template-name-in-errors Dylan Thacker-Smith 2015-06-04 15:28:12 -04:00
  • ad3748af21 Include template name with line numbers in render errors. #574 Dylan Thacker-Smith 2015-05-21 16:49:18 -04:00
  • c82e04f4e6 Merge pull request #593 from Shopify/fix_predicate_name Florian Weingarten 2015-06-04 19:40:14 +02:00
  • 5919626da4 Rename 'has_key?' and 'has_interrupt?' #593 Florian Weingarten 2015-06-04 13:14:46 -04:00
  • 82269e2509 fix a few more rubocop offenses Florian Weingarten 2015-06-04 13:09:40 -04:00
  • b347fac3c0 Merge pull request #592 from Shopify/method_literal Florian Weingarten 2015-06-04 19:09:48 +02:00
  • e761a6864e clean up some rubocop stuff Florian Weingarten 2015-06-04 12:56:29 -04:00
  • 4c22cef341 blank and empty as variable names #592 Florian Weingarten 2015-06-04 12:30:50 -04:00
  • c319240174 run rubocop on CI Florian Weingarten 2015-06-04 11:57:25 -04:00
  • 6ace095207 Avoid parallel assignments Florian Weingarten 2015-06-04 11:56:47 -04:00
  • e36f366c33 gitignore .bundle Florian Weingarten 2015-06-04 11:55:57 -04:00
  • 02729e89c0 make rubocop happy Florian Weingarten 2015-06-04 11:55:52 -04:00
  • 6b0f6401d0 Merge pull request #590 from Shopify/allow-template-tags Gaurav Chande 2015-06-04 11:19:24 -04:00
  • fc8e6c8d3a Change Tokenizer test to fetch tokens instead of exposing ivar #590 Gaurav Chande 2015-06-04 05:48:39 +00:00
  • 79d7dd06df Extract tag fetching into a method (which can be overriden then) Gaurav Chande 2015-06-03 19:44:52 +00:00