From 9c2f756859facc458b721f8348fd355a837484b6 Mon Sep 17 00:00:00 2001 From: Tan Nguyen Date: Wed, 22 May 2024 20:19:19 +0700 Subject: [PATCH 01/17] feat: add default pipeline action to test webhook --- lang/en/app.php | 2 ++ lang/en/events/gitlab/pipeline.php | 5 +++++ lang/vi/app.php | 2 ++ .../views/events/gitlab/pipeline/default.blade.php | 14 ++++++++++++++ 4 files changed, 23 insertions(+) create mode 100644 lang/en/events/gitlab/pipeline.php create mode 100644 resources/views/events/gitlab/pipeline/default.blade.php diff --git a/lang/en/app.php b/lang/en/app.php index c255c52..c1d2b97 100644 --- a/lang/en/app.php +++ b/lang/en/app.php @@ -9,4 +9,6 @@ 'title' => 'Title', 'state' => 'State', 'confidential' => 'Confidential', + 'status' => 'Status', + 'link' => 'Link', ]; diff --git a/lang/en/events/gitlab/pipeline.php b/lang/en/events/gitlab/pipeline.php new file mode 100644 index 0000000..984452d --- /dev/null +++ b/lang/en/events/gitlab/pipeline.php @@ -0,0 +1,5 @@ + 'Here is the default message for pipeline', +]; diff --git a/lang/vi/app.php b/lang/vi/app.php index bb91a54..f10e8f7 100644 --- a/lang/vi/app.php +++ b/lang/vi/app.php @@ -9,4 +9,6 @@ 'title' => 'Tiêu đề', 'state' => 'Trạng thái', 'confidential' => 'Bí mật', + 'status' => 'Trạng thái', + 'link' => 'Liên kết', ]; diff --git a/resources/views/events/gitlab/pipeline/default.blade.php b/resources/views/events/gitlab/pipeline/default.blade.php new file mode 100644 index 0000000..42777b6 --- /dev/null +++ b/resources/views/events/gitlab/pipeline/default.blade.php @@ -0,0 +1,14 @@ + +🔥 {{ __('tg-notifier::events/gitlab/merge_request.default') }} + +🛠 {{ $payload->project->path_with_namespace }} +🌳 {{ __('tg-notifier::app.branch') }}: {{ $payload->object_attributes->ref }} +📝 {{ __('tg-notifier::app.commit') }}: {{ $payload->commit->message }} +🔗 {{ __('tg-notifier::app.link') }}: {{ $payload->commit->id }} +🚦 {{ __('tg-notifier::app.status') }}: {{ $payload->object_attributes->status }} From ebb3dfa535d9e651cd295a889859c22fe3c90dcd Mon Sep 17 00:00:00 2001 From: Tan Nguyen Date: Wed, 22 May 2024 20:30:18 +0700 Subject: [PATCH 02/17] fix: add translations for gitlab events --- lang/de/app.php | 4 ++++ lang/ja/app.php | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/lang/de/app.php b/lang/de/app.php index bdbfe1f..c1d2b97 100644 --- a/lang/de/app.php +++ b/lang/de/app.php @@ -7,4 +7,8 @@ 'branch' => 'Branch', 'commit' => 'Commit', 'title' => 'Title', + 'state' => 'State', + 'confidential' => 'Confidential', + 'status' => 'Status', + 'link' => 'Link', ]; diff --git a/lang/ja/app.php b/lang/ja/app.php index bdbfe1f..c1d2b97 100644 --- a/lang/ja/app.php +++ b/lang/ja/app.php @@ -7,4 +7,8 @@ 'branch' => 'Branch', 'commit' => 'Commit', 'title' => 'Title', + 'state' => 'State', + 'confidential' => 'Confidential', + 'status' => 'Status', + 'link' => 'Link', ]; From 315301755eae00b658ae78b297c31dd04e17a895 Mon Sep 17 00:00:00 2001 From: Tan Nguyen Date: Wed, 22 May 2024 21:03:45 +0700 Subject: [PATCH 03/17] feat: update translations for pipeline gitlab --- lang/de/app.php | 1 + lang/de/events/gitlab/pipeline.php | 5 +++++ lang/en/app.php | 1 + lang/en/events/gitlab/pipeline.php | 2 +- lang/ja/app.php | 1 + lang/ja/events/gitlab/pipeline.php | 5 +++++ lang/vi/app.php | 1 + lang/vi/events/gitlab/pipeline.php | 5 +++++ resources/views/events/gitlab/pipeline/default.blade.php | 9 +++++---- 9 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 lang/de/events/gitlab/pipeline.php create mode 100644 lang/ja/events/gitlab/pipeline.php create mode 100644 lang/vi/events/gitlab/pipeline.php diff --git a/lang/de/app.php b/lang/de/app.php index c1d2b97..0d435ec 100644 --- a/lang/de/app.php +++ b/lang/de/app.php @@ -11,4 +11,5 @@ 'confidential' => 'Confidential', 'status' => 'Status', 'link' => 'Link', + 'repo' => 'Repository', ]; diff --git a/lang/de/events/gitlab/pipeline.php b/lang/de/events/gitlab/pipeline.php new file mode 100644 index 0000000..3bf4f22 --- /dev/null +++ b/lang/de/events/gitlab/pipeline.php @@ -0,0 +1,5 @@ + 'Pipeline Status Update', +]; diff --git a/lang/en/app.php b/lang/en/app.php index c1d2b97..0d435ec 100644 --- a/lang/en/app.php +++ b/lang/en/app.php @@ -11,4 +11,5 @@ 'confidential' => 'Confidential', 'status' => 'Status', 'link' => 'Link', + 'repo' => 'Repository', ]; diff --git a/lang/en/events/gitlab/pipeline.php b/lang/en/events/gitlab/pipeline.php index 984452d..3bf4f22 100644 --- a/lang/en/events/gitlab/pipeline.php +++ b/lang/en/events/gitlab/pipeline.php @@ -1,5 +1,5 @@ 'Here is the default message for pipeline', + 'title' => 'Pipeline Status Update', ]; diff --git a/lang/ja/app.php b/lang/ja/app.php index c1d2b97..0d435ec 100644 --- a/lang/ja/app.php +++ b/lang/ja/app.php @@ -11,4 +11,5 @@ 'confidential' => 'Confidential', 'status' => 'Status', 'link' => 'Link', + 'repo' => 'Repository', ]; diff --git a/lang/ja/events/gitlab/pipeline.php b/lang/ja/events/gitlab/pipeline.php new file mode 100644 index 0000000..3bf4f22 --- /dev/null +++ b/lang/ja/events/gitlab/pipeline.php @@ -0,0 +1,5 @@ + 'Pipeline Status Update', +]; diff --git a/lang/vi/app.php b/lang/vi/app.php index f10e8f7..d09650c 100644 --- a/lang/vi/app.php +++ b/lang/vi/app.php @@ -11,4 +11,5 @@ 'confidential' => 'Bí mật', 'status' => 'Trạng thái', 'link' => 'Liên kết', + 'repo' => 'Kho', ]; diff --git a/lang/vi/events/gitlab/pipeline.php b/lang/vi/events/gitlab/pipeline.php new file mode 100644 index 0000000..a7f39a1 --- /dev/null +++ b/lang/vi/events/gitlab/pipeline.php @@ -0,0 +1,5 @@ + 'Cập nhật trạng thái Pipeline', +]; diff --git a/resources/views/events/gitlab/pipeline/default.blade.php b/resources/views/events/gitlab/pipeline/default.blade.php index 42777b6..1f3ed23 100644 --- a/resources/views/events/gitlab/pipeline/default.blade.php +++ b/resources/views/events/gitlab/pipeline/default.blade.php @@ -5,10 +5,11 @@ */ ?> -🔥 {{ __('tg-notifier::events/gitlab/merge_request.default') }} -🛠 {{ $payload->project->path_with_namespace }} +🦊 {{ __('tg-notifier::events/gitlab/pipeline.title') }} 🔥 + +🚀 {{ __('tg-notifier::app.repo') }}: {{ $payload->project->path_with_namespace }} 🌳 {{ __('tg-notifier::app.branch') }}: {{ $payload->object_attributes->ref }} -📝 {{ __('tg-notifier::app.commit') }}: {{ $payload->commit->message }} +💻 {{ __('tg-notifier::app.commit') }}: {{ $payload->commit->message }} 🔗 {{ __('tg-notifier::app.link') }}: {{ $payload->commit->id }} -🚦 {{ __('tg-notifier::app.status') }}: {{ $payload->object_attributes->status }} +🚦 {{ __('tg-notifier::app.status') }}: Pipeline {{ $payload->object_attributes->status }} ⏱️ {{ $payload->object_attributes->duration }}s From 08df976422340d2666c4eb4ad8d6708ec2043e15 Mon Sep 17 00:00:00 2001 From: Tan Nguyen Date: Wed, 22 May 2024 21:21:11 +0700 Subject: [PATCH 04/17] fix: update pipeline gitlab event --- lang/de/app.php | 4 ++++ lang/en/app.php | 4 ++++ lang/ja/app.php | 4 ++++ lang/vi/app.php | 4 ++++ resources/views/events/gitlab/pipeline/default.blade.php | 3 ++- 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/lang/de/app.php b/lang/de/app.php index 0d435ec..c2f7819 100644 --- a/lang/de/app.php +++ b/lang/de/app.php @@ -12,4 +12,8 @@ 'status' => 'Status', 'link' => 'Link', 'repo' => 'Repository', + 'author' => [ + 'name' => 'Name', + 'email' => 'Email', + ] ]; diff --git a/lang/en/app.php b/lang/en/app.php index 0d435ec..c2f7819 100644 --- a/lang/en/app.php +++ b/lang/en/app.php @@ -12,4 +12,8 @@ 'status' => 'Status', 'link' => 'Link', 'repo' => 'Repository', + 'author' => [ + 'name' => 'Name', + 'email' => 'Email', + ] ]; diff --git a/lang/ja/app.php b/lang/ja/app.php index 0d435ec..c2f7819 100644 --- a/lang/ja/app.php +++ b/lang/ja/app.php @@ -12,4 +12,8 @@ 'status' => 'Status', 'link' => 'Link', 'repo' => 'Repository', + 'author' => [ + 'name' => 'Name', + 'email' => 'Email', + ] ]; diff --git a/lang/vi/app.php b/lang/vi/app.php index d09650c..da06909 100644 --- a/lang/vi/app.php +++ b/lang/vi/app.php @@ -12,4 +12,8 @@ 'status' => 'Trạng thái', 'link' => 'Liên kết', 'repo' => 'Kho', + 'author' => [ + 'name' => 'Tên', + 'email' => 'Email', + ] ]; diff --git a/resources/views/events/gitlab/pipeline/default.blade.php b/resources/views/events/gitlab/pipeline/default.blade.php index 1f3ed23..46162d2 100644 --- a/resources/views/events/gitlab/pipeline/default.blade.php +++ b/resources/views/events/gitlab/pipeline/default.blade.php @@ -10,6 +10,7 @@ 🚀 {{ __('tg-notifier::app.repo') }}: {{ $payload->project->path_with_namespace }} 🌳 {{ __('tg-notifier::app.branch') }}: {{ $payload->object_attributes->ref }} +👤 {{ __('tg-notifier::app.author.name') }}: {{ $payload->commit->author->name }} 💻 {{ __('tg-notifier::app.commit') }}: {{ $payload->commit->message }} 🔗 {{ __('tg-notifier::app.link') }}: {{ $payload->commit->id }} -🚦 {{ __('tg-notifier::app.status') }}: Pipeline {{ $payload->object_attributes->status }} ⏱️ {{ $payload->object_attributes->duration }}s +🚦 {{ __('tg-notifier::app.status') }}: Pipeline {{ $payload->object_attributes->status }} {{ $payload->object_attributes->duration ? "⏱️ {$payload->object_attributes->duration}s" : '' }} From 00978c80a770a223e0da6bbc281eb6cd93cf75d1 Mon Sep 17 00:00:00 2001 From: Tan Nguyen Date: Wed, 22 May 2024 21:22:24 +0700 Subject: [PATCH 05/17] fix: style code --- lang/de/app.php | 2 +- lang/en/app.php | 2 +- lang/ja/app.php | 2 +- lang/vi/app.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/de/app.php b/lang/de/app.php index c2f7819..e78618e 100644 --- a/lang/de/app.php +++ b/lang/de/app.php @@ -15,5 +15,5 @@ 'author' => [ 'name' => 'Name', 'email' => 'Email', - ] + ], ]; diff --git a/lang/en/app.php b/lang/en/app.php index c2f7819..e78618e 100644 --- a/lang/en/app.php +++ b/lang/en/app.php @@ -15,5 +15,5 @@ 'author' => [ 'name' => 'Name', 'email' => 'Email', - ] + ], ]; diff --git a/lang/ja/app.php b/lang/ja/app.php index c2f7819..e78618e 100644 --- a/lang/ja/app.php +++ b/lang/ja/app.php @@ -15,5 +15,5 @@ 'author' => [ 'name' => 'Name', 'email' => 'Email', - ] + ], ]; diff --git a/lang/vi/app.php b/lang/vi/app.php index da06909..d1a49a0 100644 --- a/lang/vi/app.php +++ b/lang/vi/app.php @@ -15,5 +15,5 @@ 'author' => [ 'name' => 'Tên', 'email' => 'Email', - ] + ], ]; From 446e54a0e0e200dd73739a42e109ec5be6886950 Mon Sep 17 00:00:00 2001 From: Tan Nguyen Date: Thu, 23 May 2024 01:28:46 +0700 Subject: [PATCH 06/17] fix: update pipeline gitlab event --- resources/views/events/gitlab/pipeline/default.blade.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/views/events/gitlab/pipeline/default.blade.php b/resources/views/events/gitlab/pipeline/default.blade.php index 46162d2..8242a5c 100644 --- a/resources/views/events/gitlab/pipeline/default.blade.php +++ b/resources/views/events/gitlab/pipeline/default.blade.php @@ -11,6 +11,5 @@ 🚀 {{ __('tg-notifier::app.repo') }}: {{ $payload->project->path_with_namespace }} 🌳 {{ __('tg-notifier::app.branch') }}: {{ $payload->object_attributes->ref }} 👤 {{ __('tg-notifier::app.author.name') }}: {{ $payload->commit->author->name }} -💻 {{ __('tg-notifier::app.commit') }}: {{ $payload->commit->message }} -🔗 {{ __('tg-notifier::app.link') }}: {{ $payload->commit->id }} +💻 {{ __('tg-notifier::app.commit') }}: {{ $payload->commit->message }} 🚦 {{ __('tg-notifier::app.status') }}: Pipeline {{ $payload->object_attributes->status }} {{ $payload->object_attributes->duration ? "⏱️ {$payload->object_attributes->duration}s" : '' }} From 5d74a58c35fe6fad259dd6461226ced8adc0907b Mon Sep 17 00:00:00 2001 From: Tan Nguyen Date: Thu, 23 May 2024 01:50:36 +0700 Subject: [PATCH 07/17] feat: add job gitlab event --- lang/de/events/gitlab/job.php | 6 ++++++ lang/en/events/gitlab/job.php | 6 ++++++ lang/ja/events/gitlab/job.php | 6 ++++++ lang/vi/events/gitlab/job.php | 7 +++++++ .../views/events/gitlab/job/default.blade.php | 16 ++++++++++++++++ 5 files changed, 41 insertions(+) create mode 100644 lang/de/events/gitlab/job.php create mode 100644 lang/en/events/gitlab/job.php create mode 100644 lang/ja/events/gitlab/job.php create mode 100644 lang/vi/events/gitlab/job.php create mode 100644 resources/views/events/gitlab/job/default.blade.php diff --git a/lang/de/events/gitlab/job.php b/lang/de/events/gitlab/job.php new file mode 100644 index 0000000..24f5c27 --- /dev/null +++ b/lang/de/events/gitlab/job.php @@ -0,0 +1,6 @@ + 'Update Job Status', + 'name' => 'Job Name', +]; diff --git a/lang/en/events/gitlab/job.php b/lang/en/events/gitlab/job.php new file mode 100644 index 0000000..24f5c27 --- /dev/null +++ b/lang/en/events/gitlab/job.php @@ -0,0 +1,6 @@ + 'Update Job Status', + 'name' => 'Job Name', +]; diff --git a/lang/ja/events/gitlab/job.php b/lang/ja/events/gitlab/job.php new file mode 100644 index 0000000..24f5c27 --- /dev/null +++ b/lang/ja/events/gitlab/job.php @@ -0,0 +1,6 @@ + 'Update Job Status', + 'name' => 'Job Name', +]; diff --git a/lang/vi/events/gitlab/job.php b/lang/vi/events/gitlab/job.php new file mode 100644 index 0000000..c9016c6 --- /dev/null +++ b/lang/vi/events/gitlab/job.php @@ -0,0 +1,7 @@ + + 'Cập nhật trạng thái Job', + 'name' => 'Ten Job', +]; diff --git a/resources/views/events/gitlab/job/default.blade.php b/resources/views/events/gitlab/job/default.blade.php new file mode 100644 index 0000000..85edae5 --- /dev/null +++ b/resources/views/events/gitlab/job/default.blade.php @@ -0,0 +1,16 @@ + + +🛸 {{ __('tg-notifier::events/gitlab/job.title') }} 🦊 + +🚀 {{ __('tg-notifier::app.repo') }}: {{ $payload->project->path_with_namespace }} +🛸 {{ __('tg-notifier::events/gitlab/job.name') }}: {{ $payload->build_name }} +🌳 {{ __('tg-notifier::app.branch') }}: {{ $payload->project->default_branch }} +👤 {{ __('tg-notifier::app.author.name') }}: {{ $payload->commit->author_name }} +💻 {{ __('tg-notifier::app.commit') }}: {{ $payload->commit->message }} +🚦 {{ __('tg-notifier::app.status') }}: {{ $payload->build_status }} From 6ca327020620f9111e0bde35dcc6d2bd764f1f04 Mon Sep 17 00:00:00 2001 From: Tan Nguyen Date: Thu, 23 May 2024 02:04:42 +0700 Subject: [PATCH 08/17] feat: create empty blade for deployment default action --- resources/views/events/gitlab/deployment/default.blade.php | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 resources/views/events/gitlab/deployment/default.blade.php diff --git a/resources/views/events/gitlab/deployment/default.blade.php b/resources/views/events/gitlab/deployment/default.blade.php new file mode 100644 index 0000000..5f271e1 --- /dev/null +++ b/resources/views/events/gitlab/deployment/default.blade.php @@ -0,0 +1,7 @@ + From bd7c345c278279dd70dcf965c5faab3f74ee6b6c Mon Sep 17 00:00:00 2001 From: tanhongit Date: Wed, 22 May 2024 19:05:03 +0000 Subject: [PATCH 09/17] Fix styling --- resources/views/events/gitlab/deployment/default.blade.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/views/events/gitlab/deployment/default.blade.php b/resources/views/events/gitlab/deployment/default.blade.php index 5f271e1..5fd5873 100644 --- a/resources/views/events/gitlab/deployment/default.blade.php +++ b/resources/views/events/gitlab/deployment/default.blade.php @@ -3,5 +3,3 @@ * @var object $payload * @var string $event */ - -?> From 29858fbd5a872571d5659ab088d7ad194b9b5e2d Mon Sep 17 00:00:00 2001 From: Tan Nguyen Date: Thu, 23 May 2024 02:35:36 +0700 Subject: [PATCH 10/17] fix: ensure dependent packages to install --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 78eebf6..2a0f6c7 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ }, "require": { "php": "^8.1", - "cslant/telegram-git-notifier": "^v1.3" + "cslant/telegram-git-notifier": "^v1.4" }, "require-dev": { "friendsofphp/php-cs-fixer": "^v3.0", From 36afbd7f6547ee677fc54fc901bd38464ef49806 Mon Sep 17 00:00:00 2001 From: Tan Nguyen Date: Thu, 23 May 2024 02:47:12 +0700 Subject: [PATCH 11/17] update php version for scrutinize --- .scrutinizer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scrutinizer.yml b/.scrutinizer.yml index dcc939f..cfd0325 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -7,7 +7,7 @@ build: override: [ php-scrutinizer-run ] environment: php: - version: 8.0 + version: 8.3 checks: php: From 0e0ac005407e25120a6a601bb2455fe90a4ef8f2 Mon Sep 17 00:00:00 2001 From: Tan Nguyen Date: Thu, 23 May 2024 02:51:06 +0700 Subject: [PATCH 12/17] update php version for scrutinize --- .scrutinizer.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.scrutinizer.yml b/.scrutinizer.yml index cfd0325..6b608d7 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -5,9 +5,6 @@ build: override: true tests: override: [ php-scrutinizer-run ] - environment: - php: - version: 8.3 checks: php: From 10ab9559ca5298b9088dd38cba10e9d9c1fefcc3 Mon Sep 17 00:00:00 2001 From: Tan Nguyen Date: Thu, 23 May 2024 02:52:48 +0700 Subject: [PATCH 13/17] revert php version for scrutinize --- .scrutinizer.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 6b608d7..dcc939f 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -5,6 +5,9 @@ build: override: true tests: override: [ php-scrutinizer-run ] + environment: + php: + version: 8.0 checks: php: From 7385700016a0e3c013bf1c42d4c43e004b2b17e6 Mon Sep 17 00:00:00 2001 From: Tan Nguyen Date: Thu, 23 May 2024 18:50:57 +0700 Subject: [PATCH 14/17] update some view template and translation for gitlab events --- lang/vi/events/gitlab/job.php | 5 ++--- resources/views/events/gitlab/deployment/default.blade.php | 2 ++ resources/views/events/gitlab/pipeline/default.blade.php | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lang/vi/events/gitlab/job.php b/lang/vi/events/gitlab/job.php index c9016c6..5b4ac10 100644 --- a/lang/vi/events/gitlab/job.php +++ b/lang/vi/events/gitlab/job.php @@ -1,7 +1,6 @@ - 'Cập nhật trạng thái Job', - 'name' => 'Ten Job', + 'title' => 'Cập nhật trạng thái của Job', + 'name' => 'Tên Job', ]; diff --git a/resources/views/events/gitlab/deployment/default.blade.php b/resources/views/events/gitlab/deployment/default.blade.php index 5fd5873..5f271e1 100644 --- a/resources/views/events/gitlab/deployment/default.blade.php +++ b/resources/views/events/gitlab/deployment/default.blade.php @@ -3,3 +3,5 @@ * @var object $payload * @var string $event */ + +?> diff --git a/resources/views/events/gitlab/pipeline/default.blade.php b/resources/views/events/gitlab/pipeline/default.blade.php index 8242a5c..cc7dc84 100644 --- a/resources/views/events/gitlab/pipeline/default.blade.php +++ b/resources/views/events/gitlab/pipeline/default.blade.php @@ -6,7 +6,7 @@ ?> -🦊 {{ __('tg-notifier::events/gitlab/pipeline.title') }} 🔥 +🛰 {{ __('tg-notifier::events/gitlab/pipeline.title') }} 🦊 🚀 {{ __('tg-notifier::app.repo') }}: {{ $payload->project->path_with_namespace }} 🌳 {{ __('tg-notifier::app.branch') }}: {{ $payload->object_attributes->ref }} From 063503fc54efab45739a06aa57629971d15f2ed2 Mon Sep 17 00:00:00 2001 From: tanhongit Date: Thu, 23 May 2024 11:51:19 +0000 Subject: [PATCH 15/17] Fix styling --- resources/views/events/gitlab/deployment/default.blade.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/views/events/gitlab/deployment/default.blade.php b/resources/views/events/gitlab/deployment/default.blade.php index 5f271e1..5fd5873 100644 --- a/resources/views/events/gitlab/deployment/default.blade.php +++ b/resources/views/events/gitlab/deployment/default.blade.php @@ -3,5 +3,3 @@ * @var object $payload * @var string $event */ - -?> From c4b437b608dc0cb118b415e507d140bd90f9cbff Mon Sep 17 00:00:00 2001 From: Tan Nguyen Date: Thu, 23 May 2024 18:57:26 +0700 Subject: [PATCH 16/17] update view template for pipeline gitlab events --- resources/views/events/gitlab/pipeline/default.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/events/gitlab/pipeline/default.blade.php b/resources/views/events/gitlab/pipeline/default.blade.php index cc7dc84..ed43830 100644 --- a/resources/views/events/gitlab/pipeline/default.blade.php +++ b/resources/views/events/gitlab/pipeline/default.blade.php @@ -12,4 +12,4 @@ 🌳 {{ __('tg-notifier::app.branch') }}: {{ $payload->object_attributes->ref }} 👤 {{ __('tg-notifier::app.author.name') }}: {{ $payload->commit->author->name }} 💻 {{ __('tg-notifier::app.commit') }}: {{ $payload->commit->message }} -🚦 {{ __('tg-notifier::app.status') }}: Pipeline {{ $payload->object_attributes->status }} {{ $payload->object_attributes->duration ? "⏱️ {$payload->object_attributes->duration}s" : '' }} +🚦 {{ __('tg-notifier::app.status') }}: Pipeline {{ $payload->object_attributes->status }} {{ $payload->object_attributes->duration ? "⏱️ {$payload->object_attributes->duration}s" : '' }} From 3656d6249431ebf991ee1bbc758933a9feec036b Mon Sep 17 00:00:00 2001 From: Tan Nguyen Date: Thu, 23 May 2024 20:23:43 +0700 Subject: [PATCH 17/17] fix: add empty blade for gitlab events --- .../views/events/gitlab/deployment/default.blade.php | 3 +++ resources/views/events/gitlab/emoji/default.blade.php | 8 ++++++++ 2 files changed, 11 insertions(+) create mode 100644 resources/views/events/gitlab/emoji/default.blade.php diff --git a/resources/views/events/gitlab/deployment/default.blade.php b/resources/views/events/gitlab/deployment/default.blade.php index 5fd5873..251f9e2 100644 --- a/resources/views/events/gitlab/deployment/default.blade.php +++ b/resources/views/events/gitlab/deployment/default.blade.php @@ -3,3 +3,6 @@ * @var object $payload * @var string $event */ + +?> +Need to implement this view diff --git a/resources/views/events/gitlab/emoji/default.blade.php b/resources/views/events/gitlab/emoji/default.blade.php new file mode 100644 index 0000000..251f9e2 --- /dev/null +++ b/resources/views/events/gitlab/emoji/default.blade.php @@ -0,0 +1,8 @@ + +Need to implement this view