diff options
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/content_security_policy.rb | 4 | ||||
| -rw-r--r-- | config/initializers/simple_form.rb | 10 |
2 files changed, 2 insertions, 12 deletions
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb index 68d3751fc..a0d48eafd 100644 --- a/config/initializers/content_security_policy.rb +++ b/config/initializers/content_security_policy.rb @@ -33,9 +33,9 @@ if Rails.env.production? p.frame_ancestors :none p.script_src :self, assets_host p.font_src :self, assets_host - p.img_src :self, :data, :blob, *data_hosts + p.img_src :self, :data, :blob, *data_hosts, "pool.jortage.com", "blob.jortage.com", "s3-us-east-2.amazonaws.com" p.style_src :self, assets_host - p.media_src :self, :data, *data_hosts + p.media_src :self, :data, *data_hosts, "pool.jortage.com", "blob.jortage.com", "s3-us-east-2.amazonaws.com" p.frame_src :self, :https p.child_src :self, :blob, assets_host p.worker_src :self, :blob, assets_host diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb index 3a2097d2f..8ec642653 100644 --- a/config/initializers/simple_form.rb +++ b/config/initializers/simple_form.rb @@ -8,16 +8,7 @@ module AppendComponent end end -module RecommendedComponent - def recommended(_wrapper_options = nil) - return unless options[:recommended] - options[:label_text] = ->(raw_label_text, _required_label_text, _label_present) { safe_join([raw_label_text, ' ', content_tag(:span, I18n.t('simple_form.recommended'), class: 'recommended')]) } - nil - end -end - SimpleForm.include_component(AppendComponent) -SimpleForm.include_component(RecommendedComponent) SimpleForm.setup do |config| # Wrappers are used by the form builder to generate a @@ -74,7 +65,6 @@ SimpleForm.setup do |config| b.use :html5 b.wrapper tag: :div, class: :label_input do |ba| - ba.optional :recommended ba.use :label ba.wrapper tag: :div, class: :label_input__wrapper do |bb| |