Merge pull request #1379 from opf/fix/non-digest-assets

11 years ago · 2bd192ca9f
parent d6a0bf5b05 c57fd4886b
commit 2bd192ca9f
3 changed files with 8 additions and 0 deletions
--- a/1
+++ b/1
@ -107,6 +107,7 @@ end

 gem 'sprockets',        '2.2.2.backport2'
 gem 'sprockets-rails',  '2.0.0.backport1'
+gem 'non-stupid-digest-assets'
 gem 'sass-rails',        git: 'https://github.com/guilleiguaran/sass-rails.git', branch: 'backport'
 gem 'sass',             '~> 3.3.6'
 gem 'bourbon',          '~> 4.0'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -213,6 +213,7 @@ GEM
    mysql2 (0.3.11)
    net-ldap (0.2.2)
    nokogiri (1.5.11)
+    non-stupid-digest-assets (1.0.4)
    object-daddy (1.1.1)
    oj (2.1.6)
    omniauth (1.2.1)
@ -412,6 +413,7 @@ DEPENDENCIES
  mysql2 (~> 0.3.11)
  net-ldap (~> 0.2.2)
  nokogiri (>= 1.5.11)
+  non-stupid-digest-assets
  object-daddy (~> 1.1.0)
  oj
  omniauth
--- a/config/initializers/non_digest_assets.rb
+++ b/config/initializers/non_digest_assets.rb
@ -0,0 +1,5 @@
+NonStupidDigestAssets.whitelist = [
+  'styleguide.html',
+  /jquery-ui\/.*/,
+  /select2\/.*/,
+]