Skip to content

Commit

Permalink
Use rails 8 compatible active_record_union
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhughes committed Dec 20, 2024
1 parent f91306a commit bb65514
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ gem "file_exists"
# Load rails plugins
gem "actionpack-page_caching", ">= 1.2.0"
gem "activerecord-import"
gem "active_record_union"
gem "active_record_union", :github => "brianhempel/active_record_union", :ref => "master"
gem "bootstrap", "~> 5.3.2"
gem "bootstrap_form", "~> 5.0"
gem "cancancan"
Expand Down
12 changes: 9 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
GIT
remote: https://github.com/brianhempel/active_record_union.git
revision: 8ebe558709aabe039abd24e3e7dd4d4354a6de88
ref: master
specs:
active_record_union (1.3.0)
activerecord (>= 6.0)

GIT
remote: https://github.com/kolide/canonical-rails.git
revision: 09b093de055fb4bbf2f33525a01896377a4b1adf
Expand Down Expand Up @@ -56,8 +64,6 @@ GEM
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
active_record_union (1.3.0)
activerecord (>= 4.0)
activejob (8.0.1)
activesupport (= 8.0.1)
globalid (>= 0.3.6)
Expand Down Expand Up @@ -670,7 +676,7 @@ PLATFORMS
DEPENDENCIES
aasm
actionpack-page_caching (>= 1.2.0)
active_record_union
active_record_union!
activerecord-import
addressable (~> 2.8)
annotate
Expand Down

0 comments on commit bb65514

Please sign in to comment.