delta/gitlab/gitlab-shell.git, branch v4.1.0

Merge branch 'make-custom-hook-dir-configurable' into 'master'

2016-12-12T15:09:20+00:00


Make custom hook dir configurable

Add a new configuration option, custom_hook_dir. When this is set, we
will look for global custom hooks in: `/{pre-receive,update,post-receive}.d/*`

When this is not set, default to `/hooks`.

Relates to https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1754 and
gitlab-org/gitlab-ce!8040.

See merge request !113

Update VERSION to 4.1.0

2016-12-12T13:31:19+00:00

Make custom hooks dir configurable

2016-12-12T13:21:42+00:00

Add a new configuration option, custom_hooks_dir. When this is set, we
will look for global custom hooks in:
    /{pre-receive,update,post-receive}.d/*

When this is not set, default to /hooks.

Merge branch '21451-change-merge-request-text-after-pushing-new-branch' into 'master'

2016-12-09T10:27:51+00:00


Make merge request text after push clearer

The message to create a merge request after pushing a new branch was not clear. It is now clear that it is optional to create a merge request for the pushed branch.

Part of [#21451](https://gitlab.com/gitlab-org/gitlab-ce/issues/21451)

See merge request !109

Make merge request text after push clearer

2016-12-08T21:29:29+00:00

Add changelog entry

Editing changelog entry version

Merge branch 'glensc/gitlab-shell-pr-245' into 'master'

2016-12-06T16:43:29+00:00


Chained global hooks

Closes #32. Docs MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6721

See merge request !111

changelog spelling

2016-12-01T11:41:03+00:00

test expected hook order

2016-12-01T11:41:03+00:00

DRY: add helpers for expect hook calls

2016-12-01T11:41:03+00:00

test gl_id_test_hook as global and as repo hook separately

2016-12-01T11:41:03+00:00