diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-13 18:09:27 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-13 18:09:27 +0000 |
| commit | 5248c5e2212b8e42b28b23e6839d69db0006829b (patch) | |
| tree | f989d4b4cd06fc5dc28c024a5f230b42b0af179b /lefthook.yml | |
| parent | 0d55697d64b5f053bbd0f69da2962e7478097de3 (diff) | |
| download | gitlab-ce-5248c5e2212b8e42b28b23e6839d69db0006829b.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lefthook.yml')
| -rw-r--r-- | lefthook.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lefthook.yml b/lefthook.yml index 05703b7a8d9..359c633e0f1 100644 --- a/lefthook.yml +++ b/lefthook.yml @@ -86,6 +86,9 @@ pre-push: files: git diff --name-only --diff-filter=d $(git merge-base origin/master HEAD)..HEAD glob: 'data/removals/*.yml' run: echo "Changes to removals files detected. Checking removals..\n"; bundle exec rake gitlab:docs:check_removals + scripts: + "merge_conflicts": + runner: bash pre-commit: parallel: true commands: |