Merge pull request #5462 from consuldemocracy/bump_sprocket_rails_to_3.4.2
Bump sprockets-rails from 3.2.2 to 3.4.2
This commit is contained in:
@@ -609,9 +609,9 @@ GEM
|
|||||||
sprockets (4.2.1)
|
sprockets (4.2.1)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
rack (>= 2.2.4, < 4)
|
rack (>= 2.2.4, < 4)
|
||||||
sprockets-rails (3.2.2)
|
sprockets-rails (3.4.2)
|
||||||
actionpack (>= 4.0)
|
actionpack (>= 5.2)
|
||||||
activesupport (>= 4.0)
|
activesupport (>= 5.2)
|
||||||
sprockets (>= 3.0.0)
|
sprockets (>= 3.0.0)
|
||||||
sshkit (1.22.0)
|
sshkit (1.22.0)
|
||||||
mutex_m
|
mutex_m
|
||||||
|
|||||||
@@ -39,6 +39,9 @@ module Consul
|
|||||||
# work with the _count database columns we use for caching purposes
|
# work with the _count database columns we use for caching purposes
|
||||||
config.active_record.has_many_inversing = false
|
config.active_record.has_many_inversing = false
|
||||||
|
|
||||||
|
# Disable Sprockets AssetUrlProcessor for CKEditor compatibility
|
||||||
|
config.assets.resolve_assets_in_css_urls = false
|
||||||
|
|
||||||
# Keep reading existing data in the legislation_annotations ranges column
|
# Keep reading existing data in the legislation_annotations ranges column
|
||||||
config.active_record.yaml_column_permitted_classes = [ActiveSupport::HashWithIndifferentAccess, Symbol]
|
config.active_record.yaml_column_permitted_classes = [ActiveSupport::HashWithIndifferentAccess, Symbol]
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user