Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #1222 from arunagw/sprockets-fixes

We don't need to load version any more as Sprockets.beta8 is included.
  • Loading branch information...
commit 750194340c730b7d64e77f8402d546ed03111e09 2 parents 7b9f3eb + 531095e
@josevalim josevalim authored
View
1  actionpack/test/abstract_unit.rb
@@ -1,5 +1,4 @@
require File.expand_path('../../../load_paths', __FILE__)
-require File.expand_path('../../../version', __FILE__)
lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
View
7 actionpack/test/template/sprockets_helper_test.rb
@@ -1,11 +1,4 @@
require 'abstract_unit'
-
-module Rails
- class Engine
- def self.initializer(*args); end
- end
-end
-
require 'sprockets'
require 'mocha'
Please sign in to comment.
Something went wrong with that request. Please try again.