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

Merge branch 'master' into sponsor

This commit is contained in:
Ashwin Maroli 2018-07-17 22:06:47 +05:30
parent 477dbb34f4 02a2f9460a
commit e9f78247de
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -52,4 +52,4 @@ after_success:
before_install: before_install:
- gem update --system - gem update --system
- gem install bundler - gem install bundler --version 1.16.2

1
History.markdown
View File

@ -76,6 +76,7 @@
* Fix Rubocop offences in test files (#7128) * Fix Rubocop offences in test files (#7128)
* fix up refute_equal call (#7133) * fix up refute_equal call (#7133)
* Fix incorrectly passed arguments to assert_equal (#7134) * Fix incorrectly passed arguments to assert_equal (#7134)
* Lock Travis to Bundler-1.16.2 (#7144)
### Bug Fixes ### Bug Fixes