dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4720 from jekyll/feature/upgrade-rake 

Merge pull request 4720
This commit is contained in:
jekyllbot 2016-03-31 18:31:17 -07:00
parent f2aa15555b f80321ecac
commit 6c9200252a
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -1,7 +1,7 @@
source "https://rubygems.org" source "https://rubygems.org"
gemspec :name => "jekyll" gemspec :name => "jekyll"
gem "rake", "~> 10.1" gem "rake", "~> 11.0"
group :development do group :development do
gem "launchy", "~> 2.3" gem "launchy", "~> 2.3"
gem "rubocop", :branch => :master, :github => "bbatsov/rubocop" gem "rubocop", :branch => :master, :github => "bbatsov/rubocop"

7
test/helper.rb
View File

@ -1,3 +1,10 @@
$stdout.puts "# -------------------------------------------------------------"
$stdout.puts "# SPECS AND TESTS ARE RUNNING WITH WARNINGS OFF."
$stdout.puts "# SEE: https://github.com/Shopify/liquid/issues/730"
$stdout.puts "# SEE: https://github.com/jekyll/jekyll/issues/4719"
$stdout.puts "# -------------------------------------------------------------"
$VERBOSE = nil
def jruby? def jruby?
defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby' defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
end end