Skip to content

Commit

Permalink
Merge PR #126 into 14.0
Browse files Browse the repository at this point in the history
Signed-off-by carmenbianca
  • Loading branch information
OCA-git-bot committed May 2, 2024
2 parents 4c84263 + 12fd2a8 commit 2f9cb02
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Do NOT update manually; changes here will be overwritten by Copier
_commit: v1.19.2
_commit: v1.21.1
_src_path: git+https://github.com/oca/oca-addons-repo-template
ci: GitHub
convert_readme_fragments_to_markdown: false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Stale PRs and issues policy
uses: actions/stale@v4
uses: actions/stale@v9
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
# General settings.
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
# * Issues that are pending more information
# * Except Issues marked as "no stale"
- name: Needs more information stale issues policy
uses: actions/stale@v4
uses: actions/stale@v9
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
ascending: true
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ jobs:
run: oca_init_test_database
- name: Run tests
run: oca_run_tests
- uses: codecov/codecov-action@v1
- uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
- name: Update .pot files
run: oca_export_and_push_pot https://x-access-token:${{ secrets.GIT_PUSH_TOKEN }}@github.com/${{ github.repository }}
if: ${{ matrix.makepot == 'true' && github.event_name == 'push' && github.repository_owner == 'OCA' }}
2 changes: 2 additions & 0 deletions .oca_hooks.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[MESSAGES_CONTROL]
disable=xml-deprecated-data-node,xml-deprecated-tree-attribute
4 changes: 3 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ exclude: |
readme/.*\.(rst|md)$|
# Ignore build and dist directories in addons
/build/|/dist/|
# Ignore test files in addons
/tests/samples/.*|
# You don't usually want a bot to modify your legal texts
(LICENSE.*|COPYING.*)
default_language_version:
Expand All @@ -37,7 +39,7 @@ repos:
language: fail
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
- repo: https://github.com/oca/maintainer-tools
rev: f71041f22b8cd68cf7c77b73a14ca8d8cd190a60
rev: 9a170331575a265c092ee6b24b845ec508e8ef75
hooks:
# update the NOT INSTALLABLE ADDONS section above
- id: oca-update-pre-commit-excluded-addons
Expand Down
2 changes: 1 addition & 1 deletion cooperator/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ Changelog

**Features**

- Rework ``res.partner`` form view as has been done in version 16. (`#105 <https://github.com/OCA/cooperative/issues/105>`_)
- Rework ``res.partner`` form view as has been done in version 16. (#105)


**Bugfixes**
Expand Down
2 changes: 1 addition & 1 deletion cooperator/readme/HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

**Features**

- Rework ``res.partner`` form view as has been done in version 16. (`#105 <https://github.com/OCA/cooperative/issues/105>`_)
- Rework ``res.partner`` form view as has been done in version 16. (#105)


**Bugfixes**
Expand Down
2 changes: 1 addition & 1 deletion cooperator/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ <h1><a class="toc-backref" href="#toc-entry-4">Changelog</a></h1>
<h2><a class="toc-backref" href="#toc-entry-5">14.0.2.1.0 (2024-04-15)</a></h2>
<p><strong>Features</strong></p>
<ul class="simple">
<li>Rework <tt class="docutils literal">res.partner</tt> form view as has been done in version 16. (<a class="reference external" href="https://github.com/OCA/cooperative/issues/105">#105</a>)</li>
<li>Rework <tt class="docutils literal">res.partner</tt> form view as has been done in version 16. (#105)</li>
</ul>
<p><strong>Bugfixes</strong></p>
<ul class="simple">
Expand Down

0 comments on commit 2f9cb02

Please sign in to comment.