Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@
# Note that changes in the inspected code, or installation of new
# versions of RuboCop, may require this file to be generated again.

<<<<<<< HEAD
=======
# Offense count: 35
# Configuration parameters: EnforcedStyle, AllowedGems.
# SupportedStyles: required, forbidden
Bundler/GemVersion:
Exclude:
- 'Gemfile'

>>>>>>> 58b372a (Rubocop: fix EmptyLineAfterMagicComment lints (#1416))
# Offense count: 3
Capybara/RSpec/NegationMatcherAfterVisit:
Exclude:
Expand Down
10 changes: 10 additions & 0 deletions config/initializers/application_controller_renderer.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# frozen_string_literal: true

# Be sure to restart your server when you modify this file.

# ActiveSupport::Reloader.to_prepare do
# ApplicationController.renderer.defaults.merge!(
# http_host: 'example.org',
# https: false
# )
# end
6 changes: 6 additions & 0 deletions config/initializers/mime_types.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# frozen_string_literal: true

# Be sure to restart your server when you modify this file.

# Add new mime types for use in respond_to blocks:
# Mime::Type.register "text/richtext", :rtf
3 changes: 3 additions & 0 deletions config/initializers/permissions_policy.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
# frozen_string_literal: true

<<<<<<< HEAD
# Be sure to restart your server when you modify this file.

=======
>>>>>>> 58b372a (Rubocop: fix EmptyLineAfterMagicComment lints (#1416))
# Define an application-wide HTTP permissions policy. For further
# information see: https://developers.google.com/web/updates/2018/06/feature-policy

Expand Down
Loading