diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-11-12 09:59:50 -0500 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-11-12 09:59:50 -0500 |
| commit | 7e15bc5bd9c2aace0cde3dddf96c2c01e3152c40 (patch) | |
| tree | 66e58c0bc51dbd2ea22d4896323b245cf8591d97 /doc/administration/custom_hooks.md | |
| parent | 21b8cebe06ef679b2fed27d0b5b124d3c2cdc7ed (diff) | |
| parent | f93539af26dcc76de97a4e647f75308f3164cbf6 (diff) | |
| download | gitlab-ce-52937-remove-feature-flag.tar.gz | |
Merge branch 'master' into 52937-remove-feature-flag52937-remove-feature-flag
* master: (49 commits)
Docs: updates docs development guidelines
Upgrade whitequark/parser to 2.5.3.0
Update gems in Gemfile.rails5.lock
Proper markdown table in docs Dangerfile
Fix transient rspec issue
Fix some links and Markdown
Fix link for raising helm chart issues
Implement review comments
Docs: Update Variable naming
Update gitlab-markup gem to avoid binary name collision
Disable usage pings in review apps
Bump Sidekiq and other related gems
Fix minor offenses
Use gitlab-ui in jobs and pipelines
Resolve "GitLab Pages settings regressions"
Remove circular dependency on Redactable in migration
Edits to docs Dangerfile
Fix DashboardHelper reference in spec
Resolve possible cherry pick API race condition
Updates clipboard button with gitlab-ui
...
Diffstat (limited to 'doc/administration/custom_hooks.md')
| -rw-r--r-- | doc/administration/custom_hooks.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/administration/custom_hooks.md b/doc/administration/custom_hooks.md index c58ced7d520..60ad4bf4e8f 100644 --- a/doc/administration/custom_hooks.md +++ b/doc/administration/custom_hooks.md @@ -60,7 +60,7 @@ installations, this can be set in `gitlab-shell/config.yml`. The hooks are searched and executed in this order: -1. `<project>.git/hooks/` - symlink to `gitlab-shell/hooks` global dir +1. `gitlab-shell/hooks` directory as known to Gitaly 1. `<project>.git/hooks/<hook_name>` - executed by `git` itself, this is `gitlab-shell/hooks/<hook_name>` 1. `<project>.git/custom_hooks/<hook_name>` - per project hook (this is already existing behavior) 1. `<project>.git/custom_hooks/<hook_name>.d/*` - per project hooks |