Conversation
Collaborator
|
Are these merge conflicts due to the recent Tailwind PR? I can rebase locally and check it out; it'll give me a good chance to get acquainted, @dmitrytrager |
seanmarcia
reviewed
Feb 3, 2026
app/views/tags/index.html.erb
Outdated
| </div> | ||
| <div class="card-footer d-flex justify-content-end"> | ||
| <%== pagy_bootstrap_nav(@pagy) %> | ||
| <%== @pagy.series_nav(:bootstrap) %> |
Member
There was a problem hiding this comment.
Is this going to work with the new tailwinds css?
* main: (37 commits) chore(deps-dev): bump web-console from 4.2.1 to 4.3.0 chore(deps): bump solid_queue from 1.3.0 to 1.3.2 chore(deps-dev): bump rspec-rails from 8.0.2 to 8.0.3 chore(deps): bump reactionview from 0.2.0 to 0.2.1 Bootstrap Mazer cleanup (#591) chore(deps): bump scout_apm from 6.0.1 to 6.1.0 chore(deps-dev): bump annotaterb from 4.21.0 to 4.22.0 chore(deps): bump herb from 0.8.9 to 0.8.10 Rename header checking method names Preserve previous manifest data for admin diff visibility Store manifest content on beacon for admin visibility Tailwind migration cleanup – sidebar (#584) chore(deps-dev): bump brakeman from 8.0.1 to 8.0.2 (#583) Add proactive manifest rebuilding on content changes Add manifest API with versioning and change detection Upgrade to Ruby 4.0.1 (#570) Update Favicon (#563) Add macOS 15 platform to Gemfile.lock Rename device to beacon throughout the codebase Add region association to devices ...
dmitrytrager
force-pushed
the
chore/bump-pagy
branch
from
962b723 to
0fca5ed
Compare
dmitrytrager
force-pushed
the
chore/bump-pagy
branch
from
0fca5ed to
e257629
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What Issue Does This PR Cover, If Any?
Migrates Pagy gem to the newest major version 43
What Changed? And Why Did It Change?
Application was updated according to this guide: https://ddnexus.github.io/pagy/guides/upgrade-guide/
How Has This Been Tested?
Manually and rspec
Please Provide Screenshots
Additional Comments