Skip to content

Commit

Permalink
Merge branch 'dev' into fix/include_subprojects_num
Browse files Browse the repository at this point in the history
  • Loading branch information
Reza98Sh authored Aug 28, 2024
2 parents d53dec2 + 747b5de commit 022e47f
Show file tree
Hide file tree
Showing 1,413 changed files with 18,582 additions and 9,061 deletions.
9 changes: 8 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,18 @@ browserslist
!/docs/api/apiv3/tags
!/docs/api/apiv3/components

# Ignore spec/** folders
spec/**
# Allow factories in case we use lookbook
!spec/factories
!spec/factories/**
!spec/support
!spec/support/**

extra
features
help
log/*.log
spec
/tmp
frontend/.angular/cache
frontend/node_modules
Expand Down
44 changes: 44 additions & 0 deletions .github/workflows/i18n-tasks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: i18n-inconsistency-check

on:
push:
branches:
- dev
- release/*
paths-ignore:
- 'docs/**'
- 'help/**'
pull_request:
types: [opened, reopened, synchronize]
paths-ignore:
- 'docs/**'
- 'help/**'
- 'packaging/**'
- '.pkgr.yml'

permissions:
contents: read

jobs:
i18n-tasks:
permissions:
contents: read
if: github.repository == 'opf/openproject'
name: I18n inconsistency check
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup Ruby
uses: ruby/setup-ruby@v1

- name: Setup i18n-tasks
run: |
gem install i18n-tasks
- name: Run inconsistent translations check
run: |
i18n-tasks \
check-consistent-interpolations \
--config config/i18n-tasks-all-files.yml
9 changes: 9 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,15 @@ Rails/DynamicFindBy:
Whitelist:
- find_by_login

# Allow reorder to prevent find each cop triggering
Rails/FindEach:
AllowedMethods:
- order
- reorder
- limit
- select
- lock

# We have config.active_record.belongs_to_required_by_default = false ,
# which means, we do have to declare presence validators on belongs_to relations.
Rails/RedundantPresenceValidationOnBelongsTo:
Expand Down
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ gem "validate_url"
gem "dry-auto_inject"
gem "dry-container"
gem "dry-monads"
gem "dry-validation"

# ActiveRecord extension which adds typecasting to store accessors
gem "store_attribute", "~> 1.0"
Expand Down Expand Up @@ -397,4 +398,4 @@ end

gem "openproject-octicons", "~>19.18.0"
gem "openproject-octicons_helper", "~>19.18.0"
gem "openproject-primer_view_components", "~>0.42.0"
gem "openproject-primer_view_components", "~>0.43.0"
Loading

0 comments on commit 022e47f

Please sign in to comment.