aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-06-06 13:17:58 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-06-06 13:17:58 -0300
commit228e3f01cb7cc5d0b51311c5c0185b878c4853cb (patch)
treed9e339e55b49d6558347ab4a2236510d08e071f3
parent10d0c43c7937f65b2fc6fb87a87b1023bbd85674 (diff)
parentb07483490fe84b3be9f9681df3439adf7311f831 (diff)
downloadrails-228e3f01cb7cc5d0b51311c5c0185b878c4853cb.tar.gz
rails-228e3f01cb7cc5d0b51311c5c0185b878c4853cb.tar.bz2
rails-228e3f01cb7cc5d0b51311c5c0185b878c4853cb.zip
Merge pull request #20456 from akihiro17/fix-bug-report
Show an error message if bundler 1.10.x is not installed when reporting bugs
-rw-r--r--guides/bug_report_templates/action_controller_gem.rb7
-rw-r--r--guides/bug_report_templates/action_controller_master.rb7
-rw-r--r--guides/bug_report_templates/active_record_gem.rb7
-rw-r--r--guides/bug_report_templates/active_record_master.rb7
-rw-r--r--guides/bug_report_templates/generic_gem.rb7
-rw-r--r--guides/bug_report_templates/generic_master.rb7
6 files changed, 36 insertions, 6 deletions
diff --git a/guides/bug_report_templates/action_controller_gem.rb b/guides/bug_report_templates/action_controller_gem.rb
index 5b12749051..11561c55f9 100644
--- a/guides/bug_report_templates/action_controller_gem.rb
+++ b/guides/bug_report_templates/action_controller_gem.rb
@@ -1,4 +1,9 @@
-require 'bundler/inline'
+begin
+ require 'bundler/inline'
+rescue LoadError => e
+ $stderr.puts 'Bundler version 1.10 or later is required. Please update your Bundler'
+ raise e
+end
gemfile(true) do
source 'https://rubygems.org'
diff --git a/guides/bug_report_templates/action_controller_master.rb b/guides/bug_report_templates/action_controller_master.rb
index 9bdd7d28e4..66887398b9 100644
--- a/guides/bug_report_templates/action_controller_master.rb
+++ b/guides/bug_report_templates/action_controller_master.rb
@@ -1,4 +1,9 @@
-require 'bundler/inline'
+begin
+ require 'bundler/inline'
+rescue LoadError => e
+ $stderr.puts 'Bundler version 1.10 or later is required. Please update your Bundler'
+ raise e
+end
gemfile(true) do
source 'https://rubygems.org'
diff --git a/guides/bug_report_templates/active_record_gem.rb b/guides/bug_report_templates/active_record_gem.rb
index 5b27f76244..09d6e7b331 100644
--- a/guides/bug_report_templates/active_record_gem.rb
+++ b/guides/bug_report_templates/active_record_gem.rb
@@ -1,4 +1,9 @@
-require 'bundler/inline'
+begin
+ require 'bundler/inline'
+rescue LoadError => e
+ $stderr.puts 'Bundler version 1.10 or later is required. Please update your Bundler'
+ raise e
+end
gemfile(true) do
source 'https://rubygems.org'
diff --git a/guides/bug_report_templates/active_record_master.rb b/guides/bug_report_templates/active_record_master.rb
index c69b041ba8..270dbe7df7 100644
--- a/guides/bug_report_templates/active_record_master.rb
+++ b/guides/bug_report_templates/active_record_master.rb
@@ -1,4 +1,9 @@
-require 'bundler/inline'
+begin
+ require 'bundler/inline'
+rescue LoadError => e
+ $stderr.puts 'Bundler version 1.10 or later is required. Please update your Bundler'
+ raise e
+end
gemfile(true) do
source 'https://rubygems.org'
diff --git a/guides/bug_report_templates/generic_gem.rb b/guides/bug_report_templates/generic_gem.rb
index 0a4d15065b..a4fe51156d 100644
--- a/guides/bug_report_templates/generic_gem.rb
+++ b/guides/bug_report_templates/generic_gem.rb
@@ -1,4 +1,9 @@
-require 'bundler/inline'
+begin
+ require 'bundler/inline'
+rescue LoadError => e
+ $stderr.puts 'Bundler version 1.10 or later is required. Please update your Bundler'
+ raise e
+end
gemfile(true) do
source 'https://rubygems.org'
diff --git a/guides/bug_report_templates/generic_master.rb b/guides/bug_report_templates/generic_master.rb
index 4ed34e15a2..b6b4562751 100644
--- a/guides/bug_report_templates/generic_master.rb
+++ b/guides/bug_report_templates/generic_master.rb
@@ -1,4 +1,9 @@
-require 'bundler/inline'
+begin
+ require 'bundler/inline'
+rescue LoadError => e
+ $stderr.puts 'Bundler version 1.10 or later is required. Please update your Bundler'
+ raise e
+end
gemfile(true) do
source 'https://rubygems.org'