Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
ddnexus committed Jul 29, 2024
2 parents 78949da + 4e48dae commit 32f3945
Show file tree
Hide file tree
Showing 19 changed files with 44 additions and 43 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.0.3
- label: I upgraded to pagy version 9.0.4
required: true
- label: I searched through the [Documentation](https://ddnexus.github.io/pagy/)
required: true
Expand Down
10 changes: 3 additions & 7 deletions .github/latest_release_body.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,11 @@
- See the [Changelog](https://ddnexus.github.io/pagy/changelog) for possible breaking changes
<!-- whats_new_end -->

### Changes in 9.0.3
### Changes in 9.0.4

<!-- changes_start -->
- Remove legacy and unused javascript files
- Improve pagy_get_page with force_integer option
- Fix jsonapi with keyset
- Complete the internal refactoring of version 9:
- Remove the pagy*_get_vars methods now useless
- Use to_i on the page variable for the search extras
- Fix groupdate timezone error on certain machines/config
- Fix gem containing tmp files
<!-- changes_end -->

[CHANGELOG](https://ddnexus.github.io/pagy/changelog)
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ If you upgrade from version `< 9.0.0` see the following:
- None
<hr>

## Version 9.0.4

- Fix groupdate timezone error on certain machines/config
- Fix gem containing tmp files

## Version 9.0.3

- Remove legacy and unused javascript files
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: gem
specs:
pagy (9.0.3)
pagy (9.0.4)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -287,7 +287,7 @@ GEM
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
zeitwerk (2.6.16)
zeitwerk (2.6.17)

PLATFORMS
x86_64-darwin-21
Expand Down
10 changes: 5 additions & 5 deletions gem/apps/calendar.ru
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# DOC
# https://ddnexus.github.io/pagy/playground/#5-calendar-app

VERSION = '9.0.3'
VERSION = '9.0.4'

# Gemfile
require 'bundler/inline'
Expand Down Expand Up @@ -64,8 +64,6 @@ require 'pagy/extras/bootstrap'
Pagy::DEFAULT.freeze

# Groupdate initializer (https://github.com/ankane/groupdate)
# Groupdate does not support the time zone with sqlite, so for this demo we can live with UTC
Groupdate.time_zone = false
# Groupdate week_start default is :sunday, while rails and pagy default to :monday
Groupdate.week_start = :monday

Expand Down Expand Up @@ -120,8 +118,10 @@ class EventsController < ActionController::Base
end

def index
# We need UTC to work with the limitation of groupdate with sqlite
Time.zone = 'UTC'
# Groupdate does not support time zones with SQLite.
# 'UTC' does not work on certain machines config (pulling the actual local time zone utc_offset)
# so for this demo we use a different zone with utc_offset 0
Time.zone = 'GMT'
# Default calendar
# The conf Hash defines the pagy objects variables keyed by calendar unit and the final pagy standard object
# The :skip is an optional and arbitrarily named param that skips the calendar pagination and uses only the pagy
Expand Down
2 changes: 1 addition & 1 deletion gem/apps/demo.ru
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# DOC
# https://ddnexus.github.io/pagy/playground/#3-demo-app

VERSION = '9.0.3'
VERSION = '9.0.4'

require 'bundler/inline'
require 'bundler'
Expand Down
2 changes: 1 addition & 1 deletion gem/apps/rails.ru
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# DOC
# https://ddnexus.github.io/pagy/playground/#2-rails-app

VERSION = '9.0.3'
VERSION = '9.0.4'

# Gemfile
require 'bundler/inline'
Expand Down
2 changes: 1 addition & 1 deletion gem/apps/repro.ru
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# DOC
# https://ddnexus.github.io/pagy/playground/#1-repro-app

VERSION = '9.0.3'
VERSION = '9.0.4'

require 'bundler/inline'
require 'bundler'
Expand Down
2 changes: 1 addition & 1 deletion gem/bin/pagy
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby
# frozen_string_literal: true

VERSION = '9.0.3'
VERSION = '9.0.4'
APPS = %w[repro rails demo calendar keyset_ar keyset_s].freeze
LINUX = RbConfig::CONFIG['host_os'].include?('linux')
HOST = '0.0.0.0'
Expand Down
2 changes: 1 addition & 1 deletion gem/config/pagy.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

# Pagy initializer file (9.0.3)
# Pagy initializer file (9.0.4)
# Customize only what you really need and notice that the core Pagy works also without any of the following lines.
# Should you just cherry pick part of this file, please maintain the require-order of the extras

Expand Down
4 changes: 2 additions & 2 deletions gem/javascripts/pagy.min.js

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

Loading

0 comments on commit 32f3945

Please sign in to comment.