summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Vendor gitaly-proto 0.5.0go-hello-worldJacob Vosmaer2017-04-12161-1/+68957
|
* Better variable nameJacob Vosmaer2017-04-122-6/+15
|
* Add hello-world executableJacob Vosmaer2017-04-125-0/+54
|
* Merge branch 'how-to-release-a-new-version' into 'master' Rémy Coutable2017-03-301-0/+21
|\ | | | | | | | | Explain how to release a new version See merge request !126
| * Explain when to use a v in version numberSean McGivern2017-03-301-5/+12
| |
| * Explain how to release a new versionSean McGivern2017-03-291-0/+14
| |
* | Merge branch 'adds-timeout-to-push-branches' into 'master' v5.0.2Sean McGivern2017-03-294-8/+94
|\ \ | | | | | | | | | | | | adds timeout option to push branches and respective test suite See merge request !124
| * | adds timeout option to push branches and respective test suiteTiago Botelho2017-03-294-8/+94
|/ /
* | Merge branch 'add-quiet-option-to-fetch-command' into 'master' Robert Speicher2017-03-282-0/+4
|\ \ | |/ |/| | | | | Fetch repositories with --quiet option by default See merge request !125
| * Update CHANGELOGDouglas Barbosa Alexandre2017-03-271-0/+3
| |
| * Fetch repositories with --quiet option by defaultDouglas Barbosa Alexandre2017-03-271-0/+1
|/ | | | | | | This will allow us to prevent deadlocks when dealing with extremely long outputs from `git fetch`. All the pipes (stdin, stdout, and stderr) have limited buffers, and when one fills up, everything is going to stop.
* Merge branch '1648-remove-git-annex-support' into 'master' v5.0.0Rémy Coutable2017-03-069-123/+10
|\ | | | | | | | | Remove git annex support See merge request !122
| * Bump version to 5.0.0 and add changelog entry about removing support for ↵1648-remove-git-annex-supportPawel Chojnacki2017-03-032-1/+4
| | | | | | | | git-annex
| * Add missing rsyncPawel Chojnacki2017-03-021-1/+2
| |
| * update gitignore to ignore .idea folderPawel Chojnacki2017-02-241-0/+1
| |
| * Remove git annex supportPawel Chojnacki2017-02-246-121/+3
|/
* Merge branch 'gitaly-post-receive-2' into 'master' Robert Speicher2017-02-155-12/+99
|\ | | | | | | | | Add gitaly notification on post-receive hook See merge request !119
| * Use api/v4 for gitaly notification and add testsgitaly-post-receive-2Alejandro Rodríguez2017-02-103-12/+79
| |
| * Add gitaly notification on post-receive hookAlejandro Rodríguez2017-02-073-0/+20
|/
* Merge branch 'unix-socket-host' into 'master' Douwe Maan2017-01-032-14/+33
|\ | | | | | | | | | | | | Set a 'Host' header on unix sockets Closes #72 See merge request !117
| * Set a 'Host' header on unix socketsJacob Vosmaer2017-01-032-14/+33
|/ | | | Workaround for a bug in the HTTPUNIX client.
* Merge branch '25301-git-2.11-force-push-bug' into 'master' v4.1.1Rémy Coutable2016-12-164-4/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass relevant git environment variables while calling `/allowed` 1. Starting version 2.11, git changed the way the pre-receive flow works. - Previously, the new potential objects would be added to the main repo. If the pre-receive passes, the new objects stay in the repo but are linked up. If the pre-receive fails, the new objects stay orphaned in the repo, and are cleaned up during the next `git gc`. - In 2.11, the new potential objects are added to a temporary "alternate object directory", that git creates for this purpose. If the pre-receive passes, the objects from the alternate object directory are migrated to the main repo. If the pre-receive fails the alternate object directory is simply deleted. 2. In our workflow, the pre-recieve script calls the `/allowed` endpoint on the rails server. This `/allowed` endpoint calls out directly to git to perform various checks. These direct calls to git do _not_ have the necessary environment variables set which allow access to the "alternate object directory" (explained above). Therefore these calls to git are not able to access any of the new potential objects to be added during this push. 3. We fix this by passing the relevant environment variables (`GIT_ALTERNATE_OBJECT_DIRECTORIES`, `GIT_OBJECT_DIRECTORY`, and `GIT_QUARANTINE_PATH`) to the `/allowed` endpoint, which will then include these environment variables while calling out to git. --- - Related to gitlab-org/gitlab-ce#25301. - Corresponding backend MR: gitlab-org/gitlab-ce!7967 - Corresponding EE MR: gitlab-org/gitlab-ee!964 See merge request !112
| * Add CHANGELOG entry.25301-git-2.11-force-push-bugTimothy Andrew2016-12-162-1/+4
| |
| * Pass relevant git environment variables while calling `/allowed`Timothy Andrew2016-12-162-3/+9
|/ | | | | | | | | | | | | | | | | | | | | | | | | | 1. Starting version 2.11, git changed the way the pre-receive flow works. - Previously, the new potential objects would be added to the main repo. If the pre-receive passes, the new objects stay in the repo but are linked up. If the pre-receive fails, the new objects stay orphaned in the repo, and are cleaned up during the next `git gc`. - In 2.11, the new potential objects are added to a temporary "alternate object directory", that git creates for this purpose. If the pre-receive passes, the objects from the alternate object directory are migrated to the main repo. If the pre-receive fails the alternate object directory is simply deleted. 2. In our workflow, the pre-recieve script calls the `/allowed` endpoint on the rails server. This `/allowed` endpoint calls out directly to git to perform various checks. These direct calls to git do _not_ have the necessary environment variables set which allow access to the "alternate object directory" (explained above). Therefore these calls to git are not able to access any of the new potential objects to be added during this push. 3. We fix this by passing the relevant environment variables (GIT_ALTERNATE_OBJECT_DIRECTORIES, GIT_OBJECT_DIRECTORY, and GIT_QUARANTINE_PATH) to the `/allowed` endpoint, which will then include these environment variables while calling out to git.
* Merge branch 'make-custom-hook-dir-configurable' into 'master' v4.1.0Rémy Coutable2016-12-127-25/+77
|\ | | | | | | | | | | | | | | | | | | | | | | | | 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: `<custom_hook_dir>/{pre-receive,update,post-receive}.d/*` When this is not set, default to `<ROOT_PATH>/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.0make-custom-hook-dir-configurableSean McGivern2016-12-121-1/+1
| |
| * Make custom hooks dir configurableSean McGivern2016-12-126-24/+76
|/ | | | | | | | Add a new configuration option, custom_hooks_dir. When this is set, we will look for global custom hooks in: <custom_hooks_dir>/{pre-receive,update,post-receive}.d/* When this is not set, default to <REPO_PATH>/hooks.
* Merge branch '21451-change-merge-request-text-after-pushing-new-branch' into ↵Rémy Coutable2016-12-093-3/+4
|\ | | | | | | | | | | | | | | | | | | | | | | 'master' 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 clearerLisanne Fellinger2016-12-083-3/+4
|/ | | | | | Add changelog entry Editing changelog entry version
* Merge branch 'glensc/gitlab-shell-pr-245' into 'master' Rémy Coutable2016-12-0610-41/+308
|\ | | | | | | | | | | | | Chained global hooks Closes #32. Docs MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6721 See merge request !111
| * changelog spellingglensc/gitlab-shell-pr-245Elan Ruusamäe2016-12-011-1/+1
| |
| * test expected hook orderElan Ruusamäe2016-12-011-0/+30
| |
| * DRY: add helpers for expect hook callsElan Ruusamäe2016-12-011-35/+31
| |
| * test gl_id_test_hook as global and as repo hook separatelyElan Ruusamäe2016-12-011-1/+24
| |
| * spec/custom_hook: ensure "before" does complete cleanupElan Ruusamäe2016-12-011-7/+6
| | | | | | | | | | this fixes problem that tests succeeded locally but failed in ci where parent dirs were missing
| * spec/custom_hooks: cleanup helpers not to repeat repo path parameterElan Ruusamäe2016-12-011-34/+34
| |
| * fix gl_id_test_hookElan Ruusamäe2016-12-011-10/+8
| |
| * cleanup dirs in before to fixup aborted testsElan Ruusamäe2016-12-011-4/+10
| |
| * move helpers to topElan Ruusamäe2016-12-011-29/+29
| |
| * changelog entryElan Ruusamäe2016-12-011-0/+4
| |
| * improve wording by using successful instead of okElan Ruusamäe2016-12-011-4/+4
| |
| * remove unused create_global_hooksElan Ruusamäe2016-12-011-5/+0
| |
| * avoid Dir.exists? duplication by moving the check to match_hook_filesElan Ruusamäe2016-12-011-6/+4
| |
| * use String.end_with? instead of regexpElan Ruusamäe2016-12-011-1/+1
| |
| * remove no longer needed gitlab_initElan Ruusamäe2016-12-013-3/+0
| |
| * spec: updated tests to match current codeElan Ruusamäe2016-12-012-37/+67
| |
| * custom_hook: chain custom hooksElan Ruusamäe2016-12-011-11/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | update hooks lookup to use <hook>.d/* from repository hooks dir the order would be: 1. <repository>.git/custom_hooks/<hook_name> - per project hook 2. <repository>.git/custom_hooks/<hook_name>.d/* - per project hooks 3. <repository>.git/hooks/<hook_name>.d/* - global hooks only executable files are matched and backup files excluded (*~) and the resulting list is sorted per each lookup
| * spec: add tests for global custom hooksDirk Hörner2016-12-013-15/+165
| |
| * custom_hook: add support for global custom hooksDirk Hörner2016-12-015-12/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds the option of having another set of global custom hooks along with the already supported repository local custom hooks. The repository local custom hook is executed first (if available). If successful, execution continues with the global custom hook (if available). This way, local custom hooks get priority over global custom hooks. Global custom hooks can be enabled by placing an executable file into the "custom_hooks" directory within gitlab-shell (create if it does not exist, yet).
| * custom_hook: refactor to pull repo_path into classDirk Hörner2016-12-015-14/+15
| | | | | | | | | | | | This commit takes the GitlabCustomHook a bit clother to the other hook handling classes by receiving the repo_path as argument to initialize() instead of passing it to each method.
View Lorry Controller Status