Skip to content

Commit

Permalink
Merge branch 'dev' into tests/activities_spec
Browse files Browse the repository at this point in the history
  • Loading branch information
akabiru authored Dec 3, 2024
2 parents f0b6ae2 + 0a80d13 commit dac0dde
Show file tree
Hide file tree
Showing 824 changed files with 18,804 additions and 4,900 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ jobs:
needs: [setup, build, merge]
permissions:
contents: none
if: ${{ github.repository == 'opf/openproject' && inputs.tag != '' }}
if: ${{ github.repository == 'opf/openproject' }}
runs-on: ubuntu-latest
steps:
- name: Trigger Helm charts release
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/email-notification.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Send mail
uses: dawidd6/action-send-mail@v3
uses: dawidd6/action-send-mail@v4
with:
subject: ${{ inputs.subject }}
body: ${{ inputs.body }}
Expand Down
16 changes: 8 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ ruby File.read(File.expand_path(".ruby-version", __dir__)).strip

gem "actionpack-xml_parser", "~> 2.0.0"
gem "activemodel-serializers-xml", "~> 1.0.1"
gem "activerecord-import", "~> 1.7.0"
gem "activerecord-import", "~> 1.8.0"
gem "activerecord-session_store", "~> 2.1.0"
gem "ox"
gem "rails", "~> 7.1.3"
Expand All @@ -46,7 +46,7 @@ gem "ffi", "~> 1.15"

gem "rdoc", ">= 2.4.2"

gem "doorkeeper", "~> 5.7.0"
gem "doorkeeper", "~> 5.8.0"
# Maintain our own omniauth due to relative URL root issues
# see upstream PR: https://github.com/omniauth/omniauth/pull/903
gem "omniauth", git: "https://github.com/opf/omniauth", ref: "fe862f986b2e846e291784d2caa3d90a658c67f0"
Expand All @@ -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.7.0"
gem "awesome_nested_set", "~> 3.8.0"
gem "closure_tree", "~> 7.4.0"
gem "rubytree", "~> 2.1.0"
# Only used in down migrations now.
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.4.0"
gem "rouge", "~> 4.5.1"
# HTML sanitization used for html-pipeline
gem "sanitize", "~> 6.1.0"
# HTML autolinking for mails and urls (replaces autolink)
Expand Down Expand Up @@ -140,7 +140,7 @@ gem "rack-attack", "~> 6.7.0"
gem "secure_headers", "~> 7.0.0"

# Browser detection for incompatibility checks
gem "browser", "~> 6.0.0"
gem "browser", "~> 6.1.0"

# Providing health checks
gem "okcomputer", "~> 1.18.1"
Expand Down Expand Up @@ -184,7 +184,7 @@ gem "rails-i18n", "~> 7.0.0"
gem "sprockets", "~> 3.7.2" # lock sprockets below 4.0
gem "sprockets-rails", "~> 3.5.1"

gem "puma", "~> 6.4"
gem "puma", "~> 6.5"
gem "puma-plugin-statsd", "~> 2.0"
gem "rack-timeout", "~> 0.7.0", require: "rack/timeout/base"

Expand Down Expand Up @@ -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", "~> 7.0.0", group: :development
gem "rspec-rails", "~> 7.1.0", group: :development

# Retry failures within the same environment
gem "retriable", "~> 3.1.1"
Expand Down Expand Up @@ -400,4 +400,4 @@ end

gem "openproject-octicons", "~>19.19.0"
gem "openproject-octicons_helper", "~>19.19.0"
gem "openproject-primer_view_components", "~>0.48.2"
gem "openproject-primer_view_components", "~>0.49.2"
Loading

0 comments on commit dac0dde

Please sign in to comment.