Skip to content

Commit

Permalink
Upgrade: Bump activeadmin from 2.14.0 to 3.0.0 (#3992)
Browse files Browse the repository at this point in the history
Bumps [activeadmin](https://github.com/activeadmin/activeadmin) from
2.14.0 to 3.0.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/activeadmin/activeadmin/releases">activeadmin's
releases</a>.</em></p>
<blockquote>
<h2>3.0.0</h2>
<h3>Breaking Changes</h3>
<ul>
<li>Remove custom Ransack predicates that were MetaSearch backports. <a
href="https://redirect.github.com/activeadmin/activeadmin/issues/8010">#8010</a>
by [<a
href="https://github.com/javierjulio"><code>@​javierjulio</code></a>]</li>
<li>Require Ransack v4. <a
href="https://redirect.github.com/activeadmin/activeadmin/issues/8009">#8009</a>
by [<a
href="https://github.com/javierjulio"><code>@​javierjulio</code></a>]</li>
</ul>
<h3>Enhancements</h3>
<ul>
<li>Use display name fallback if blank display name result. <a
href="https://redirect.github.com/activeadmin/activeadmin/issues/6342">#6342</a>
by [<a
href="https://github.com/javierjulio"><code>@​javierjulio</code></a>]</li>
</ul>
<h3>Translation Improvements</h3>
<ul>
<li>Improve Swedish translations. <a
href="https://redirect.github.com/activeadmin/activeadmin/issues/7993">#7993</a>
by [<a
href="https://github.com/carlottostromstedt"><code>@​carlottostromstedt</code></a>]</li>
</ul>
<p><a
href="https://redirect.github.com/activeadmin/activeadmin/issues/1926">#1926</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/1926">activeadmin/activeadmin#1926</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/1979">#1979</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/1979">activeadmin/activeadmin#1979</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/2001">#2001</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/2001">activeadmin/activeadmin#2001</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/2040">#2040</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/2040">activeadmin/activeadmin#2040</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/2326">#2326</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/2326">activeadmin/activeadmin#2326</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/2523">#2523</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/2523">activeadmin/activeadmin#2523</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/2532">#2532</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/2532">activeadmin/activeadmin#2532</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/2541">#2541</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/2541">activeadmin/activeadmin#2541</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/2544">#2544</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/2544">activeadmin/activeadmin#2544</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/2545">#2545</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/2545">activeadmin/activeadmin#2545</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3038">#3038</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3038">activeadmin/activeadmin#3038</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3075">#3075</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3075">activeadmin/activeadmin#3075</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3463">#3463</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3463">activeadmin/activeadmin#3463</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3464">#3464</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3464">activeadmin/activeadmin#3464</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3486">#3486</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3486">activeadmin/activeadmin#3486</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3519">#3519</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3519">activeadmin/activeadmin#3519</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3535">#3535</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3535">activeadmin/activeadmin#3535</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3553">#3553</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3553">activeadmin/activeadmin#3553</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3606">#3606</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3606">activeadmin/activeadmin#3606</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3686">#3686</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3686">activeadmin/activeadmin#3686</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3695">#3695</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3695">activeadmin/activeadmin#3695</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3731">#3731</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3731">activeadmin/activeadmin#3731</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3783">#3783</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3783">activeadmin/activeadmin#3783</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3894">#3894</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3894">activeadmin/activeadmin#3894</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/4118">#4118</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/4118">activeadmin/activeadmin#4118</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/4173">#4173</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/4173">activeadmin/activeadmin#4173</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/4187">#4187</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/4187">activeadmin/activeadmin#4187</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/4254">#4254</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/4254">activeadmin/activeadmin#4254</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/5043">#5043</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/5043">activeadmin/activeadmin#5043</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/5198">#5198</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/5198">activeadmin/activeadmin#5198</a>
[21b6138f]: <a
href="https://redirect.github.com/activeadmin/activeadmin/pull/5740/commits/21b6138fdcf58cd54c3f1d3f60cb1127b174b40f">activeadmin/activeadmin#5740</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3091">#3091</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/pull/3091">activeadmin/activeadmin#3091</a>
<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/3435">#3435</a>:
<a
href="https://redirect.github.com/activeadmin/activeadmin/pull/3435">activeadmin/activeadmin#3435</a></p>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/activeadmin/activeadmin/blob/master/CHANGELOG.md">activeadmin's
changelog</a>.</em></p>
<blockquote>
<h2>3.0.0 <a
href="https://github.com/activeadmin/activeadmin/compare/v2.14.0..v3.0.0">☰</a></h2>
<h3>Breaking Changes</h3>
<ul>
<li>Remove custom Ransack predicates that were MetaSearch backports. <a
href="https://redirect.github.com/activeadmin/activeadmin/issues/8010">#8010</a>
by [<a
href="https://github.com/javierjulio"><code>@​javierjulio</code></a>]</li>
<li>Require Ransack v4. <a
href="https://redirect.github.com/activeadmin/activeadmin/issues/8009">#8009</a>
by [<a
href="https://github.com/javierjulio"><code>@​javierjulio</code></a>]</li>
</ul>
<h3>Enhancements</h3>
<ul>
<li>Use display name fallback if blank display name result. <a
href="https://redirect.github.com/activeadmin/activeadmin/issues/6342">#6342</a>
by [<a
href="https://github.com/javierjulio"><code>@​javierjulio</code></a>]</li>
</ul>
<h3>Translation Improvements</h3>
<ul>
<li>Improve Swedish translations. <a
href="https://redirect.github.com/activeadmin/activeadmin/issues/7993">#7993</a>
by [<a
href="https://github.com/carlottostromstedt"><code>@​carlottostromstedt</code></a>]</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/activeadmin/activeadmin/commit/d5ca7b3ec525e811d5b08d102a9ac1b1b0166795"><code>d5ca7b3</code></a>
Get ready for 3.0.0 release (<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/8017">#8017</a>)</li>
<li><a
href="https://github.com/activeadmin/activeadmin/commit/d76b316b75f2ea68d504290619f01f8520a8112a"><code>d76b316</code></a>
Fix error due to git cherry-pick commit</li>
<li><a
href="https://github.com/activeadmin/activeadmin/commit/f72800b93e16d5978bcad52682e6e18b5ce807ed"><code>f72800b</code></a>
Cucumber: remove see layout test</li>
<li><a
href="https://github.com/activeadmin/activeadmin/commit/93e21aaed57ff178035b0cce029ca8d8d629596e"><code>93e21aa</code></a>
Remove long deprecated/removed methods</li>
<li><a
href="https://github.com/activeadmin/activeadmin/commit/001ff4c9fe9dfc848cd04b0a72173f9f28249483"><code>001ff4c</code></a>
Fix bug report template with Ransack allowlist</li>
<li><a
href="https://github.com/activeadmin/activeadmin/commit/88699eb0b25b23cc0ece394331ab040260a211ea"><code>88699eb</code></a>
Use display name fallback if blank display name result (<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/6342">#6342</a>)</li>
<li><a
href="https://github.com/activeadmin/activeadmin/commit/6333cfc4c0fc3a058474f0e4800f43e16013c37a"><code>6333cfc</code></a>
Remove custom Ransack predicates that were MetaSearch backports (<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/8010">#8010</a>)</li>
<li><a
href="https://github.com/activeadmin/activeadmin/commit/c3a2dfd029cea2cfa7baa79cf6e40ec5dfa713fa"><code>c3a2dfd</code></a>
Require Ransack v4 (<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/8009">#8009</a>)</li>
<li><a
href="https://github.com/activeadmin/activeadmin/commit/c1fe7a4da2b1f77a3c212492a42f2f5aaf62a32b"><code>c1fe7a4</code></a>
Disable simplecov-cobertura require</li>
<li><a
href="https://github.com/activeadmin/activeadmin/commit/36ae4587a7b4d67b61d0178025e760d19eb275c3"><code>36ae458</code></a>
Improve Swedish translations (<a
href="https://redirect.github.com/activeadmin/activeadmin/issues/7993">#7993</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/activeadmin/activeadmin/compare/v2.14.0...v3.0.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=activeadmin&package-manager=bundler&previous-version=2.14.0&new-version=3.0.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Kevin <[email protected]>
  • Loading branch information
dependabot[bot] and KevinMulhern authored Jul 30, 2023
1 parent 6fd725d commit 622ef78
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source 'https://rubygems.org'

gem 'rails', '7.0.6'

gem 'activeadmin', '~> 2.14'
gem 'activeadmin', '~> 3.0'
gem 'activeadmin_addons', '~> 1.10'
gem 'active_material', '~> 1.5'
gem 'acts_as_votable', '~> 0.14'
Expand Down
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@ GEM
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
active_material (1.5.2)
activeadmin (2.14.0)
activeadmin (3.0.0)
arbre (~> 1.2, >= 1.2.1)
formtastic (>= 3.1, < 5.0)
formtastic_i18n (~> 0.4)
inherited_resources (~> 1.7)
jquery-rails (~> 4.2)
kaminari (~> 1.0, >= 1.2.1)
railties (>= 6.1, < 7.1)
ransack (>= 2.1.1, < 4)
ransack (>= 4.0, < 5)
activeadmin_addons (1.10.0)
active_material
railties
Expand Down Expand Up @@ -396,7 +396,7 @@ GEM
zeitwerk (~> 2.5)
rainbow (3.1.1)
rake (13.0.6)
ransack (3.2.1)
ransack (4.0.0)
activerecord (>= 6.1.5)
activesupport (>= 6.1.5)
i18n
Expand Down Expand Up @@ -587,7 +587,7 @@ PLATFORMS

DEPENDENCIES
active_material (~> 1.5)
activeadmin (~> 2.14)
activeadmin (~> 3.0)
activeadmin_addons (~> 1.10)
acts_as_votable (~> 0.14)
barnes (~> 0.0)
Expand Down
8 changes: 8 additions & 0 deletions app/models/application_record.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
class ApplicationRecord < ActiveRecord::Base
self.abstract_class = true

def self.ransackable_attributes(_ = nil)
authorizable_ransackable_attributes
end

def self.ransackable_associations(_ = nil)
authorizable_ransackable_associations
end
end

0 comments on commit 622ef78

Please sign in to comment.