Merge branch 'andreaseger-fix_missing_require_of_active_support_json'

This commit is contained in:
Benjamin Fleischer
2016-04-04 13:52:16 -05:00
3 changed files with 2 additions and 1 deletions

View File

@@ -14,7 +14,6 @@ require 'rails'
require 'action_controller'
require 'action_controller/test_case'
require 'action_controller/railtie'
require 'active_support/json'
require 'active_model_serializers'
require 'fileutils'
FileUtils.mkdir_p(File.expand_path('../../tmp/cache', __FILE__))