Permalink
Comparing changes
Choose two branches to see what’s changed or to start a new pull request.
If you need to, you can also or
learn more about diff comparisons.
Open a pull request
Create a new pull request by comparing changes across two branches. If you need to, you can also .
Learn more about diff comparisons here.
...
- 6 commits
- 20 files changed
- 6 contributors
Commits on Aug 24, 2024
-
Backport #8450 #8451 to 3.0 stable (#8454)
* Update dependencies Relax sqlite3 version constraint because rails/rails#51636 is included in the latest 7.1.4 release * Fix bug report template and update to Rails 7.2 Current bug report template does not work because sqlite3 2.x is not compatible with Rails 7.0.x. This commit also: - Test bug report template against Ruby 3.3 - Set config.eager_load to avoid a warning on stdout: ``` config.eager_load is set to nil. Please update your config/environments/*.rb files accordingly: ``` - Default to `3-0-stable` branch when `ACTIVE_ADMIN_PATH` is not specified - Add `force_ruby_platform` to `sqlite3` for uniformity with `master` branch
Commits on Sep 4, 2024
-
Backport Add favicon to template app to fix Rails 7.2 test suite run (#…
…8468) add favicon for template app We have some specs failing in Rails 7.2. The only hint we have in the log is ``` No route matches [GET] "/favicon.ico" (ActionController::RoutingError) ``` Rails 7.2 new app generator does not use favicon.ico anymore. It uses a png + meta "icon" tag. Let's configure the icon in the template app to prevent this kind of error.
-
Backport Use attribute_types instead of columns_hash to determine type (
#8469) Use attribute_types instead of columns_hash to determine type Previously, virtual attributes of type boolean with value `nil` would not be rendered as status tag. This also improves boolean detection in rare cases when an `attribute` declaration overrides the type detected in the database. Co-authored-by: Tilmann Singer <tils@tils.net>
-
Backport Optimize count query for pagination_total: false option (#8470)
* Optimize count query for `pagination_total: false` option (#6911) * Remove duplicated delegation `total_pages` is listed twice. * Remove ORDER BY from count subquery Queries like `SELECT COUNT(*) FROM (SELECT DISTINCT resources.* FROM resources ORDER BY resources.created_at DESC LIMIT 1 OFFSET 30) subquery_for_count` are too inefficient * add specs about ensure count query does not include ORDER BY clause * exclude also select because based on https://github.com/activeadmin/activeadmin/pull/7489\#issuecomment-1554197081 --------- Co-authored-by: Rafael Sales <rafaelcds@gmail.com> Co-authored-by: David Rodríguez <deivid-rodriguez> Co-authored-by: Matias Grunberg <matias@yellowspot.dev> * fix perform_database_query_matcher: make sure to keep match truthy after the first matched query --------- Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net> Co-authored-by: Rafael Sales <rafaelcds@gmail.com>
3 people authoredSep 4, 2024 -
Commits on Sep 5, 2024
Loading
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff b71930a...c16c6ee