Skip to content

Commit 68bf06c

Browse files
committed
[#174917481] failure loading image from URL in sass
As per this thread ( rails/sprockets#581 ), Try disabling concurrent asset processing. Also updated sass for good measure. [#174917481]
1 parent dafa553 commit 68bf06c

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

rails/Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ gem 'rollbar'
8585
gem 'rubyzip', '~> 1.2.2'
8686
gem 'rush', git: 'https://github.com/concord-consortium/rush.git'
8787
gem 'sanitize'
88-
gem 'sass', '~> 3.4.0'
88+
gem 'sass', '~> 3.7.4'
8989
gem 'sass-rails' # if running rails 3.1 or greater
9090
# gem 'strong_parameters' # RAILS-4-SPIKE GEMFILE REMOVE as part of rails 4.0 upgrade
9191
gem 'sunspot_rails'

rails/Gemfile.lock

+9-5
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,7 @@ GEM
765765
execjs
766766
coffee-script-source (1.12.2)
767767
columnize (0.9.0)
768-
concurrent-ruby (1.1.7)
768+
concurrent-ruby (1.1.8)
769769
connection_pool (2.2.2)
770770
crack (0.4.3)
771771
safe_yaml (~> 1.0.0)
@@ -838,8 +838,8 @@ GEM
838838
activesupport (>= 3.0.0)
839839
faraday (0.12.1)
840840
multipart-post (>= 1.2, < 3)
841-
ffi (1.13.1)
842-
ffi (1.13.1-x86-mingw32)
841+
ffi (1.14.2)
842+
ffi (1.14.2-x86-mingw32)
843843
font-awesome-rails (4.7.0.1)
844844
railties (>= 3.2, < 5.1)
845845
formatador (0.2.5)
@@ -1102,7 +1102,11 @@ GEM
11021102
crass (~> 1.0.2)
11031103
nokogiri (>= 1.4.4)
11041104
nokogumbo (= 1.4.1)
1105-
sass (3.4.25)
1105+
sass (3.7.4)
1106+
sass-listen (~> 4.0.0)
1107+
sass-listen (4.0.0)
1108+
rb-fsevent (~> 0.9, >= 0.9.4)
1109+
rb-inotify (~> 0.9, >= 0.9.7)
11061110
sass-rails (6.0.0)
11071111
sassc-rails (~> 2.1, >= 2.1.1)
11081112
sassc (2.4.0)
@@ -1313,7 +1317,7 @@ DEPENDENCIES
13131317
rubyzip (~> 1.2.2)
13141318
rush!
13151319
sanitize
1316-
sass (~> 3.4.0)
1320+
sass (~> 3.7.4)
13171321
sass-rails
13181322
selenium-webdriver
13191323
sextant

rails/config/application.rb

+1
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ class Application < Rails::Application
148148
config.middleware.insert_before 0, "Rack::ResponseLogger"
149149

150150
config.assets.enabled = true
151+
config.assets.export_concurrent = false
151152
config.assets.precompile += %w(
152153
print.css
153154
full_status.js

0 commit comments

Comments
 (0)