Skip to content

Commit

Permalink
Merge branch 'dev' into merge-release/14.2-20240625033437
Browse files Browse the repository at this point in the history
  • Loading branch information
dombesz authored Jun 25, 2024
2 parents c7fb674 + aad5774 commit 9d3b725
Show file tree
Hide file tree
Showing 979 changed files with 9,752 additions and 7,260 deletions.
1 change: 1 addition & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ f3c99ee5dded81ad55f2b6f3706216d5fa765677
9e4934cd0a468f46d8f0fc0f11ebc2d4216f789c
6678cab48d443b5782fa93b171d62093819ee4fc
fa5d03eae00bc8931f99598a74ffd76e0cbca3da
b10e6d718cc49e3574837d97fab268e3ecb3fcbd
2 changes: 1 addition & 1 deletion .github/workflows/danger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: '3.3.2'
ruby-version: '3.3.3'
- uses: MeilCli/danger-action@v5
with:
danger_file: 'Dangerfile'
Expand Down
1 change: 0 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ require:
- rubocop-capybara
- rubocop-factory_bot
- rubocop-performance
- rubocop-inflector
- ./config/initializers/inflections.rb

<% if File.exist?('.rubocop-local.yml') %>
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.2
3.3.3
24 changes: 13 additions & 11 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ gem "will_paginate", "~> 4.0.0"

gem "friendly_id", "~> 5.5.0"

gem "acts_as_list", "~> 1.1.0"
gem "acts_as_list", "~> 1.2.0"
gem "acts_as_tree", "~> 2.9.0"
gem "awesome_nested_set", "~> 3.6.0"
gem "closure_tree", "~> 7.4.0"
Expand Down Expand Up @@ -93,7 +93,7 @@ gem "deckar01-task_list", "~> 2.3.1"
# Requires escape-utils for faster escaping
gem "escape_utils", "~> 1.3"
# Syntax highlighting used in html-pipeline with rouge
gem "rouge", "~> 4.2.0"
gem "rouge", "~> 4.3.0"
# HTML sanitization used for html-pipeline
gem "sanitize", "~> 6.1.0"
# HTML autolinking for mails and urls (replaces autolink)
Expand All @@ -107,7 +107,7 @@ gem "svg-graph", "~> 2.2.0"

gem "date_validator", "~> 0.12.0"
gem "email_validator", "~> 2.2.3"
gem "json_schemer", "~> 2.2.0"
gem "json_schemer", "~> 2.3.0"
gem "ruby-duration", "~> 3.2.0"

# `config/initializers/mail_starttls_patch.rb` has also been patched to
Expand All @@ -118,7 +118,7 @@ gem "mail", "= 2.8.1"
gem "csv", "~> 3.3"

# provide compatible filesystem information for available storage
gem "sys-filesystem", "~> 1.4.0", require: false
gem "sys-filesystem", "~> 1.5.0", require: false

gem "bcrypt", "~> 3.1.6"

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: "8f14736a88ad0064d2a97be108fe7061ffbcee91"
gem "md_to_pdf", git: "https://github.com/opf/md-to-pdf", ref: "8772c791a21819751c0d111be903b3b44ef7d862"
gem "prawn", "~> 2.4"
gem "ttfunk", "~> 1.7.0" # remove after https://github.com/prawnpdf/prawn/issues/1346 resolved.

Expand All @@ -182,7 +182,7 @@ gem "i18n-js", "~> 4.2.3"
gem "rails-i18n", "~> 7.0.0"

gem "sprockets", "~> 3.7.2" # lock sprockets below 4.0
gem "sprockets-rails", "~> 3.4.2"
gem "sprockets-rails", "~> 3.5.1"

gem "puma", "~> 6.4"
gem "puma-plugin-statsd", "~> 2.0"
Expand All @@ -204,7 +204,7 @@ gem "plaintext", "~> 0.3.2"

gem "ruby-progressbar", "~> 1.13.0", require: false

gem "mini_magick", "~> 4.12.0", require: false
gem "mini_magick", "~> 4.13.0", require: false

gem "validate_url"

Expand Down Expand Up @@ -328,10 +328,12 @@ group :development, :test do

# ruby linting
gem "rubocop", require: false
gem "rubocop-inflector", require: false
gem "rubocop-capybara", require: false
gem "rubocop-factory_bot", require: false
gem "rubocop-performance", require: false
gem "rubocop-rails", require: false
gem "rubocop-rspec", require: false
gem "rubocop-rspec_rails", require: false

# erb linting
gem "erb_lint", require: false
Expand Down Expand Up @@ -386,6 +388,6 @@ gemfiles.each do |file|
send(:eval_gemfile, file) if File.readable?(file)
end

gem "openproject-octicons", "~>19.14.0"
gem "openproject-octicons_helper", "~>19.14.0"
gem "openproject-primer_view_components", "~>0.33.1"
gem "openproject-octicons", "~>19.14.1"
gem "openproject-octicons_helper", "~>19.14.1"
gem "openproject-primer_view_components", "~>0.35.2"
Loading

0 comments on commit 9d3b725

Please sign in to comment.