From 441f44c4462e6d3b67aa5632a3b0a35195495fd0 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Thu, 7 Feb 2013 13:52:35 +0900
Subject: [PATCH] Journey and Rails 4 are going Separate Ways

Journey was merged into Rails: https://github.com/rails/rails/commit/56fee39

Also, activerecord-deprecated_finders is not necessarily explicitly bundled here
because it would be bundled through rails' dependency for now, and we're not using it in Haml's tests anyway
---
 test/gemfiles/Gemfile.rails-master | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/test/gemfiles/Gemfile.rails-master b/test/gemfiles/Gemfile.rails-master
index 44879e67..5767eff4 100644
--- a/test/gemfiles/Gemfile.rails-master
+++ b/test/gemfiles/Gemfile.rails-master
@@ -1,7 +1,4 @@
 source :rubygems
 
 gem 'rails', git: 'git://github.com/rails/rails.git'
-gem 'journey', git: 'git://github.com/rails/journey.git'
-gem 'activerecord-deprecated_finders', git: 'git://github.com/rails/activerecord-deprecated_finders.git'
-gemspec :path => "../.."
-
+gemspec :path => '../..'