From 20ec1e922cc141364881b17e2509c4d7dccca695 Mon Sep 17 00:00:00 2001 From: Jeremy Daer Date: Sun, 27 Sep 2015 17:34:13 -0400 Subject: Eliminate overlapping `app/assets` load path * Move `app/assets/manifest.js` to `app/assets/config/manifest.js`. Avoid the suggestion that you can/should deep-link `stylesheets/foo`. * Pull in all toplevel stylesheets and JavaScripts, not just `application.js` and `.css`. Demonstrate how to use `link_directory` with a specified `.js`/`.css` type. * Fix RAILS_ENV handling in assets tests. * Shush warnings spam from third-party libs that distract from tests. --- Gemfile.lock | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 563a9f56be..9aa1e05d77 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,10 +73,10 @@ GIT GIT remote: git://github.com/rails/sprockets-rails.git - revision: 600f981fe79ff2d4179baf84bd18fac5acb58b5e + revision: 77098c5acd9f27613875097ce6587aff9d871d7f branch: master specs: - sprockets-rails (3.0.0.beta2) + sprockets-rails (3.0.0.beta3) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -97,6 +97,12 @@ GIT turbolinks (3.0.0) coffee-rails +GIT + remote: git://github.com/ruby-concurrency/concurrent-ruby.git + revision: d15c5d624612c07dc6d2bf4af27b5c00eb6ae12b + specs: + concurrent-ruby (1.0.0.pre2) + PATH remote: . specs: @@ -179,7 +185,6 @@ GEM coffee-script-source execjs coffee-script-source (1.9.1.1) - concurrent-ruby (1.0.0.pre2) connection_pool (2.2.0) dalli (2.7.4) dante (0.2.0) @@ -309,6 +314,7 @@ DEPENDENCIES benchmark-ips byebug coffee-rails (~> 4.1.0) + concurrent-ruby (~> 1.0.0.pre2)! dalli (>= 2.2.1) delayed_job delayed_job_active_record @@ -342,8 +348,8 @@ DEPENDENCIES sequel sidekiq sneakers - sprockets! - sprockets-rails! + sprockets (~> 4.0)! + sprockets-rails (~> 3.0.0.beta3)! sqlite3 (~> 1.3.6) stackprof sucker_punch -- cgit v1.2.3