summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'revert_broken_things' into 'master'v2.3.1Valery Sizov2014-11-198-69/+51
|\ \ | | | | | | | | | | | | | | | Revert broken things See merge request !6
| * | Bump versionValery Sizov2014-11-191-1/+1
| | |
| * | Revert "Restore hooks PATH before calling ruby."Valery Sizov2014-11-197-68/+50
|/ / | | | | | | This reverts commit cd9e796316560eee596f2681d54a8417389bbe79.
* | Bump versionv2.3.0Dmitriy Zaporozhets2014-11-181-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge pull request #193 from cirosantilli/tag-branch-rm-double-dashDmitriy Zaporozhets2014-11-181-2/+2
|\ \ | | | | | | Delete tags and branches that start with hyphen
| * | Delete tags and branches that start with hyphenCiro Santilli2014-10-311-2/+2
| | |
* | | Merge pull request #186 from cirosantilli/restore-pathDmitriy Zaporozhets2014-11-187-50/+68
|\ \ \ | |_|/ |/| | Restore hooks PATH before calling ruby.
| * | Restore hooks PATH before calling ruby.Ciro Santilli2014-11-177-50/+68
|/ /
* | Bump versionv2.2.0Dmitriy Zaporozhets2014-11-111-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Bump versionDmitriy Zaporozhets2014-11-071-1/+1
| |
* | Merge pull request #196 from dblessing/feature/custom_hooksDmitriy Zaporozhets2014-11-071-0/+3
|\ \ | | | | | | Add custom hook support to CHANGELOG
| * | Add custom hook support to CHANGELOGDrew Blessing2014-11-071-0/+3
|/ /
* | Merge pull request #190 from dblessing/feature/custom_hooksDmitriy Zaporozhets2014-11-076-8/+99
|\ \ | |/ |/| Custom hooks
| * Fix the calls to pre- and post-receive custom hooksjkbzh2014-11-061-14/+41
| | | | | | | | | | | | - Reset G_ID if the custom pre-receive hook fails - Use a pipe to feed stdin to the custom pre- and post-receive hooks, in the same way that the standalone git works
| * Support for custom hooksDrew Blessing2014-11-056-8/+72
|/
* Merge pull request #192 from jkbzh/masterDmitriy Zaporozhets2014-10-311-1/+1
|\ | | | | fixing broken custom pre-receive calls
| * using true instead of 1jose2014-10-301-1/+1
| |
| * The gitlab pre-receive hook expects the call to exec to return 1jose2014-10-301-1/+1
|/ | | | | | | | | when a user has access. Doing an exit 0 effectively ended the thread. No code would be executed after the call to exec. This changes fixes the problem for the pre-receive hooks but you want to check that GitlabAccess.exec is not used elsewhere. A quick grep of the code seems to indicate this is not the case
* Merge pull request #90 from Razer6/optional_repo_pathDmitriy Zaporozhets2014-10-281-3/+8
|\ | | | | Add optional repo path, remove reference to gitolite repo
| * Add optional repo path, remove reference to gitolite repo, fixes #77Robert Schilling2013-09-131-3/+8
| |
* | Merge pull request #81 from corny/patch-1Dmitriy Zaporozhets2014-10-281-3/+1
|\ \ | | | | | | avoid @user_tried
| * | Update gitlab_shell.rbJulian K.2013-08-071-3/+1
| | | | | | | | | using instance_variable_defined to avoid @user_tried
* | | Merge pull request #177 from feedhenry/keys_listDmitriy Zaporozhets2014-10-284-0/+34
|\ \ \ | | | | | | | | Added list-keys command, with associated spec
| * | | Added list-keys command and specDavid Martin2014-10-154-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed puts and tidied up regex Address the hound Address the hound, again Use single quotes Add back travis.yml file Remove travis.yml, only keep on fh-master Use single quotes Use single quotes
* | | | Merge pull request #179 from feedhenry/projects_listDmitriy Zaporozhets2014-10-284-1/+31
|\ \ \ \ | | | | | | | | | | Added list-projects command & spec
| * | | | Added list-projects command & specDavid Martin2014-10-154-1/+31
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | list-projects command usage Single quotes Use single quotes Use single quotes
* | | | Merge branch 'master' of github.com:gitlabhq/gitlab-shellv2.1.0Dmitriy Zaporozhets2014-10-202-1/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: .gitignore
| * | | Merge pull request #184 from cirosantilli/ignore-bundleRobert Schilling2014-10-041-0/+1
| |\ \ \ | | | | | | | | | | Ignore .bundle
| | * | | Ignore .bundleCiro Santilli2014-10-041-0/+1
| |/ / /
| * | | Merge pull request #182 from cirosantilli/split-instance-var-defsRobert Schilling2014-10-041-1/+2
| |\ \ \ | | | | | | | | | | Split one instance variable per line
| | * | | Split one instance variable per lineCiro Santilli2014-10-041-1/+2
| | | | |
| * | | | Merge pull request #183 from cirosantilli/ignore-tagsRobert Schilling2014-10-041-0/+1
| |\ \ \ \ | | | | | | | | | | | | Ignore tags file
| | * | | | Ignore tags fileCiro Santilli2014-10-041-0/+1
| | |/ / /
* | | | | Modify changelogDmitriy Zaporozhets2014-10-201-0/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Fix indentationDmitriy Zaporozhets2014-10-202-5/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'secret_token' into 'master'Dmitriy Zaporozhets2014-10-2011-9/+38
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Secret token Part of gitlab/gitlabhq#1528. Required by gitlab/gitlabhq!1185 See merge request !46
| * | | | Bump to minor versionDmitriy Zaporozhets2014-10-161-1/+1
| | | | |
| * | | | add secret tokenValery Sizov2014-10-1511-9/+38
|/ / / /
* | | | Bump coveralls gemDmitriy Zaporozhets2014-09-301-11/+17
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Add coveralls support properlyDmitriy Zaporozhets2014-09-302-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge pull request #172 from bbodenmiller/patch-1Dmitriy Zaporozhets2014-09-261-0/+1
|\ \ \ \ | |/ / / |/| | | add note about other HTTPS setup details
| * | | add note about other HTTPS setup detailsBen Bodenmiller2014-08-231-0/+1
| | | |
* | | | Fix testsDmitriy Zaporozhets2014-09-251-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Fix bug when changes to post-receive worker was not dumped properlyv2.0.1Dmitriy Zaporozhets2014-09-253-2/+5
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Version 2.0.0v2.0.0Marin Jankovski2014-09-171-1/+1
| | | |
* | | | Merge branch 'master' of https://github.com/gitlabhq/gitlab-shellMarin Jankovski2014-09-171-0/+3
|\ \ \ \
| * \ \ \ Merge pull request #178 from Razer6/hound_single_quoteRobert Schilling2014-09-171-0/+3
| |\ \ \ \ | | | | | | | | | | | | Let hound prefer single-quote strings
| | * | | | Let hound prefer single-quote stringsRobert Schilling2014-09-161-0/+3
| |/ / / /
* | | | | Merge branch 'symlink_hooks_directory' into 'master'Dmitriy Zaporozhets2014-09-162-4/+7
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | Symlink hooks directory See merge request !44
| * | | | Add '.old' when renaming existing hooks directoryJacob Vosmaer2014-09-161-1/+1
| | | | |