Skip to content

Commit

Permalink
Merge branch 'dev' into merge-release/14.5-20240926033815
Browse files Browse the repository at this point in the history
  • Loading branch information
cbliard authored Sep 26, 2024
2 parents 84804c6 + d86dfdc commit 407201d
Show file tree
Hide file tree
Showing 835 changed files with 19,048 additions and 10,733 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
.*ignore
*.md
*.log
config/database.yml
docker/prod/Dockerfile
docker/ci/Dockerfile
Guardfile
Expand Down
47 changes: 47 additions & 0 deletions .github/workflows/version-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Check work package version

on:
pull_request:
types: [labeled, synchronize]

permissions:
contents: read # to fetch code (actions/checkout)
pull-requests: write # to comment on the PR

jobs:
check-pr:
if: contains(github.event.pull_request.labels.*.name, 'needs review')
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up Ruby
uses: ruby/setup-ruby@v1

- name: Verify linked version matches core version
id: version-check
run: ./script/ci/version_check.sh "${{ github.event.pull_request.body }}"

- name: Add comment if versions differ
if: steps.version-check.outputs.version_mismatch == 'true'
uses: marocchino/sticky-pull-request-comment@v2
with:
header: version-mismatch-comment
message: |
The provided work package version does not match the core version:
- Work package URL: ${{ steps.version-check.outputs.wp_url }}
- Work package version: ${{steps.version-check.outputs.wp_version}}
- Core version: ${{steps.version-check.outputs.core_version}}
Please make sure that:
- The work package version OR your pull request target branch is correct
- name: Version check passed
if: steps.version-check.outputs.version_mismatch != 'true'
uses: marocchino/sticky-pull-request-comment@v2
with:
header: version-mismatch-comment
delete: true
13 changes: 7 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ gem "friendly_id", "~> 5.5.0"

gem "acts_as_list", "~> 1.2.0"
gem "acts_as_tree", "~> 2.9.0"
gem "awesome_nested_set", "~> 3.6.0"
gem "awesome_nested_set", "~> 3.7.0"
gem "closure_tree", "~> 7.4.0"
gem "rubytree", "~> 2.1.0"
# Only used in down migrations now.
Expand Down Expand Up @@ -158,7 +158,7 @@ gem "structured_warnings", "~> 0.4.0"
gem "airbrake", "~> 13.0.0", require: false

gem "markly", "~> 0.10" # another markdown parser like commonmarker, but with AST support used in PDF export
gem "md_to_pdf", git: "https://github.com/opf/md-to-pdf", ref: "32603f09a249999a00e8ca23eb17215b46a26c0f"
gem "md_to_pdf", git: "https://github.com/opf/md-to-pdf", ref: "fe05b4f8bae8fd46f4fa93b8e0adee6295ef7388"
gem "prawn", "~> 2.4"
gem "ttfunk", "~> 1.7.0" # remove after https://github.com/prawnpdf/prawn/issues/1346 resolved.

Expand Down Expand Up @@ -225,7 +225,7 @@ gem "view_component"
gem "lookbook", "~> 2.3.0"

# Require factory_bot for usage with openproject plugins testing
gem "factory_bot", "~> 6.4.0", require: false
gem "factory_bot", "~> 6.5.0", require: false
# require factory_bot_rails for convenience in core development
gem "factory_bot_rails", "~> 6.4.0", require: false

Expand All @@ -247,7 +247,7 @@ group :test do
gem "rack_session_access"
gem "rspec", "~> 3.13.0"
# also add to development group, so 'spec' rake task gets loaded
gem "rspec-rails", "~> 6.1.0", group: :development
gem "rspec-rails", "~> 7.0.0", group: :development

# Retry failures within the same environment
gem "retriable", "~> 3.1.1"
Expand All @@ -272,6 +272,7 @@ group :test do
gem "capybara_accessible_selectors", git: "https://github.com/citizensadvice/capybara_accessible_selectors", branch: "main"
gem "capybara-screenshot", "~> 1.0.17"
gem "cuprite", "~> 0.15.0"
gem "rspec-wait"
gem "selenium-devtools"
gem "selenium-webdriver", "~> 4.20"

Expand Down Expand Up @@ -348,7 +349,7 @@ group :development, :test do
gem "erblint-github", require: false

# Brakeman scanner
gem "brakeman", "~> 6.1.0"
gem "brakeman", "~> 6.2.0"

# i18n-tasks helps find and manage missing and unused translations.
gem "i18n-tasks", "~> 1.0.13", require: false
Expand Down Expand Up @@ -398,4 +399,4 @@ end

gem "openproject-octicons", "~>19.18.0"
gem "openproject-octicons_helper", "~>19.18.0"
gem "openproject-primer_view_components", "~>0.43.1"
gem "openproject-primer_view_components", "~>0.47.0"
Loading

0 comments on commit 407201d

Please sign in to comment.