Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap-sass.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGleb Mazovetskiy <glex.spb@gmail.com>2013-12-09 01:24:56 +0400
committerGleb Mazovetskiy <glex.spb@gmail.com>2013-12-09 01:24:56 +0400
commit3185802fa1d348297b2dd93ed41c477717850b0e (patch)
treed9d479179db1c2baada0298f9533d7c30c44459b
parent6952447dba7fa0dd47c0984f87f3e648fda69bb2 (diff)
sass head compat
-rw-r--r--test/compilation_test.rb2
-rw-r--r--test/dummy/config/application.rb4
-rw-r--r--test/gemfiles/sass_head.gemfile1
3 files changed, 3 insertions, 4 deletions
diff --git a/test/compilation_test.rb b/test/compilation_test.rb
index afa23e72..f073eed2 100644
--- a/test/compilation_test.rb
+++ b/test/compilation_test.rb
@@ -14,4 +14,4 @@ class CompilationTest < Test::Unit::TestCase
end
end
end
-end \ No newline at end of file
+end
diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb
index 9c48763d..966cb2ff 100644
--- a/test/dummy/config/application.rb
+++ b/test/dummy/config/application.rb
@@ -1,9 +1,9 @@
require File.expand_path('../boot', __FILE__)
-require 'action_controller/railtie'
-require 'sprockets/railtie'
+require 'rails'
Bundler.require(*Rails.groups)
+
require 'sass-rails'
require 'jquery-rails'
require 'slim-rails'
diff --git a/test/gemfiles/sass_head.gemfile b/test/gemfiles/sass_head.gemfile
index 1c9e9716..b7b26208 100644
--- a/test/gemfiles/sass_head.gemfile
+++ b/test/gemfiles/sass_head.gemfile
@@ -3,7 +3,6 @@ source "https://rubygems.org"
gem 'sass', '~> 3.3.0.rc.2'
gem 'compass', '~> 1.0.0.alpha.15'
-
platform :rbx do
gem 'rubysl', '~> 2.0'
gem 'rubysl-test-unit', '~> 2.0'