File tree 3 files changed +11
-6
lines changed
3 files changed +11
-6
lines changed Original file line number Diff line number Diff line change @@ -85,7 +85,7 @@ gem 'rollbar'
85
85
gem 'rubyzip' , '~> 1.2.2'
86
86
gem 'rush' , git : 'https://github.com/concord-consortium/rush.git'
87
87
gem 'sanitize'
88
- gem 'sass' , '~> 3.4.0 '
88
+ gem 'sass' , '~> 3.7.4 '
89
89
gem 'sass-rails' # if running rails 3.1 or greater
90
90
# gem 'strong_parameters' # RAILS-4-SPIKE GEMFILE REMOVE as part of rails 4.0 upgrade
91
91
gem 'sunspot_rails'
Original file line number Diff line number Diff line change 765
765
execjs
766
766
coffee-script-source (1.12.2 )
767
767
columnize (0.9.0 )
768
- concurrent-ruby (1.1.7 )
768
+ concurrent-ruby (1.1.8 )
769
769
connection_pool (2.2.2 )
770
770
crack (0.4.3 )
771
771
safe_yaml (~> 1.0.0 )
838
838
activesupport (>= 3.0.0 )
839
839
faraday (0.12.1 )
840
840
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 )
843
843
font-awesome-rails (4.7.0.1 )
844
844
railties (>= 3.2 , < 5.1 )
845
845
formatador (0.2.5 )
@@ -1102,7 +1102,11 @@ GEM
1102
1102
crass (~> 1.0.2 )
1103
1103
nokogiri (>= 1.4.4 )
1104
1104
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 )
1106
1110
sass-rails (6.0.0 )
1107
1111
sassc-rails (~> 2.1 , >= 2.1.1 )
1108
1112
sassc (2.4.0 )
@@ -1313,7 +1317,7 @@ DEPENDENCIES
1313
1317
rubyzip (~> 1.2.2 )
1314
1318
rush !
1315
1319
sanitize
1316
- sass (~> 3.4.0 )
1320
+ sass (~> 3.7.4 )
1317
1321
sass-rails
1318
1322
selenium-webdriver
1319
1323
sextant
Original file line number Diff line number Diff line change @@ -148,6 +148,7 @@ class Application < Rails::Application
148
148
config . middleware . insert_before 0 , "Rack::ResponseLogger"
149
149
150
150
config . assets . enabled = true
151
+ config . assets . export_concurrent = false
151
152
config . assets . precompile += %w(
152
153
print.css
153
154
full_status.js
You can’t perform that action at this time.
0 commit comments