Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release/13.3' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
oliverguenther committed Mar 7, 2024
2 parents 78a2311 + f65f12c commit 66e3198
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
1 change: 1 addition & 0 deletions .github/workflows/continuous-delivery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
branches:
- dev
- release/*
- stable/*
permissions:
contents: read

Expand Down
4 changes: 2 additions & 2 deletions docs/system-admin-guide/integrations/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ Find out more about the [Excel synchronization with OpenProject](./excel-synchro

OpenProject offers a basic GitHub integration. You will find more information about the GitHub integration in our [GitHub integration guideline](./github-integration/).

## Gitlab
## GitLab

There is a Gitlab plugin from the community. You will find the README and the code [here](https://github.com/btey/openproject-gitlab-integration).
There is a GitLab plugin from the Community. You will find the README and the code [here](https://github.com/btey/openproject-gitlab-integration). We are currently working on integrating the plugin into the OpenProject core with [#23673](https://community.openproject.org/projects/openproject/work_packages/23673/activity).

## Jira

Expand Down
10 changes: 8 additions & 2 deletions lib_static/open_project/appsignal.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,14 @@ def enabled?

def exception_handler(message, log_context = {})
if (exception = log_context[:exception])
::Appsignal.send_error(exception) do |transaction|
transaction.set_tags tags(log_context)
if Appsignal::Transaction.current?
::Appsignal.set_error(exception) do |transaction|
transaction.set_tags tags(log_context)
end
else
::Appsignal.send_error(exception) do |transaction|
transaction.set_tags tags(log_context)
end
end
else
Rails.logger.warn "Ignoring non-exception message for appsignal #{message.inspect}"
Expand Down

0 comments on commit 66e3198

Please sign in to comment.