Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
ddnexus committed Nov 11, 2024
2 parents 0adb448 + bc7119e commit 6154aa8
Show file tree
Hide file tree
Showing 30 changed files with 683 additions and 674 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/Code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ body:
attributes:
label: 👀 Before submitting...
options:
- label: I upgraded to pagy version 9.2.1
- label: I upgraded to pagy version 9.2.2
required: true
- label: I searched through the [Documentation](https://ddnexus.github.io/pagy/)
required: true
Expand Down
10 changes: 4 additions & 6 deletions .github/latest_release_body.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@
- See the [Changelog](https://ddnexus.github.io/pagy/changelog) for possible breaking changes
<!-- whats_new_end -->

### Changes in 9.2.1
### Changes in 9.2.2

<!-- changes_start -->
- Improve bin/pagy to dynamically find apps and descriptions
- Apps refactoring:
- Update rails to 8.0
- Replace rails AR keyset apps with sinatra apps
- Improve consistency
- Replace inline templates with template block in sinatra apps
- Replace the rails calendar app with a sinatra app
- Add PagyApps::INDEX
<!-- changes_end -->

[CHANGELOG](https://ddnexus.github.io/pagy/changelog)
12 changes: 8 additions & 4 deletions .idea/runConfigurations/Rubocop_Autocorrect.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ If you upgrade from version `< 9.0.0` see the following:
- `:after_latest` keyset variable: use `:filter_newest`
<hr>

## Version 9.2.2

- Replace inline templates with template block in sinatra apps
- Replace the rails calendar app with a sinatra app
- Add PagyApps::INDEX

## Version 9.2.1

- Improve bin/pagy to dynamically find apps and descriptions
Expand Down
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ group :playground do
gem 'rouge'
gem 'sequel'
gem 'sinatra'
gem 'sinatra-contrib'
gem 'sqlite3'
end

Expand Down
12 changes: 2 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: gem
specs:
pagy (9.2.1)
pagy (9.2.2)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -150,7 +150,6 @@ GEM
builder
minitest (>= 5.0)
ruby-progressbar
multi_json (1.15.0)
mustermann (3.0.3)
ruby2_keywords (~> 0.0.1)
mutex_m (0.2.0)
Expand Down Expand Up @@ -242,7 +241,7 @@ GEM
rematch (3.1.0)
rerun (0.14.0)
listen (~> 3.0)
rouge (4.4.0)
rouge (4.5.0)
rubocop (1.68.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
Expand Down Expand Up @@ -282,12 +281,6 @@ GEM
rack-protection (= 4.0.0)
rack-session (>= 2.0.0, < 3)
tilt (~> 2.0)
sinatra-contrib (4.0.0)
multi_json (>= 0.0.2)
mustermann (~> 3.0)
rack-protection (= 4.0.0)
sinatra (= 4.0.0)
tilt (~> 2.0)
sqlite3 (2.2.0-aarch64-linux-gnu)
sqlite3 (2.2.0-aarch64-linux-musl)
sqlite3 (2.2.0-arm-linux-gnu)
Expand Down Expand Up @@ -353,7 +346,6 @@ DEPENDENCIES
sequel
simplecov
sinatra
sinatra-contrib
sqlite3

BUNDLED WITH
Expand Down
2 changes: 1 addition & 1 deletion README.md

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions e2e/snapshots.js

Large diffs are not rendered by default.

Loading

0 comments on commit 6154aa8

Please sign in to comment.