Merge branch 'master' into bump-ruby-2-4

This commit is contained in:
Mike Angell
2019-08-29 00:24:45 +10:00
committed by GitHub
11 changed files with 270 additions and 33 deletions
+2 -1
View File
@@ -8,6 +8,7 @@ gemspec
group :benchmark, :test do
gem 'benchmark-ips'
gem 'memory_profiler'
gem 'terminal-table'
install_if -> { RUBY_PLATFORM !~ /mingw|mswin|java/ && RUBY_ENGINE != 'truffleruby' } do
gem 'stackprof'
@@ -19,6 +20,6 @@ group :test do
gem 'rubocop-performance', require: false
platform :mri, :truffleruby do
gem 'liquid-c', github: 'Shopify/liquid-c', ref: '7ba926791ef8411984d0f3e41c6353fd716041c6'
gem 'liquid-c', github: 'Shopify/liquid-c', ref: 'liquid-tag'
end
end