From b106242f52272c4a5ced7a0e9d1dcb1b50542501 Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Fri, 3 Nov 2017 15:24:45 +0900
Subject: Specify bundler version in template files

We have already specified to install `bundler` 1.15.4 in `.travis.yml`.
https://github.com/rails/rails/blob/master/.travis.yml#L31..L32

However, `bundler` 1.16.0 may be used in the test.
https://travis-ci.org/rails/rails/jobs/296582467#L2208

The test failed due to this influence.
In order to avoid this, specifying `bundler` version in bug report
templates.
---
 guides/bug_report_templates/action_controller_master.rb        | 2 ++
 guides/bug_report_templates/active_job_master.rb               | 2 ++
 guides/bug_report_templates/active_record_master.rb            | 2 ++
 guides/bug_report_templates/active_record_migrations_master.rb | 2 ++
 guides/bug_report_templates/benchmark.rb                       | 2 ++
 guides/bug_report_templates/generic_master.rb                  | 2 ++
 6 files changed, 12 insertions(+)

diff --git a/guides/bug_report_templates/action_controller_master.rb b/guides/bug_report_templates/action_controller_master.rb
index cf76de80d2..932d329943 100644
--- a/guides/bug_report_templates/action_controller_master.rb
+++ b/guides/bug_report_templates/action_controller_master.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+gem "bundler", "< 1.16"
+
 begin
   require "bundler/inline"
 rescue LoadError => e
diff --git a/guides/bug_report_templates/active_job_master.rb b/guides/bug_report_templates/active_job_master.rb
index ce480cbb52..36d9137b71 100644
--- a/guides/bug_report_templates/active_job_master.rb
+++ b/guides/bug_report_templates/active_job_master.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+gem "bundler", "< 1.16"
+
 begin
   require "bundler/inline"
 rescue LoadError => e
diff --git a/guides/bug_report_templates/active_record_master.rb b/guides/bug_report_templates/active_record_master.rb
index 78411e2d57..b66deb36f3 100644
--- a/guides/bug_report_templates/active_record_master.rb
+++ b/guides/bug_report_templates/active_record_master.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+gem "bundler", "< 1.16"
+
 begin
   require "bundler/inline"
 rescue LoadError => e
diff --git a/guides/bug_report_templates/active_record_migrations_master.rb b/guides/bug_report_templates/active_record_migrations_master.rb
index fce8d1d848..737ce66d7b 100644
--- a/guides/bug_report_templates/active_record_migrations_master.rb
+++ b/guides/bug_report_templates/active_record_migrations_master.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+gem "bundler", "< 1.16"
+
 begin
   require "bundler/inline"
 rescue LoadError => e
diff --git a/guides/bug_report_templates/benchmark.rb b/guides/bug_report_templates/benchmark.rb
index fb51273e3e..f5c88086a9 100644
--- a/guides/bug_report_templates/benchmark.rb
+++ b/guides/bug_report_templates/benchmark.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+gem "bundler", "< 1.16"
+
 begin
   require "bundler/inline"
 rescue LoadError => e
diff --git a/guides/bug_report_templates/generic_master.rb b/guides/bug_report_templates/generic_master.rb
index 384c8b1833..240571ba9a 100644
--- a/guides/bug_report_templates/generic_master.rb
+++ b/guides/bug_report_templates/generic_master.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+gem "bundler", "< 1.16"
+
 begin
   require "bundler/inline"
 rescue LoadError => e
-- 
cgit v1.2.3