From 912d9bde46a74eba81c6b9ae253ab17403352541 Mon Sep 17 00:00:00 2001
From: Myron Marston <myron.marston@gmail.com>
Date: Tue, 15 Oct 2013 23:18:24 -0700
Subject: [PATCH 1/4] Prep for 2.14.7 development.

[ci skip]
---
 Changelog.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 97c60b41f9..5f6e418d2d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+### 2.14.7 Development
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.14.6...v2.14.7)
+
 ### 2.14.6 / 2013-10-15
 [full changelog](http://github.com/rspec/rspec-core/compare/v2.14.5...v2.14.6)
 

From 9812d8f3381db142886002e8e256f87d887dc76f Mon Sep 17 00:00:00 2001
From: Jon Rowe <hello@jonrowe.co.uk>
Date: Wed, 23 Oct 2013 21:23:44 -0700
Subject: [PATCH 2/4] Merge pull request #1124 from
 rspec/allow_suppression_of_local_repos

Allow suppression of local repos
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 485a88899c..f791a43724 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ gemspec
 
 %w[rspec rspec-expectations rspec-mocks].each do |lib|
   library_path = File.expand_path("../../#{lib}", __FILE__)
-  if File.exist?(library_path)
+  if File.exist?(library_path) && !ENV['USE_GIT_REPOS']
     gem lib, :path => library_path
   else
     gem lib, :git => "git://github.com/rspec/#{lib}.git", :branch => '2-14-maintenance'

From e2bae1c031dd011cfbbc253321e0b2c5830060d9 Mon Sep 17 00:00:00 2001
From: Myron Marston <myron.marston@gmail.com>
Date: Mon, 28 Oct 2013 23:03:59 -0700
Subject: [PATCH 3/4] Fixe a regression in 2.14.6 w/ Fivemat formatter.

In https://github.com/tpope/fivemat/blob/v1.2.1/lib/fivemat/rspec.rb#L43-L49,
Fivemat has two ways to check for pending example fixed:
 - example.execution_result[:exception].pending_fixed?
   (but we removed this in #1106 because it broke when dealing with frozen exceptions)
 - RSpec::Core::PendingExampleFixedError === exception
   (but this const was renamed in b5d10ccbe3a590adc67d807acb565be3657e51bf).

The `RSpec::Core::PendingExampleFixedError` line in Fivemat was
never hit in recent releases because `example.execution_result[:exception]`
responded to `pending_fixed?` -- until 2.14.6.
---
 Changelog.md              | 11 +++++++++++
 lib/rspec/core/pending.rb |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 5f6e418d2d..4c4147d8fb 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,17 @@
 ### 2.14.7 Development
 [full changelog](http://github.com/rspec/rspec-core/compare/v2.14.6...v2.14.7)
 
+Bug fixes:
+
+* Fix regression in 2.14.6 that broke the Fivemat formatter.
+  It depended upon either
+  `example.execution_result[:exception].pending_fixed?` (which
+  was removed in 2.14.6 to fix an issue with frozen error objects)
+  or `RSpec::Core::PendingExampleFixedError` (which was renamed
+  to `RSpec::Core::Pending::PendingExampleFixedError` in 2.8.
+  This fix makes a constant alias for the old error name.
+  (Myron Marston)
+
 ### 2.14.6 / 2013-10-15
 [full changelog](http://github.com/rspec/rspec-core/compare/v2.14.5...v2.14.6)
 
diff --git a/lib/rspec/core/pending.rb b/lib/rspec/core/pending.rb
index 4b970105ba..82aefe0c62 100644
--- a/lib/rspec/core/pending.rb
+++ b/lib/rspec/core/pending.rb
@@ -105,5 +105,9 @@ def pending(*args)
         raise PendingDeclaredInExample.new(message)
       end
     end
+
+    # Alias the error for compatibility with extension gems (e.g. formatters)
+    # that depend on the const name of the error in RSpec <= 2.8.
+    PendingExampleFixedError = Pending::PendingExampleFixedError
   end
 end

From 4f556553fc336bd3e1bb8724fcb6b69e303657d0 Mon Sep 17 00:00:00 2001
From: Myron Marston <myron.marston@gmail.com>
Date: Tue, 29 Oct 2013 23:27:25 -0700
Subject: [PATCH 4/4] 2.14.7 release.

---
 Changelog.md              | 2 +-
 lib/rspec/core/version.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 4c4147d8fb..62f2c6f91d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,4 +1,4 @@
-### 2.14.7 Development
+### 2.14.7 / 2013-10-29
 [full changelog](http://github.com/rspec/rspec-core/compare/v2.14.6...v2.14.7)
 
 Bug fixes:
diff --git a/lib/rspec/core/version.rb b/lib/rspec/core/version.rb
index 9b0676e3d4..ce0e3313fb 100644
--- a/lib/rspec/core/version.rb
+++ b/lib/rspec/core/version.rb
@@ -1,7 +1,7 @@
 module RSpec
   module Core
     module Version
-      STRING = '2.14.6'
+      STRING = '2.14.7'
     end
   end
 end