Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
ddnexus committed Dec 22, 2022
2 parents 79a23cc + 3df9401 commit 1296353
Show file tree
Hide file tree
Showing 167 changed files with 9,986 additions and 3,978 deletions.
48 changes: 0 additions & 48 deletions .devcontainer/devcontainer.json

This file was deleted.

4 changes: 0 additions & 4 deletions .env

This file was deleted.

4 changes: 2 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"ecmaVersion": "latest"
},
"rules": {
"semi": ["error", "always", {"omitLastInOneLineBlock": true}],
"align-assignments/align-assignments": ["error", { "requiresOnly": false } ]
"semi": ["warn", "always", {"omitLastInOneLineBlock": true}],
"align-assignments/align-assignments": ["warn", { "requiresOnly": false } ]
}
}
2 changes: 1 addition & 1 deletion .github/.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
GEM=pagy
VERSION=5.10.1
VERSION=6.0.0
6 changes: 2 additions & 4 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@

Pull Requests are welcome!

Setting up a development environment for Pagy is very simple if you use the [Pagy Docker Environment](https://github.com/ddnexus/pagy/tree/master/docker).
Before spending time creating a (potentially complex) Pull Request, you can [Confirm Feature Request](https://github.com/ddnexus/pagy/discussions/categories/feature-requests) to ensure that your proposed changes are going to be useful for most users.

Before spending time creating a (potentially complex) Pull Request, you can [Confirm on Gitter](https://gitter.im/ruby-pagy/Lobby) whether your proposed changes are going to be useful for most users.

If you Create A Pull Request, please ensure that the "All checks have passed" indicator gets green light on the Pull Request page. That means that the tests passed and Codecov and Rubocop are happy.
If you Create A Pull Request, please ensure that the "All checks have passed" indicator gets green light on the Pull Request page (if it's not enabled, a maintainer will enable it for you).

Thank you!
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/Code.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ assignees: ''
---
<!--
Code Issues are reserved for real, reproducible pagy-code issues. If you are not sure about it, please use the "Pagy Chat Support" button issue.
Code Issues are reserved for real, reproducible pagy-code issues. If you are not sure about it, please use the "Pagy Q&A" button issue.
By following the steps below you will either solve your problem or ensure that it's a real reproducible issue to fix.
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/Documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ assignees: ''
---
<!--
By following the steps below you will either solve your problem or ensure that it's a real documentation issue.
By following the steps below you will either solve your problem or ensure that it's a real documentation issue. If you are not sure about it, please use the "Pagy Q&A" button issue.
WARNING: DOCUMENTATION ISSUES NOT FOLLOWING THIS TEMPLATE MAY BE DELETED WITHOUT NOTICE
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
blank_issues_enabled: false
contact_links:
- name: Pagy Chat Support
url: https://gitter.im/ruby-pagy/Lobby
- name: Pagy Q&A
url: [Q&A Discussion](https://github.com/ddnexus/pagy/discussions/categories/q-a)
about: Please ask and answer questions here

4 changes: 1 addition & 3 deletions .github/SUPPORT.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# Pagy Support

Please ask and answer questions in the [Pagy live support](https://gitter.im/ruby-pagy/Lobby).

Use that channel also for feature requests and discussing your planned PRs.
Please ask and answer questions in the [Q&A Discussion](https://github.com/ddnexus/pagy/discussions/categories/q-a).
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
13 changes: 7 additions & 6 deletions .github/workflows/pagy-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ name: Pagy CI

on:
push:
branches: ['**']
branches:
- '**'
pull_request:
branches: ['**']

Expand Down Expand Up @@ -55,7 +56,7 @@ jobs:
env: ${{ matrix.env }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up ruby
uses: ruby/setup-ruby@v1
Expand All @@ -71,7 +72,7 @@ jobs:

- name: Run Codecov
if: ${{ env.CODECOV == 'true' }}
uses: codecov/codecov-action@v1.3.2
uses: codecov/codecov-action@v3.1.0
with:
fail_ci_if_error: true

Expand All @@ -90,7 +91,7 @@ jobs:
BUNDLE_GEMFILE: /home/runner/work/pagy/pagy/.github/gemfiles/ruby-2.5+

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up ruby
uses: ruby/setup-ruby@v1
Expand All @@ -100,7 +101,7 @@ jobs:

- name: Cache NPM and Cypress
id: e2e-cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
~/.cache/Cypress
Expand All @@ -109,7 +110,7 @@ jobs:

- name: Install Cypress and Test Dependencies
if: steps.e2e-cache.outputs.cache-hit != 'true'
run: npm i cypress @cypress/snapshot html-validate cypress-html-validate
run: npm i cypress @cypress/snapshot html-validate cypress-html-validate typescript

- name: Run Cypress Tests
# You may pin to the exact commit or the version.
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-gem.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
env:
BUNDLE_GEMFILE: .github/gemfiles/ruby-2.5+
steps:
- uses: actions/checkout@v2 # checks out default branch
- uses: actions/checkout@v3 # checks out default branch

- uses: ruby/setup-ruby@v1
with:
Expand All @@ -21,7 +21,7 @@ jobs:

- name: Dotenv Action
id: dotenv
uses: falti/dotenv-action@v0.2.7
uses: falti/dotenv-action@v0.2.8
with:
path: .github/.env

Expand All @@ -36,7 +36,7 @@ jobs:
RUBYGEMS_TOKEN: ${{ secrets.RUBYGEMS_TOKEN }}

- name: Create the release tag
uses: actions/github-script@v3
uses: actions/github-script@v6
with:
github-token: ${{ github.token }}
script: |
Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/retype-action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Publish Retype powered website to GitHub Pages
on:
workflow_dispatch:
push:
branches:
- 'master' # run only for master

jobs:
publish:
name: Publish to docs-site branch

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- uses: retypeapp/action-build@v2

- uses: retypeapp/action-github-pages@v2
with:
branch: docs-site
update-branch: true
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ node_modules/
/pkg/
/tmp/
pnpm
.pnpm-store
.pnpm-debug.log
17 changes: 17 additions & 0 deletions .idea/runConfigurations/Chrome.xml

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

35 changes: 35 additions & 0 deletions .idea/runConfigurations/Pagy_App.xml

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

38 changes: 38 additions & 0 deletions .idea/runConfigurations/Pagy_App_DEBUG.xml

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

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

17 changes: 17 additions & 0 deletions .idea/runConfigurations/buid_sh.xml

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

17 changes: 17 additions & 0 deletions .idea/runConfigurations/bump_sh.xml

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

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

Loading

0 comments on commit 1296353

Please sign in to comment.