Skip to content

Commit

Permalink
Merge branch 'dev' into bug/59534-table-formatting-is-not-reflected-i…
Browse files Browse the repository at this point in the history
…n-the-export
  • Loading branch information
as-op committed Jan 16, 2025
2 parents 161306c + db772a2 commit 1c1ef2c
Show file tree
Hide file tree
Showing 1,037 changed files with 13,416 additions and 4,265 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,6 @@ jobs:
bim_support: false
target: all-in-one
runner: runner=4cpu-linux-arm64
- platform: linux/ppc64le
digest: ppc-aio
bim_support: false
target: all-in-one
runner: runner=4cpu-linux-x64
steps:
- name: Checkout
with:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
- release/*
paths:
- 'docs/**'
- 'config/static_links.yml'

permissions:
contents: read
Expand Down
20 changes: 11 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ gem "escape_utils", "~> 1.3"
# Syntax highlighting used in html-pipeline with rouge
gem "rouge", "~> 4.5.1"
# HTML sanitization used for html-pipeline
gem "sanitize", "~> 6.1.0"
gem "sanitize", "~> 7.0.0"
# HTML autolinking for mails and urls (replaces autolink)
gem "rinku", "~> 2.0.4", require: %w[rinku rails_rinku]
# Version parsing with semver
Expand Down Expand Up @@ -126,7 +126,7 @@ gem "multi_json", "~> 1.15.0"
gem "oj", "~> 3.16.0"

gem "daemons"
gem "good_job", "= 3.26.2" # update should be done manually in sync with saas-openproject version.
gem "good_job", "= 3.99.1" # update should be done manually in sync with saas-openproject version.

gem "rack-protection", "~> 3.2.0"

Expand All @@ -137,7 +137,7 @@ gem "rack-protection", "~> 3.2.0"
gem "rack-attack", "~> 6.7.0"

# CSP headers
gem "secure_headers", "~> 7.0.0"
gem "secure_headers", "~> 7.1.0"

# Browser detection for incompatibility checks
gem "browser", "~> 6.2.0"
Expand Down Expand Up @@ -191,7 +191,7 @@ gem "puma", "~> 6.5"
gem "puma-plugin-statsd", "~> 2.0"
gem "rack-timeout", "~> 0.7.0", require: "rack/timeout/base"

gem "nokogiri", "~> 1.17.0"
gem "nokogiri", "~> 1.18.1"

gem "carrierwave", "~> 1.3.4"
gem "carrierwave_direct", "~> 2.1.0"
Expand All @@ -218,7 +218,7 @@ gem "dry-monads"
gem "dry-validation"

# ActiveRecord extension which adds typecasting to store accessors
gem "store_attribute", "~> 1.0"
gem "store_attribute", "~> 2.0"

# Appsignal integration
gem "appsignal", "~> 3.10.0", require: false
Expand Down Expand Up @@ -278,6 +278,7 @@ group :test do
gem "capybara_accessible_selectors", git: "https://github.com/citizensadvice/capybara_accessible_selectors", tag: "v0.12.0"
gem "capybara-screenshot", "~> 1.0.17"
gem "cuprite", "~> 0.15.0"
gem "ferrum", github: "toy/ferrum", ref: "mouse-events-buttons-property-0.15"
gem "rspec-wait"
gem "selenium-devtools"
gem "selenium-webdriver", "~> 4.20"
Expand Down Expand Up @@ -333,8 +334,9 @@ group :development, :test do
# Output a stack trace anytime, useful when a process is stuck
gem "rbtrace"

# REPL with debug commands
gem "debug"
# REPL with debug commands, Debug changed to byebug due to the issue below
# https://github.com/puma/puma/issues/2835#issuecomment-2302133927
gem "byebug"

gem "pry-byebug", "~> 3.10.0", platforms: [:mri]
gem "pry-doc"
Expand All @@ -356,7 +358,7 @@ group :development, :test do
gem "erblint-github", require: false

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

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

gem "openproject-octicons", "~>19.20.0 "
gem "openproject-octicons_helper", "~>19.20.0 "
gem "openproject-primer_view_components", "~>0.51.0"
gem "openproject-primer_view_components", "~>0.52.0"
Loading

0 comments on commit 1c1ef2c

Please sign in to comment.