Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

12_generate_custom_csv_file #58

Open
philipp wants to merge 59 commits from 12_generate_custom_csv_file into develop
pull from: 12_generate_custom_csv_file
merge into: Foodsoft:develop
Conversation 0 Commits 59 Files changed 426 +3 -2
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 1e63c59a8a - Show all commits

2
app/javascript/application.js
View file

@ -1,4 +1,4 @@
// Configure your import map in config/importmap.rb. Read more: https://github.com/rails/importmap-rails // Configure your import map in config/importmap.rb. Read more: https://github.com/rails/importmap-rails
import "trix" import "trix"
import "@rails/actiontext" import "@rails/actiontext"
import "./trix-editor-overrides" import "trix-editor-overrides"

1
config/importmap.rb
View file

@ -2,3 +2,4 @@
pin "application", preload: true pin "application", preload: true
pin "trix" pin "trix"
pin "@rails/actiontext", to: "actiontext.js" pin "@rails/actiontext", to: "actiontext.js"
pin "trix-editor-overrides"

2
config/initializers/assets.rb
View file

@ -9,4 +9,4 @@ Rails.application.config.assets.version = '1.0'
# Precompile additional assets. # Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in the app/assets # application.js, application.css, and all non-JS/CSS in the app/assets
# folder are already added. # folder are already added.
Rails.application.config.assets.precompile += %w[application_legacy.js jquery.min.js] Rails.application.config.assets.precompile += %w[application_legacy.js jquery.min.js trix-editor-overrides.js]