From 3e0a858aedb9cb3698843f8b1de8a80876f75aa7 Mon Sep 17 00:00:00 2001
From: bogdanvlviv <bogdanvlviv@gmail.com>
Date: Wed, 27 Sep 2017 00:02:11 +0300
Subject: Change :github git source for bug report templates

:github source uses `git://` url by default, `https://` is recommended.
See http://bundler.io/v1.15/guides/git.html#security

We do the same in our `Gemfile` and templates.
---
 guides/bug_report_templates/action_controller_gem.rb           | 1 +
 guides/bug_report_templates/action_controller_master.rb        | 1 +
 guides/bug_report_templates/active_job_gem.rb                  | 1 +
 guides/bug_report_templates/active_job_master.rb               | 1 +
 guides/bug_report_templates/active_record_gem.rb               | 1 +
 guides/bug_report_templates/active_record_master.rb            | 1 +
 guides/bug_report_templates/active_record_migrations_gem.rb    | 1 +
 guides/bug_report_templates/active_record_migrations_master.rb | 1 +
 guides/bug_report_templates/benchmark.rb                       | 1 +
 guides/bug_report_templates/generic_gem.rb                     | 1 +
 guides/bug_report_templates/generic_master.rb                  | 1 +
 11 files changed, 11 insertions(+)

(limited to 'guides/bug_report_templates')

diff --git a/guides/bug_report_templates/action_controller_gem.rb b/guides/bug_report_templates/action_controller_gem.rb
index 4d8d8db3e5..fc4effac30 100644
--- a/guides/bug_report_templates/action_controller_gem.rb
+++ b/guides/bug_report_templates/action_controller_gem.rb
@@ -9,6 +9,7 @@ end
 
 gemfile(true) do
   source "https://rubygems.org"
+  git_source(:github) { |repo| "https://github.com/#{repo}.git" }
   # Activate the gem you are reporting the issue against.
   gem "rails", "5.1.0"
 end
diff --git a/guides/bug_report_templates/action_controller_master.rb b/guides/bug_report_templates/action_controller_master.rb
index 1f862e07da..dc99573ca1 100644
--- a/guides/bug_report_templates/action_controller_master.rb
+++ b/guides/bug_report_templates/action_controller_master.rb
@@ -9,6 +9,7 @@ end
 
 gemfile(true) do
   source "https://rubygems.org"
+  git_source(:github) { |repo| "https://github.com/#{repo}.git" }
   gem "rails", github: "rails/rails"
   gem "arel", github: "rails/arel"
 end
diff --git a/guides/bug_report_templates/active_job_gem.rb b/guides/bug_report_templates/active_job_gem.rb
index af777a86ef..3cedafd482 100644
--- a/guides/bug_report_templates/active_job_gem.rb
+++ b/guides/bug_report_templates/active_job_gem.rb
@@ -9,6 +9,7 @@ end
 
 gemfile(true) do
   source "https://rubygems.org"
+  git_source(:github) { |repo| "https://github.com/#{repo}.git" }
   # Activate the gem you are reporting the issue against.
   gem "activejob", "5.1.0"
 end
diff --git a/guides/bug_report_templates/active_job_master.rb b/guides/bug_report_templates/active_job_master.rb
index 39fb3f60a6..998632676a 100644
--- a/guides/bug_report_templates/active_job_master.rb
+++ b/guides/bug_report_templates/active_job_master.rb
@@ -9,6 +9,7 @@ end
 
 gemfile(true) do
   source "https://rubygems.org"
+  git_source(:github) { |repo| "https://github.com/#{repo}.git" }
   gem "rails", github: "rails/rails"
   gem "arel", github: "rails/arel"
 end
diff --git a/guides/bug_report_templates/active_record_gem.rb b/guides/bug_report_templates/active_record_gem.rb
index 168e2dcc66..55c2ab8a74 100644
--- a/guides/bug_report_templates/active_record_gem.rb
+++ b/guides/bug_report_templates/active_record_gem.rb
@@ -9,6 +9,7 @@ end
 
 gemfile(true) do
   source "https://rubygems.org"
+  git_source(:github) { |repo| "https://github.com/#{repo}.git" }
   # Activate the gem you are reporting the issue against.
   gem "activerecord", "5.1.0"
   gem "sqlite3"
diff --git a/guides/bug_report_templates/active_record_master.rb b/guides/bug_report_templates/active_record_master.rb
index cbd2cff2b8..659c0a1d5e 100644
--- a/guides/bug_report_templates/active_record_master.rb
+++ b/guides/bug_report_templates/active_record_master.rb
@@ -9,6 +9,7 @@ end
 
 gemfile(true) do
   source "https://rubygems.org"
+  git_source(:github) { |repo| "https://github.com/#{repo}.git" }
   gem "rails", github: "rails/rails"
   gem "arel", github: "rails/arel"
   gem "sqlite3"
diff --git a/guides/bug_report_templates/active_record_migrations_gem.rb b/guides/bug_report_templates/active_record_migrations_gem.rb
index b931ed0beb..e5a336768b 100644
--- a/guides/bug_report_templates/active_record_migrations_gem.rb
+++ b/guides/bug_report_templates/active_record_migrations_gem.rb
@@ -9,6 +9,7 @@ end
 
 gemfile(true) do
   source "https://rubygems.org"
+  git_source(:github) { |repo| "https://github.com/#{repo}.git" }
   # Activate the gem you are reporting the issue against.
   gem "activerecord", "5.1.0"
   gem "sqlite3"
diff --git a/guides/bug_report_templates/active_record_migrations_master.rb b/guides/bug_report_templates/active_record_migrations_master.rb
index 2c009c0563..251bc52c4e 100644
--- a/guides/bug_report_templates/active_record_migrations_master.rb
+++ b/guides/bug_report_templates/active_record_migrations_master.rb
@@ -9,6 +9,7 @@ end
 
 gemfile(true) do
   source "https://rubygems.org"
+  git_source(:github) { |repo| "https://github.com/#{repo}.git" }
   gem "rails", github: "rails/rails"
   gem "arel", github: "rails/arel"
   gem "sqlite3"
diff --git a/guides/bug_report_templates/benchmark.rb b/guides/bug_report_templates/benchmark.rb
index d0f5a634bc..5c8c4cc3c6 100644
--- a/guides/bug_report_templates/benchmark.rb
+++ b/guides/bug_report_templates/benchmark.rb
@@ -9,6 +9,7 @@ end
 
 gemfile(true) do
   source "https://rubygems.org"
+  git_source(:github) { |repo| "https://github.com/#{repo}.git" }
   gem "rails", github: "rails/rails"
   gem "arel", github: "rails/arel"
   gem "benchmark-ips"
diff --git a/guides/bug_report_templates/generic_gem.rb b/guides/bug_report_templates/generic_gem.rb
index c990bda005..2cff854621 100644
--- a/guides/bug_report_templates/generic_gem.rb
+++ b/guides/bug_report_templates/generic_gem.rb
@@ -9,6 +9,7 @@ end
 
 gemfile(true) do
   source "https://rubygems.org"
+  git_source(:github) { |repo| "https://github.com/#{repo}.git" }
   # Activate the gem you are reporting the issue against.
   gem "activesupport", "5.1.0"
 end
diff --git a/guides/bug_report_templates/generic_master.rb b/guides/bug_report_templates/generic_master.rb
index 1a9b99b624..12334a0106 100644
--- a/guides/bug_report_templates/generic_master.rb
+++ b/guides/bug_report_templates/generic_master.rb
@@ -9,6 +9,7 @@ end
 
 gemfile(true) do
   source "https://rubygems.org"
+  git_source(:github) { |repo| "https://github.com/#{repo}.git" }
   gem "rails", github: "rails/rails"
   gem "arel", github: "rails/arel"
 end
-- 
cgit v1.2.3


From a151d8ad89a3d353160d85945ab9ad44cb9e6f7a Mon Sep 17 00:00:00 2001
From: Ryuta Kamizono <kamipo@gmail.com>
Date: Wed, 27 Sep 2017 17:55:43 +0900
Subject: Add newlines before/after the `git_source` in bug report templates

[ci skip]
---
 guides/bug_report_templates/action_controller_gem.rb           | 2 ++
 guides/bug_report_templates/action_controller_master.rb        | 2 ++
 guides/bug_report_templates/active_job_gem.rb                  | 2 ++
 guides/bug_report_templates/active_job_master.rb               | 2 ++
 guides/bug_report_templates/active_record_gem.rb               | 2 ++
 guides/bug_report_templates/active_record_master.rb            | 2 ++
 guides/bug_report_templates/active_record_migrations_gem.rb    | 2 ++
 guides/bug_report_templates/active_record_migrations_master.rb | 2 ++
 guides/bug_report_templates/benchmark.rb                       | 2 ++
 guides/bug_report_templates/generic_gem.rb                     | 2 ++
 guides/bug_report_templates/generic_master.rb                  | 2 ++
 11 files changed, 22 insertions(+)

(limited to 'guides/bug_report_templates')

diff --git a/guides/bug_report_templates/action_controller_gem.rb b/guides/bug_report_templates/action_controller_gem.rb
index fc4effac30..341724cdcd 100644
--- a/guides/bug_report_templates/action_controller_gem.rb
+++ b/guides/bug_report_templates/action_controller_gem.rb
@@ -9,7 +9,9 @@ end
 
 gemfile(true) do
   source "https://rubygems.org"
+
   git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
   # Activate the gem you are reporting the issue against.
   gem "rails", "5.1.0"
 end
diff --git a/guides/bug_report_templates/action_controller_master.rb b/guides/bug_report_templates/action_controller_master.rb
index dc99573ca1..558d9bf3e2 100644
--- a/guides/bug_report_templates/action_controller_master.rb
+++ b/guides/bug_report_templates/action_controller_master.rb
@@ -9,7 +9,9 @@ end
 
 gemfile(true) do
   source "https://rubygems.org"
+
   git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
   gem "rails", github: "rails/rails"
   gem "arel", github: "rails/arel"
 end
diff --git a/guides/bug_report_templates/active_job_gem.rb b/guides/bug_report_templates/active_job_gem.rb
index 3cedafd482..013d1f8602 100644
--- a/guides/bug_report_templates/active_job_gem.rb
+++ b/guides/bug_report_templates/active_job_gem.rb
@@ -9,7 +9,9 @@ end
 
 gemfile(true) do
   source "https://rubygems.org"
+
   git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
   # Activate the gem you are reporting the issue against.
   gem "activejob", "5.1.0"
 end
diff --git a/guides/bug_report_templates/active_job_master.rb b/guides/bug_report_templates/active_job_master.rb
index 998632676a..ce480cbb52 100644
--- a/guides/bug_report_templates/active_job_master.rb
+++ b/guides/bug_report_templates/active_job_master.rb
@@ -9,7 +9,9 @@ end
 
 gemfile(true) do
   source "https://rubygems.org"
+
   git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
   gem "rails", github: "rails/rails"
   gem "arel", github: "rails/arel"
 end
diff --git a/guides/bug_report_templates/active_record_gem.rb b/guides/bug_report_templates/active_record_gem.rb
index 55c2ab8a74..921917fbe9 100644
--- a/guides/bug_report_templates/active_record_gem.rb
+++ b/guides/bug_report_templates/active_record_gem.rb
@@ -9,7 +9,9 @@ end
 
 gemfile(true) do
   source "https://rubygems.org"
+
   git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
   # Activate the gem you are reporting the issue against.
   gem "activerecord", "5.1.0"
   gem "sqlite3"
diff --git a/guides/bug_report_templates/active_record_master.rb b/guides/bug_report_templates/active_record_master.rb
index 659c0a1d5e..78411e2d57 100644
--- a/guides/bug_report_templates/active_record_master.rb
+++ b/guides/bug_report_templates/active_record_master.rb
@@ -9,7 +9,9 @@ end
 
 gemfile(true) do
   source "https://rubygems.org"
+
   git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
   gem "rails", github: "rails/rails"
   gem "arel", github: "rails/arel"
   gem "sqlite3"
diff --git a/guides/bug_report_templates/active_record_migrations_gem.rb b/guides/bug_report_templates/active_record_migrations_gem.rb
index e5a336768b..f75b6fd932 100644
--- a/guides/bug_report_templates/active_record_migrations_gem.rb
+++ b/guides/bug_report_templates/active_record_migrations_gem.rb
@@ -9,7 +9,9 @@ end
 
 gemfile(true) do
   source "https://rubygems.org"
+
   git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
   # Activate the gem you are reporting the issue against.
   gem "activerecord", "5.1.0"
   gem "sqlite3"
diff --git a/guides/bug_report_templates/active_record_migrations_master.rb b/guides/bug_report_templates/active_record_migrations_master.rb
index 251bc52c4e..60416ed42f 100644
--- a/guides/bug_report_templates/active_record_migrations_master.rb
+++ b/guides/bug_report_templates/active_record_migrations_master.rb
@@ -9,7 +9,9 @@ end
 
 gemfile(true) do
   source "https://rubygems.org"
+
   git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
   gem "rails", github: "rails/rails"
   gem "arel", github: "rails/arel"
   gem "sqlite3"
diff --git a/guides/bug_report_templates/benchmark.rb b/guides/bug_report_templates/benchmark.rb
index 5c8c4cc3c6..fb51273e3e 100644
--- a/guides/bug_report_templates/benchmark.rb
+++ b/guides/bug_report_templates/benchmark.rb
@@ -9,7 +9,9 @@ end
 
 gemfile(true) do
   source "https://rubygems.org"
+
   git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
   gem "rails", github: "rails/rails"
   gem "arel", github: "rails/arel"
   gem "benchmark-ips"
diff --git a/guides/bug_report_templates/generic_gem.rb b/guides/bug_report_templates/generic_gem.rb
index 2cff854621..60e8322c2a 100644
--- a/guides/bug_report_templates/generic_gem.rb
+++ b/guides/bug_report_templates/generic_gem.rb
@@ -9,7 +9,9 @@ end
 
 gemfile(true) do
   source "https://rubygems.org"
+
   git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
   # Activate the gem you are reporting the issue against.
   gem "activesupport", "5.1.0"
 end
diff --git a/guides/bug_report_templates/generic_master.rb b/guides/bug_report_templates/generic_master.rb
index 12334a0106..384c8b1833 100644
--- a/guides/bug_report_templates/generic_master.rb
+++ b/guides/bug_report_templates/generic_master.rb
@@ -9,7 +9,9 @@ end
 
 gemfile(true) do
   source "https://rubygems.org"
+
   git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
   gem "rails", github: "rails/rails"
   gem "arel", github: "rails/arel"
 end
-- 
cgit v1.2.3


From fbcc4bfe9a211e219da5d0bb01d894fcdaef0a0e Mon Sep 17 00:00:00 2001
From: Kasper Timm Hansen <kaspth@gmail.com>
Date: Thu, 28 Sep 2017 20:04:46 +0200
Subject: Deprecate secret_token, long since usurped by secret_key_base.

See the changelog entry.

Remove `secrets.secret_token` from the bug report templates,
since we don't accept bug reports for Rails versions that
don't support a `secret_key_base`.

[ claudiob & Kasper Timm Hansen ]
---
 guides/bug_report_templates/action_controller_gem.rb    | 1 -
 guides/bug_report_templates/action_controller_master.rb | 1 -
 2 files changed, 2 deletions(-)

(limited to 'guides/bug_report_templates')

diff --git a/guides/bug_report_templates/action_controller_gem.rb b/guides/bug_report_templates/action_controller_gem.rb
index 341724cdcd..557b1d7bef 100644
--- a/guides/bug_report_templates/action_controller_gem.rb
+++ b/guides/bug_report_templates/action_controller_gem.rb
@@ -22,7 +22,6 @@ require "action_controller/railtie"
 class TestApp < Rails::Application
   config.root = __dir__
   config.session_store :cookie_store, key: "cookie_store_key"
-  secrets.secret_token    = "secret_token"
   secrets.secret_key_base = "secret_key_base"
 
   config.logger = Logger.new($stdout)
diff --git a/guides/bug_report_templates/action_controller_master.rb b/guides/bug_report_templates/action_controller_master.rb
index 558d9bf3e2..cf76de80d2 100644
--- a/guides/bug_report_templates/action_controller_master.rb
+++ b/guides/bug_report_templates/action_controller_master.rb
@@ -20,7 +20,6 @@ require "action_controller/railtie"
 
 class TestApp < Rails::Application
   config.root = __dir__
-  secrets.secret_token    = "secret_token"
   secrets.secret_key_base = "secret_key_base"
 
   config.logger = Logger.new($stdout)
-- 
cgit v1.2.3


From 615415ba8145b82ff8d303db3add0ece572eaf24 Mon Sep 17 00:00:00 2001
From: bogdanvlviv <bogdanvlviv@gmail.com>
Date: Wed, 18 Oct 2017 16:28:12 +0300
Subject: Set proper migration' version in bug report templates

---
 guides/bug_report_templates/active_record_migrations_gem.rb    | 2 +-
 guides/bug_report_templates/active_record_migrations_master.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'guides/bug_report_templates')

diff --git a/guides/bug_report_templates/active_record_migrations_gem.rb b/guides/bug_report_templates/active_record_migrations_gem.rb
index f75b6fd932..9002b8f428 100644
--- a/guides/bug_report_templates/active_record_migrations_gem.rb
+++ b/guides/bug_report_templates/active_record_migrations_gem.rb
@@ -37,7 +37,7 @@ end
 class Payment < ActiveRecord::Base
 end
 
-class ChangeAmountToAddScale < ActiveRecord::Migration[5.0]
+class ChangeAmountToAddScale < ActiveRecord::Migration[5.1]
   def change
     reversible do |dir|
       dir.up do
diff --git a/guides/bug_report_templates/active_record_migrations_master.rb b/guides/bug_report_templates/active_record_migrations_master.rb
index 60416ed42f..fce8d1d848 100644
--- a/guides/bug_report_templates/active_record_migrations_master.rb
+++ b/guides/bug_report_templates/active_record_migrations_master.rb
@@ -37,7 +37,7 @@ end
 class Payment < ActiveRecord::Base
 end
 
-class ChangeAmountToAddScale < ActiveRecord::Migration[5.0]
+class ChangeAmountToAddScale < ActiveRecord::Migration[5.2]
   def change
     reversible do |dir|
       dir.up do
-- 
cgit v1.2.3


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(+)

(limited to 'guides/bug_report_templates')

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


From 2a26ff80e8a08c2ac22332b52f6534cb6534bae1 Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Wed, 15 Nov 2017 10:00:43 +0900
Subject: Use released arel

Related to 2e0fe5928f0d08f85b4796c85bd0b39f6be09079
---
 guides/bug_report_templates/action_controller_master.rb        | 1 -
 guides/bug_report_templates/active_job_master.rb               | 1 -
 guides/bug_report_templates/active_record_master.rb            | 1 -
 guides/bug_report_templates/active_record_migrations_master.rb | 1 -
 guides/bug_report_templates/benchmark.rb                       | 1 -
 guides/bug_report_templates/generic_master.rb                  | 1 -
 6 files changed, 6 deletions(-)

(limited to 'guides/bug_report_templates')

diff --git a/guides/bug_report_templates/action_controller_master.rb b/guides/bug_report_templates/action_controller_master.rb
index 932d329943..732cdad259 100644
--- a/guides/bug_report_templates/action_controller_master.rb
+++ b/guides/bug_report_templates/action_controller_master.rb
@@ -15,7 +15,6 @@ gemfile(true) do
   git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
   gem "rails", github: "rails/rails"
-  gem "arel", github: "rails/arel"
 end
 
 require "action_controller/railtie"
diff --git a/guides/bug_report_templates/active_job_master.rb b/guides/bug_report_templates/active_job_master.rb
index 36d9137b71..c0c67879f3 100644
--- a/guides/bug_report_templates/active_job_master.rb
+++ b/guides/bug_report_templates/active_job_master.rb
@@ -15,7 +15,6 @@ gemfile(true) do
   git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
   gem "rails", github: "rails/rails"
-  gem "arel", github: "rails/arel"
 end
 
 require "active_job"
diff --git a/guides/bug_report_templates/active_record_master.rb b/guides/bug_report_templates/active_record_master.rb
index b66deb36f3..b1c83a51f6 100644
--- a/guides/bug_report_templates/active_record_master.rb
+++ b/guides/bug_report_templates/active_record_master.rb
@@ -15,7 +15,6 @@ gemfile(true) do
   git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
   gem "rails", github: "rails/rails"
-  gem "arel", github: "rails/arel"
   gem "sqlite3"
 end
 
diff --git a/guides/bug_report_templates/active_record_migrations_master.rb b/guides/bug_report_templates/active_record_migrations_master.rb
index 737ce66d7b..0979a42a41 100644
--- a/guides/bug_report_templates/active_record_migrations_master.rb
+++ b/guides/bug_report_templates/active_record_migrations_master.rb
@@ -15,7 +15,6 @@ gemfile(true) do
   git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
   gem "rails", github: "rails/rails"
-  gem "arel", github: "rails/arel"
   gem "sqlite3"
 end
 
diff --git a/guides/bug_report_templates/benchmark.rb b/guides/bug_report_templates/benchmark.rb
index f5c88086a9..520c5e8bab 100644
--- a/guides/bug_report_templates/benchmark.rb
+++ b/guides/bug_report_templates/benchmark.rb
@@ -15,7 +15,6 @@ gemfile(true) do
   git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
   gem "rails", github: "rails/rails"
-  gem "arel", github: "rails/arel"
   gem "benchmark-ips"
 end
 
diff --git a/guides/bug_report_templates/generic_master.rb b/guides/bug_report_templates/generic_master.rb
index 240571ba9a..f7c9fedf02 100644
--- a/guides/bug_report_templates/generic_master.rb
+++ b/guides/bug_report_templates/generic_master.rb
@@ -15,7 +15,6 @@ gemfile(true) do
   git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
   gem "rails", github: "rails/rails"
-  gem "arel", github: "rails/arel"
 end
 
 require "active_support"
-- 
cgit v1.2.3