From 77e76d06c9290aa82736d4880b2048b835511fcc Mon Sep 17 00:00:00 2001 From: Glandos Date: Mon, 12 May 2014 13:53:58 +0200 Subject: [PATCH 1/2] Fix require usage for active_support As described in rails/rails#14664 use require 'active_support' before core_ext --- lib/docs.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/docs.rb b/lib/docs.rb index 825d5c5a..b31dcf7e 100644 --- a/lib/docs.rb +++ b/lib/docs.rb @@ -1,6 +1,7 @@ require 'bundler/setup' Bundler.require :docs +require 'active_support' require 'active_support/core_ext' I18n.enforce_available_locales = true From 9d1c347550eed515920ae65a4b12b1a912eb6329 Mon Sep 17 00:00:00 2001 From: Glandos Date: Mon, 12 May 2014 14:17:55 +0200 Subject: [PATCH 2/2] Fix require usage for active_support in test --- test/test_helper.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/test_helper.rb b/test/test_helper.rb index e77647bf..ed944e79 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -7,6 +7,7 @@ $LOAD_PATH.unshift 'lib' require 'minitest/autorun' require 'minitest/pride' +require 'active_support' require 'active_support/core_ext' require 'active_support/testing/assertions' require 'rr'