From 5f5827ba82dda7d47c7e436fe094348deb5b87fc Mon Sep 17 00:00:00 2001 From: Justin Searls Date: Mon, 23 Dec 2013 14:15:58 -0500 Subject: [PATCH] rails-jasmine fixes this concern with 0.0.3 --- README.md | 4 ---- app/assets/javascripts/application.js | 1 + app/assets/stylesheets/application.css | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 69a2bc1..15d1d67 100644 --- a/README.md +++ b/README.md @@ -31,10 +31,6 @@ config.rails_lineman.lineman_project_location = "my-lineman-app" Alternatively, rails-lineman will look for an environment variable named `LINEMAN_PROJECT_LOCATION`. -Note that to prevent your Lineman JavaScript & CSS from being loaded twice in production, you'll need -to remove the `require_tree .` directives from `app/assets/javascripts/application.js` -and `app/assets/stylesheets/application.css`. - ### the Lineman side Just add the [lineman-rails](https://github.com/testdouble/lineman-rails) plugin to your project: diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 1e9af49..d6925fa 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,3 +13,4 @@ //= require jquery //= require jquery_ujs //= require turbolinks +//= require_tree . diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 3398fd7..3192ec8 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -9,4 +9,5 @@ * compiled file, but it's generally better to create a new file per style scope. * *= require_self + *= require_tree . */