diff --git a/composer.json b/composer.json index abcf675b1a..2f1007fa73 100644 --- a/composer.json +++ b/composer.json @@ -127,6 +127,9 @@ "sort-packages": true, "optimize-autoloader": true, "discard-changes": true, - "process-timeout": 3000 + "process-timeout": 3000, + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true + } } } diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php index e15cdf0954..5bf501e225 100644 --- a/resources/views/livewire/slack-settings-form.blade.php +++ b/resources/views/livewire/slack-settings-form.blade.php @@ -24,9 +24,11 @@
+ @if($webhook_selected != 'General')

{!! trans('admin/settings/general.webhook_integration_help',array('webhook_link' => $webhook_link, 'app' => $webhook_name)) !!}

+ @endif
@@ -164,26 +166,3 @@
- - @push('scripts') - - @endpush diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php index 5b49e1c7e4..678233c933 100755 --- a/resources/views/settings/index.blade.php +++ b/resources/views/settings/index.blade.php @@ -164,7 +164,7 @@
- +

{{ trans('admin/settings/general.integrations') }}