Skip to content

Commit

Permalink
Merge pull request #1381 from Eric-Guo/bump_shakapacker
Browse files Browse the repository at this point in the history
Bump shakapacker to v7, but still keep it compatible
  • Loading branch information
qichunren authored Jul 6, 2023
2 parents 0eb977e + c629be2 commit 9b1015b
Show file tree
Hide file tree
Showing 22 changed files with 1,756 additions and 1,781 deletions.
2 changes: 1 addition & 1 deletion .standard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ ignore:
- test/fixture/**/*
- lib/templates/**/*
- plugins/**/*

- test/lib/markdown_test.rb
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ gem "shakapacker"
gem "turbolinks"
gem "uglifier"

gem "view_component"
gem "view_component", "~> 2.82"

gem "pg"

Expand All @@ -36,7 +36,7 @@ gem "rails-i18n"
gem "twemoji"

# Uploader
gem "carrierwave"
gem "carrierwave", "~> 2.2"
# Aliyun / Upyun / Qiniu
gem "carrierwave-aliyun"
gem "carrierwave-qiniu"
Expand Down Expand Up @@ -78,7 +78,7 @@ gem "html-pipeline-auto-correct"
gem "redcarpet"
gem "rouge"

gem "sidekiq"
gem "sidekiq", "~> 6.5.9"
gem "sidekiq-cron"

gem "social-share-button"
Expand Down
Loading

0 comments on commit 9b1015b

Please sign in to comment.