Merge branch 'summernote' of github.com:noesya/osuny into summernote
No related branches found
No related tags found
Showing
- Gemfile 2 additions, 1 deletionGemfile
- Gemfile.lock 2 additions, 1 deletionGemfile.lock
- app/assets/javascripts/admin/commons/upload_file.js 0 additions, 14 deletionsapp/assets/javascripts/admin/commons/upload_file.js
- app/assets/javascripts/admin/plugins/summernote.js 3 additions, 9 deletionsapp/assets/javascripts/admin/plugins/summernote.js
- app/assets/javascripts/admin/plugins/summernote_attachment_upload.js 43 additions, 0 deletions...javascripts/admin/plugins/summernote_attachment_upload.js
... | @@ -46,7 +46,8 @@ gem 'jbuilder' | ... | @@ -46,7 +46,8 @@ gem 'jbuilder' |
gem 'kamifusen'#, path: '../kamifusen' | gem 'kamifusen'#, path: '../kamifusen' | ||
gem 'bootstrap' | gem 'bootstrap' | ||
gem 'sanitize' | gem 'sanitize' | ||
gem 'summernote-rails', git: 'https://github.com/noesya/summernote-rails.git' | gem 'summernote-rails', git: 'https://github.com/noesya/summernote-rails.git', branch: 'activestorage' | ||
# gem 'summernote-rails', path: '../summernote-rails' | |||
group :development, :test do | group :development, :test do | ||
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] | gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] | ||
... | ... |
Please register or sign in to comment