Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
ddnexus committed Jun 2, 2024
2 parents 0ee978d + 7386ffa commit dcc70e7
Show file tree
Hide file tree
Showing 51 changed files with 3,513 additions and 9,796 deletions.
13 changes: 10 additions & 3 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,21 @@

Pull Requests are welcome!

Here are a few useul information for you:
Here are a few useful information for contributors:

1. If you are planning for a complex PR, we suggest that you check before hand whether your
proposed changes are going to be accepted by posting your ideas in
the [Feature Requests](https://github.com/ddnexus/pagy/discussions/categories/feature-requests) discussion area
2. For adding translations of locale dictionary files please follow
the [locales readme instructions here](https://github.com/ddnexus/pagy/blob/master/gem/locales/README.md).
3. **Development**
3. **Pagy repo setup**
- Clone pagy: `git clone https://github.com/ddnexus/pagy && cd pagy`
- Install the gems: `bundle install`
- Install node if not present...
- Optional: install pnpm. It's better if you use corepack to get the right version from package.json
([instructions](https://pnpm.io/installation#using-corepack))
- Install modules: `npm install` (or `pnpm install`)
4. **Development**
- Please create your own branch out of `master` and use it for you development and PR
- Ensure you are basing your PR on the `master` branch and keep rebasing it on `master` when it changes
- **Code**
Expand All @@ -18,7 +25,7 @@ Here are a few useul information for you:
with the [Pagy::Console](https://ddnexus.github.io/pagy/docs/api/console/) directly from the repo
- **Docs**
- `cd` in the pagy root directory
- Run `npm -i` or (`pnpm -i` if pnpm is installed).
- Run `npm install` or (`pnpm install` if pnpm is installed).
- Run `retype start`
- Point your browser at `http://localhost:5000/pagy` for real-time feedback
5. **Testing**
Expand Down
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 8.4.0
- label: I upgraded to pagy version 8.4.1
required: true
- label: I searched through the [Documentation](https://ddnexus.github.io/pagy/)
required: true
Expand Down
9 changes: 4 additions & 5 deletions .github/latest_release_body.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@
the [details](https://github.com/ddnexus/pagy/discussions/672#discussioncomment-9212328))
- See the [CHANGELOG](https://ddnexus.github.io/pagy/changelog) for possible breaking changes

### Changes in 8.4.0
### Changes in 8.4.1

<!-- changes start -->
- Retrieve only @in items:
- improve the performance of the last page in
particular storage conditions (see #696)
- Improve pagy launcher for pagy devs
- Fix pagy.in in pagy_get_items method introduced in 8.4.0 (see #696) (closes #704) (closes #708) (#707)
- Fix renamed Frontend Helpers to JS Tools and typo `next_a` "aria-label" (#700)
- Fix rubocop
<!-- changes end -->

[CHANGELOG](https://ddnexus.github.io/pagy/changelog)
6 changes: 1 addition & 5 deletions .idea/runConfigurations/Calendar.xml

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

8 changes: 2 additions & 6 deletions .idea/runConfigurations/Coverage_Report.xml

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

6 changes: 1 addition & 5 deletions .idea/runConfigurations/Demo.xml

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

8 changes: 2 additions & 6 deletions .idea/runConfigurations/IRB_pagy.xml

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

6 changes: 1 addition & 5 deletions .idea/runConfigurations/Rails.xml

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

6 changes: 1 addition & 5 deletions .idea/runConfigurations/Repro.xml

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

8 changes: 2 additions & 6 deletions .idea/runConfigurations/Rubocop_Autocorrect.xml

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

8 changes: 2 additions & 6 deletions .idea/runConfigurations/Rubocop_Run.xml

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

8 changes: 2 additions & 6 deletions .idea/runConfigurations/Rubygem_Release.xml

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

17 changes: 2 additions & 15 deletions .idea/runConfigurations/Test_All.xml

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

4 changes: 2 additions & 2 deletions .idea/runConfigurations/npm_check.xml

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

8 changes: 2 additions & 6 deletions .idea/runConfigurations/update_top100.xml

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

7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ If you upgrade from version `< 8.0.0` see the following:

<hr>

## Version 8.4.1

- Fix pagy.in in pagy_get_items method introduced in 8.4.0 (see #696) (closes #704) (closes #708) (#707)
- Fix renamed Frontend Helpers to JS Tools and typo `next_a` "aria-label" (#700)
- Fix rubocop

## Version 8.4.0

- Retrieve only @in items:
Expand Down Expand Up @@ -106,6 +112,7 @@ If you upgrade from version `< 8.0.0` see the following:
- The `navs` and `support` extras has been merged into the new [pagy extra](https://ddnexus.github.io/pagy/docs/extras/pagy).
Search for `"extras/navs"` and
`"extras/support"` and replace with `"extras/pagy"` (remove the duplicate if you used both)
- The `"extras/frontend_helpers"` has been renamed to `"extras/js_tools"`
- The build path for javascript builders has been updated to the canonical paths for gems, and has moved from the `lib` to
the gem root. Notice that the correct setup in `package json` was still wrongly wrapped in the `gem` dir for 8.0.0-8.0.1, and it
has finally been fixed in 8.0.2 (sorry for that):
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: gem
specs:
pagy (8.4.0)
pagy (8.4.1)

GEM
remote: https://rubygems.org/
Expand Down
Loading

0 comments on commit dcc70e7

Please sign in to comment.