Skip to content

Commit 6b57e1c

Browse files
committed
fix: update view template for merge request event gitlab
1 parent 201b67d commit 6b57e1c

File tree

14 files changed

+59
-59
lines changed

14 files changed

+59
-59
lines changed
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
<?php
22

33
return [
4-
'review' => '👥 Reviewers: ',
4+
'review' => 'Reviewers: ',
55
'closed' => [
6-
'title' => '🚫 <b>Merge Request Closed</b> - 🦊:repo by :user',
6+
'title' => '<b>Merge Request Closed</b> - :repo by :user',
77
],
88
'merged' => [
9-
'title' => '<b>Merge Request Merged</b> - 🦊:repo by :user',
9+
'title' => '<b>Merge Request Merged</b> - :repo by :user',
1010
],
1111
'opened' => [
12-
'title' => '👷‍♂️🛠️ <b>New Merge Request</b> - 🦊:repo by :user',
12+
'title' => '<b>New Merge Request</b> - :repo by :user',
1313
],
1414
'reopened' => [
15-
'title' => '👷‍♂️🛠️ <b>Merge Request Reopened</b> - 🦊:repo by :user',
15+
'title' => '<b>Merge Request Reopened</b> - :repo by :user',
1616
],
1717
'approved' => [
18-
'title' => '👍 <b>Merge Request Approved</b> ✅ - 🦊:repo by :user',
18+
'title' => '<b>Merge Request Approved</b> :repo by :user',
1919
],
2020
'unapproved' => [
21-
'title' => '👎 <b>Merge Request Unapproved</b> ❌ - 🦊:repo by :user',
21+
'title' => '<b>Merge Request Unapproved</b> :repo by :user',
2222
],
2323
'approval' => [
24-
'title' => '👍 <b>Merge Request Approval</b> ✅ - 🦊:repo by :user',
24+
'title' => '<b>Merge Request Approval</b> :repo by :user',
2525
],
2626
'unapproval' => [
27-
'title' => '👎 <b>Merge Request Unapproval</b> ❌ - 🦊:repo by :user',
27+
'title' => '<b>Merge Request Unapproval</b> :repo by :user',
2828
],
2929
'update' => [
30-
'title' => '🛠️ <b>Merge Request Updated</b> - 🦊:repo by :user',
30+
'title' => '<b>Merge Request Updated</b> - :repo by :user',
3131
],
3232
];
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
<?php
22

33
return [
4-
'review' => '👥 Reviewers: ',
4+
'review' => 'Reviewers: ',
55
'closed' => [
6-
'title' => '🚫 <b>Merge Request Closed</b> - 🦊:repo by :user',
6+
'title' => '<b>Merge Request Closed</b> - :repo by :user',
77
],
88
'merged' => [
9-
'title' => '<b>Merge Request Merged</b> - 🦊:repo by :user',
9+
'title' => '<b>Merge Request Merged</b> - :repo by :user',
1010
],
1111
'opened' => [
12-
'title' => '👷‍♂️🛠️ <b>New Merge Request</b> - 🦊:repo by :user',
12+
'title' => '<b>New Merge Request</b> - :repo by :user',
1313
],
1414
'reopened' => [
15-
'title' => '👷‍♂️🛠️ <b>Merge Request Reopened</b> - 🦊:repo by :user',
15+
'title' => '<b>Merge Request Reopened</b> - :repo by :user',
1616
],
1717
'approved' => [
18-
'title' => '👍 <b>Merge Request Approved</b> ✅ - 🦊:repo by :user',
18+
'title' => '<b>Merge Request Approved</b> :repo by :user',
1919
],
2020
'unapproved' => [
21-
'title' => '👎 <b>Merge Request Unapproved</b> ❌ - 🦊:repo by :user',
21+
'title' => '<b>Merge Request Unapproved</b> :repo by :user',
2222
],
2323
'approval' => [
24-
'title' => '👍 <b>Merge Request Approval</b> ✅ - 🦊:repo by :user',
24+
'title' => '<b>Merge Request Approval</b> :repo by :user',
2525
],
2626
'unapproval' => [
27-
'title' => '👎 <b>Merge Request Unapproval</b> ❌ - 🦊:repo by :user',
27+
'title' => '<b>Merge Request Unapproval</b> :repo by :user',
2828
],
2929
'update' => [
30-
'title' => '🛠️ <b>Merge Request Updated</b> - 🦊:repo by :user',
30+
'title' => '<b>Merge Request Updated</b> - :repo by :user',
3131
],
3232
];
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
<?php
22

33
return [
4-
'review' => '👥 Reviewers: ',
4+
'review' => 'Reviewers: ',
55
'closed' => [
6-
'title' => '🚫 <b>Merge Request Closed</b> - 🦊:repo by :user',
6+
'title' => '<b>Merge Request Closed</b> - :repo by :user',
77
],
88
'merged' => [
9-
'title' => '<b>Merge Request Merged</b> - 🦊:repo by :user',
9+
'title' => '<b>Merge Request Merged</b> - :repo by :user',
1010
],
1111
'opened' => [
12-
'title' => '👷‍♂️🛠️ <b>New Merge Request</b> - 🦊:repo by :user',
12+
'title' => '<b>New Merge Request</b> - :repo by :user',
1313
],
1414
'reopened' => [
15-
'title' => '👷‍♂️🛠️ <b>Merge Request Reopened</b> - 🦊:repo by :user',
15+
'title' => '<b>Merge Request Reopened</b> - :repo by :user',
1616
],
1717
'approved' => [
18-
'title' => '👍 <b>Merge Request Approved</b> ✅ - 🦊:repo by :user',
18+
'title' => '<b>Merge Request Approved</b> :repo by :user',
1919
],
2020
'unapproved' => [
21-
'title' => '👎 <b>Merge Request Unapproved</b> ❌ - 🦊:repo by :user',
21+
'title' => '<b>Merge Request Unapproved</b> :repo by :user',
2222
],
2323
'approval' => [
24-
'title' => '👍 <b>Merge Request Approval</b> ✅ - 🦊:repo by :user',
24+
'title' => '<b>Merge Request Approval</b> :repo by :user',
2525
],
2626
'unapproval' => [
27-
'title' => '👎 <b>Merge Request Unapproval</b> ❌ - 🦊:repo by :user',
27+
'title' => '<b>Merge Request Unapproval</b> :repo by :user',
2828
],
2929
'update' => [
30-
'title' => '🛠️ <b>Merge Request Updated</b> - 🦊:repo by :user',
30+
'title' => '<b>Merge Request Updated</b> - :repo by :user',
3131
],
3232
];
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
<?php
22

33
return [
4-
'review' => '👥 Reviewers: ',
4+
'review' => 'Reviewers: ',
55
'closed' => [
6-
'title' => '🚫 <b>Merge Request Closed</b> - 🦊:repo by :user',
6+
'title' => '<b>Merge Request Closed</b> - :repo by :user',
77
],
88
'merged' => [
9-
'title' => '<b>Merge Request Merged</b> - 🦊:repo by :user',
9+
'title' => '<b>Merge Request Merged</b> - :repo by :user',
1010
],
1111
'opened' => [
12-
'title' => '👷‍♂️🛠️ <b>New Merge Request</b> - 🦊:repo by :user',
12+
'title' => '<b>New Merge Request</b> - :repo by :user',
1313
],
1414
'reopened' => [
15-
'title' => '👷‍♂️🛠️ <b>Merge Request Reopened</b> - 🦊:repo by :user',
15+
'title' => '<b>Merge Request Reopened</b> - :repo by :user',
1616
],
1717
'approved' => [
18-
'title' => '👍 <b>Merge Request Approved</b> ✅ - 🦊:repo by :user',
18+
'title' => '<b>Merge Request Approved</b> :repo by :user',
1919
],
2020
'unapproved' => [
21-
'title' => '👎 <b>Merge Request Unapproved</b> ❌ - 🦊:repo by :user',
21+
'title' => '<b>Merge Request Unapproved</b> :repo by :user',
2222
],
2323
'approval' => [
24-
'title' => '👍 <b>Merge Request Approval</b> ✅ - 🦊:repo by :user',
24+
'title' => '<b>Merge Request Approval</b> :repo by :user',
2525
],
2626
'unapproval' => [
27-
'title' => '👎 <b>Merge Request Unapproval</b> ❌ - 🦊:repo by :user',
27+
'title' => '<b>Merge Request Unapproval</b> :repo by :user',
2828
],
2929
'update' => [
30-
'title' => '🛠️ <b>Merge Request Updated</b> - 🦊:repo by :user',
30+
'title' => '<b>Merge Request Updated</b> - :repo by :user',
3131
],
3232
];

resources/views/events/gitlab/merge_request/approval.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66
77
?>
8-
{!! __('tg-notifier::events/gitlab/merge_request.approval.title', [
9-
'repo' => "<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}#{$payload->object_attributes->iid}</a>",
8+
👍 {!! __('tg-notifier::events/gitlab/merge_request.approval.title', [
9+
'repo' => "✅ - 🦊<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}#{$payload->object_attributes->iid}</a>",
1010
'user' => "<b>{$payload->user->name}</b>"
1111
]) !!}
1212

resources/views/events/gitlab/merge_request/approved.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66
77
?>
8-
{!! __('tg-notifier::events/gitlab/merge_request.approved.title', [
9-
'repo' => "<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}#{$payload->object_attributes->iid}</a>",
8+
👍 {!! __('tg-notifier::events/gitlab/merge_request.approved.title', [
9+
'repo' => "✅ - 🦊<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}#{$payload->object_attributes->iid}</a>",
1010
'user' => "<b>{$payload->user->name}</b>"
1111
]) !!}
1212

resources/views/events/gitlab/merge_request/close.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66
77
?>
8-
{!! __('tg-notifier::events/gitlab/merge_request.closed.title', [
9-
'repo' => "<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}#{$payload->object_attributes->iid}</a>",
8+
🚫 {!! __('tg-notifier::events/gitlab/merge_request.closed.title', [
9+
'repo' => "🦊<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}#{$payload->object_attributes->iid}</a>",
1010
'user' => "<b>{$payload->user->name}</b>"
1111
]) !!}
1212

resources/views/events/gitlab/merge_request/merge.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66
77
?>
8-
{!! __('tg-notifier::events/gitlab/merge_request.merged.title', [
9-
'repo' => "<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}#{$payload->object_attributes->iid}</a>",
8+
{!! __('tg-notifier::events/gitlab/merge_request.merged.title', [
9+
'repo' => "🦊<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}#{$payload->object_attributes->iid}</a>",
1010
'user' => "<b>{$payload->user->name}</b>"
1111
]) !!}
1212

resources/views/events/gitlab/merge_request/open.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66
77
?>
8-
{!! __('tg-notifier::events/gitlab/merge_request.opened.title', [
9-
'repo' => "<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}#{$payload->object_attributes->iid}</a>",
8+
👷‍♂️🛠️ {!! __('tg-notifier::events/gitlab/merge_request.opened.title', [
9+
'repo' => "🦊<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}#{$payload->object_attributes->iid}</a>",
1010
'user' => "<b>{$payload->user->name}</b>"
1111
]) !!}
1212

resources/views/events/gitlab/merge_request/partials/_reviewers.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
$reviewers[] = "<b>{$reviewer->name}</b>";
1111
}
1212
13-
$textReviewers .= __('tg-notifier::events/gitlab/merge_request.review') . implode(', ', $reviewers);
13+
$textReviewers .= '👥' . __('tg-notifier::events/gitlab/merge_request.review') . implode(', ', $reviewers);
1414
}
1515
?>
1616
{!! $textReviewers !!}

0 commit comments

Comments
 (0)