Skip to content

Commit c78fabd

Browse files
committed
Update GHA config for renamed main branch
1 parent 55fc4a0 commit c78fabd

File tree

3 files changed

+6
-17
lines changed

3 files changed

+6
-17
lines changed

.github/workflows/linting.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Linting
22

33
on:
44
push:
5-
branches: [master]
5+
branches: [main]
66
pull_request:
7-
branches: [master]
7+
branches: [main]
88

99
jobs:
1010
lint:

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Tests
22

33
on:
44
push:
5-
branches: [master]
5+
branches: [main]
66
pull_request:
7-
branches: [master]
7+
branches: [main]
88

99
jobs:
1010
test:

README.md

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ gem 'rails-api'
1616
gem 'grape', '>= 0.10.0'
1717

1818
# Then choose your preferred paginator from the following:
19-
gem 'pagy'
19+
gem 'pagy', '>= 43.0.0' # Due to breaking changes, newer versions of api-pagination require pagy 43.0.0 or later
2020
gem 'kaminari'
2121
gem 'will_paginate'
2222

@@ -71,7 +71,7 @@ end
7171
Pagy does not have a built-in way to specify a maximum number of items per page, but `api-pagination` will check if you've set a `:max_per_page` variable. To configure this, you can use the following code somewhere in an initializer:
7272

7373
```ruby
74-
Pagy::DEFAULT[:max_per_page] = 100
74+
Pagy.options[:max_per_page] = 100
7575
```
7676

7777
If left unconfigured, clients can request as many items per page as they wish, so it's highly recommended that you configure this.
@@ -205,14 +205,3 @@ end
205205
[activeadmin]: https://github.com/activeadmin/activeadmin
206206
[kaminari]: https://github.com/amatsuda/kaminari
207207
[will_paginate]: https://github.com/mislav/will_paginate
208-
209-
[travis]: https://travis-ci.org/davidcelis/api-pagination
210-
[travis-badge]: http://img.shields.io/travis/davidcelis/api-pagination/master.svg
211-
[coveralls]: https://coveralls.io/r/davidcelis/api-pagination
212-
[coveralls-badge]: http://img.shields.io/coveralls/davidcelis/api-pagination/master.svg
213-
[code-climate]: https://codeclimate.com/github/davidcelis/api-pagination
214-
[code-climate-badge]: http://img.shields.io/codeclimate/github/davidcelis/api-pagination.svg
215-
[gemnasium]: http://gemnasium.com/davidcelis/api-pagination
216-
[gemnasium-badge]: http://img.shields.io/gemnasium/davidcelis/api-pagination.svg
217-
[gittip]: https://gittip.com/davidcelis
218-
[gittip-badge]: http://img.shields.io/gittip/davidcelis.svg

0 commit comments

Comments
 (0)