932 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Justin Li	959cd6d2a2	Temporarily disable rubinius in CI ... It takes much longer than the others and is currently broken	2015-07-08 17:47:05 -04:00
Dylan Thacker-Smith	338287df5e	Merge pull request #613 from Shopify/taint-context-warning ... Add taint warnings to the context rather than the template.	2015-07-07 16:23:10 -04:00
Dylan Thacker-Smith	c4c398174b	Use early returns rather than large if in Variable#taint_check	2015-07-07 15:56:03 -04:00
Dylan Thacker-Smith	80b6ac3bc7	Add taint warnings to the context rather than the template.	2015-07-07 15:53:02 -04:00
Dylan Thacker-Smith	15974d9168	Merge pull request #612 from Shopify/fix-block-body-naming ... Use node to refer to objects from the nodelist rather than token.	2015-07-07 15:49:58 -04:00
Dylan Thacker-Smith	f22ab4358b	Merge pull request #611 from Shopify/no-escape-rescue ... Remove standard exception rescue in escape filter.	2015-07-07 15:49:43 -04:00
Justin Li	9cf0d264e1	Require RuboCop v0.32.0 or later	2015-07-06 15:58:36 -04:00
Justin Li	575e3cae7a	Remove class length metric cop	2015-07-06 15:52:11 -04:00
Dylan Thacker-Smith	fad3b8275c	Use node to refer to objects from the nodelist rather than token.	2015-07-04 20:57:35 -04:00
Dylan Thacker-Smith	5a071cb7f2	Remove standard exception rescue in escape filter.	2015-07-04 13:48:25 -04:00
Justin Li	8cb2364179	Merge pull request #608 from Shopify/tag-tag_name ... Add Liquid::Tag#tag_name	2015-07-02 16:28:37 -04:00
Gaurav Chande	3c23cfc167	Add Liquid::Tag#tag_name	2015-07-02 20:18:09 +00:00
Justin Li	8a8de46c6a	Merge pull request #603 from Shopify/format-history ... Format changelog attribution to include one name only	2015-06-23 07:40:05 -07:00
Justin Li	58c7f226cc	Format changelog attribution to include one name only	2015-06-19 11:45:37 -04:00
Justin Li	adfcd0ab13	Update history to reflect merge of #600 ... [ci skip]	2015-06-19 11:38:59 -04:00
Justin Li	30ef7d14b0	Merge pull request #600 from carsonreinke/filter-compact ... Merge pull request 600	2015-06-19 11:38:14 -04:00
Florian Weingarten	4920ec50e4	update changelog	2015-06-19 07:41:39 -04:00
David Cornu	e395229283	Merge pull request #601 from Shopify/safe-to-integer ... Use to_integer instead of to_i on arguments	2015-06-16 11:31:20 -04:00
David Cornu	9470fba0c8	Exclude lib/liquid/standardfilters.rb from ModuleLength	2015-06-16 15:19:06 +00:00
David Cornu	ac180e8402	Use to_integer instead of to_i on arguments	2015-06-16 15:08:29 +00:00
Carson Reinke	7c5d54aced	Ignore Rubocop Metrics/ModuleLength for now	2015-06-15 15:07:25 -04:00
Carson Reinke	5fbb312a67	"Trailing whitespace detected."	2015-06-15 14:27:48 -04:00
Carson Reinke	8385099960	Added "compact" filter	2015-06-15 14:14:28 -04:00
Florian Weingarten	504b6fb3c7	Merge pull request #596 from Shopify/liquid_c_tests ... Run tests with latest liquid/c gem	2015-06-08 22:52:57 +02:00
Florian Weingarten	01420e8014	fix gem platforms	2015-06-08 18:38:40 +00:00
Florian Weingarten	dde35a2907	shut up rubocop	2015-06-08 18:38:40 +00:00
Florian Weingarten	e2323332cd	Run tests with latest liquid/c gem	2015-06-08 18:38:35 +00:00
Florian Weingarten	7b4398d0c4	Merge pull request #595 from Shopify/uniq_on_strings ... Fix uniq filter with string input	2015-06-05 16:27:05 +02:00
Florian Weingarten	1e23036b2d	Fix uniq filter with string input	2015-06-04 22:55:03 -04:00
Florian Weingarten	13716fa68b	Merge pull request #594 from boobooninja/rake_console ... add rake console	2015-06-05 04:21:01 +02:00
Loren Hale	232e8bb4cd	add rake console ... add Rake console task to load irb with liquid	2015-06-05 10:17:55 +08:00
Dylan Thacker-Smith	6968def5dd	Merge pull request #574 from Shopify/template-name-in-errors ... Include template name with line numbers in render errors.	2015-06-04 15:28:12 -04:00
Dylan Thacker-Smith	ad3748af21	Include template name with line numbers in render errors.	2015-06-04 13:44:01 -04:00
Florian Weingarten	c82e04f4e6	Merge pull request #593 from Shopify/fix_predicate_name ... Rename 'has_key?' and 'has_interrupt?'	2015-06-04 19:40:14 +02: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	b347fac3c0	Merge pull request #592 from Shopify/method_literal ... blank and empty as variable names	2015-06-04 19:09:48 +02: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
Gaurav Chande	6b0f6401d0	Merge pull request #590 from Shopify/allow-template-tags ... Local Tags	2015-06-04 11:19:24 -04:00
Gaurav Chande	fc8e6c8d3a	Change Tokenizer test to fetch tokens instead of exposing ivar	2015-06-04 15:10:01 +00:00
Gaurav Chande	79d7dd06df	Extract tag fetching into a method (which can be overriden then)	2015-06-04 04:39:54 +00:00
Gaurav Chande	3a907a4db7	Move DEFAULT_OPTIONS related logic to Document	2015-06-04 04:39:54 +00:00
Gaurav Chande	8b98f92c7f	Extract tokenize logic from Template to a RubyTokenizer	2015-06-04 04:39:30 +00:00
Dylan Thacker-Smith	b79c0c611c	Merge pull request #586 from Shopify/string-contains-non-string ... Avoid an exception from checking if a string contains a non-string.	2015-06-03 10:58:38 -04:00
Dylan Thacker-Smith	8a2947865b	Avoid an exception from checking if a string contains a non-string.	2015-06-03 02:21:51 -04:00