FOCUS-5621: assets now server correctly

* jruby-rack 1.1.14 was the problem * pinned us to jruby-rack 1.1.13.3
lucidworks · Jul 12, 2014 · dc98f98 · dc98f98
1 parent 98d9a25
commit dc98f98
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 1 deletion.
diff --git a/Gemfile b/Gemfile
@@ -12,6 +12,7 @@ platforms :jruby do
   gem 'activerecord-jdbcsqlite3-adapter'
 #  gem 'jruby-openssl', no longer needed since JRuby 1.7.x
 
+  gem "jruby-rack", "1.1.13.3", :require => false # 1.1.14 causes assets to fail in production with content length errors
   # something fishy with rubyzip, see the following:
   #   - http://stackoverflow.com/questions/18736166/warbler-no-such-file-to-load-zip-zip
   #   - https://github.com/jruby/warbler/issues/180  

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -77,7 +77,7 @@ GEM
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     jruby-jars (1.7.13)
-    jruby-rack (1.1.14)
+    jruby-rack (1.1.13.3)
     json (1.8.1)
     json (1.8.1-java)
     kaminari (0.14.1)
@@ -170,6 +170,7 @@ DEPENDENCIES
   font-awesome-sass-rails (~> 3.0.2.2)
   httparty (= 0.13.1)
   jquery-rails
+  jruby-rack (= 1.1.13.3)
   rails (= 3.2.19)
   rubyzip (= 0.9.9)
   sass-rails (~> 3.2.3)

diff --git a/vendor/cache/jruby-rack-1.1.13.3.gem b/vendor/cache/jruby-rack-1.1.13.3.gem
diff --git a/vendor/cache/jruby-rack-1.1.14.gem b/vendor/cache/jruby-rack-1.1.14.gem