From 4c61433f691e936552e210c50707ac730c01239a Mon Sep 17 00:00:00 2001 From: Birthe Lindenthal Date: Wed, 6 Mar 2024 14:40:23 +0100 Subject: [PATCH 1/4] Adding info about GitLab plugin (#14933) --- docs/system-admin-guide/integrations/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/system-admin-guide/integrations/README.md b/docs/system-admin-guide/integrations/README.md index 836d6ded258f..4ce963c06477 100644 --- a/docs/system-admin-guide/integrations/README.md +++ b/docs/system-admin-guide/integrations/README.md @@ -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 From 7d28db8e39591599b6dbbeb0b5ef79a90c78fa9b Mon Sep 17 00:00:00 2001 From: Christophe Bliard Date: Wed, 6 Mar 2024 17:28:58 +0100 Subject: [PATCH 2/4] Link error to current appsignal transaction if available Using `send_error` will always create a new transaction with a random request id, which is different from the real request id of the current web request and being present in log files. Using set_error instead will link the error to the current transaction, adding a lot of extra context information to the error in the AppSignal web app like the correct request_id. --- lib_static/open_project/appsignal.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib_static/open_project/appsignal.rb b/lib_static/open_project/appsignal.rb index bf4b1b86d3d0..5e08cf028efe 100644 --- a/lib_static/open_project/appsignal.rb +++ b/lib_static/open_project/appsignal.rb @@ -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}" From 57782f33f98ce2f4f3751a0e32560d5cd8b30cee Mon Sep 17 00:00:00 2001 From: Markus Kahl Date: Tue, 5 Mar 2024 11:11:32 +0000 Subject: [PATCH 3/4] trigger continuous delivery for stable images --- .github/workflows/continuous-delivery.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/continuous-delivery.yml b/.github/workflows/continuous-delivery.yml index b8554bbbf4bc..8edb554946b7 100644 --- a/.github/workflows/continuous-delivery.yml +++ b/.github/workflows/continuous-delivery.yml @@ -4,6 +4,7 @@ on: branches: - dev - release/* + - stable/* permissions: contents: read From f65f12c829793e72873c0c3547e4de47f8a01cf4 Mon Sep 17 00:00:00 2001 From: OpenProject Actions CI Date: Thu, 7 Mar 2024 03:10:41 +0000 Subject: [PATCH 4/4] update locales from crowdin [ci skip] --- modules/storages/config/locales/crowdin/ms.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/storages/config/locales/crowdin/ms.yml b/modules/storages/config/locales/crowdin/ms.yml index c3e8eb5ef927..68ba5ee0f96f 100644 --- a/modules/storages/config/locales/crowdin/ms.yml +++ b/modules/storages/config/locales/crowdin/ms.yml @@ -4,10 +4,10 @@ ms: storages/file_link: origin_id: Origin Id storages/storage: - creator: Creator + creator: Pencipta drive: Drive ID host: Host - name: Name + name: Nama provider_type: Provider type tenant: Directory (tenant) ID errors: @@ -34,17 +34,17 @@ ms: invalid_password: is not valid. unknown_error: could not be validated. Please check your storage connection and try again. models: - file_link: File + file_link: Fail storages/storage: Storage api_v3: errors: too_many_elements_created_at_once: Too many elements created at once. Expected %{max} at most, got %{actual}. - permission_create_files: Create files - permission_delete_files: Delete files + permission_create_files: Cipta fail + permission_delete_files: Padam fail permission_manage_file_links: Manage file links permission_manage_storages_in_project: Manage file storages in project - permission_read_files: Read files - permission_share_files: Share files + permission_read_files: Baca fail + permission_share_files: Kongsi fail permission_view_file_links: View file links permission_write_files: Write files project_module_storages: File storages @@ -54,7 +54,7 @@ ms: done_complete_setup: Done, complete setup done_continue: Done, continue replace_provider_type_oauth: Replace %{provider_type} OAuth - save_and_continue: Save and continue + save_and_continue: Simpan dan teruskan select_folder: Select folder configuration_checks: oauth_client_incomplete: