diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-19 18:07:23 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-19 18:07:23 +0300 |
| commit | c18599314d98c0aa4dfe7d56423469f0b641d066 (patch) | |
| tree | e17e8f81753b009fd913051bfab7c5b76e95a11a /lefthook.yml | |
| parent | 4a44059e43feeef9e03fe99096de5035806c9f8f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lefthook.yml')
| -rw-r--r-- | lefthook.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lefthook.yml b/lefthook.yml index 359c633e0f1..1a8e8b5babb 100644 --- a/lefthook.yml +++ b/lefthook.yml @@ -88,6 +88,7 @@ pre-push: run: echo "Changes to removals files detected. Checking removals..\n"; bundle exec rake gitlab:docs:check_removals scripts: "merge_conflicts": + skip: true # This is disabled by default. You can enable this check by adding skip: false in lefhook-local.yml https://github.com/evilmartians/lefthook/blob/master/docs/configuration.md#skip runner: bash pre-commit: parallel: true |