dev/200.1.0 - #36
Merged
Merged
Conversation
Добавляем удаление директории vendor перед запуском composer install и composer update в GitHub Actions для предотвращения конфликтов при обновлении зависимостей. Разрешаем конфликт слияния в workflow dependabot-auto-merge.yml, оставляя актуальную версию файла. Добавляем поддержку версий DLE 19.x и 18.x в шаблон отчета об ошибках.
Добавляю возможность ручного запуска workflows для dependabot-auto-merge и composer-check через workflow_dispatch триггер. Это позволяет запускать проверки вручную без необходимости создания pull request или push события. Разрешаю конфликт слияния в composer-check.yml, оставляя актуальную версию с новым триггером.
Удаляю маркеры конфликтов слияния из файлов StorageSchema.php, TablePresenter.php и ConversationReadsSchema.php. Оставляю текущую версию кода, которая соответствует актуальному состоянию проекта.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Описание
Тип изменений