Merge branch 'master' into sponsor

2018-07-17 22:06:47 +05:30 · 2018-07-17 22:06:47 +05:30 · e9f78247de
parent 477dbb34f4 02a2f9460a
commit e9f78247de
2 changed files with 2 additions and 1 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -52,4 +52,4 @@ after_success:

 before_install:
  - gem update --system
-  - gem install bundler
+  - gem install bundler --version 1.16.2
--- a/History.markdown
+++ b/History.markdown
@ -76,6 +76,7 @@
  * Fix Rubocop offences in test files (#7128)
  * fix up refute_equal call (#7133)
  * Fix incorrectly passed arguments to assert_equal (#7134)
+  * Lock Travis to Bundler-1.16.2 (#7144)

 ### Bug Fixes