Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'revert_broken_things' into 'master'v2.3.1 | Valery Sizov | 2014-11-19 | 8 | -69/+51 | |
|\ \ | | | | | | | | | | | | | | | | Revert broken things See merge request !6 | |||||
| * | | Bump version | Valery Sizov | 2014-11-19 | 1 | -1/+1 | |
| | | | ||||||
| * | | Revert "Restore hooks PATH before calling ruby." | Valery Sizov | 2014-11-19 | 7 | -68/+50 | |
|/ / | | | | | | | This reverts commit cd9e796316560eee596f2681d54a8417389bbe79. | |||||
* | | Bump versionv2.3.0 | Dmitriy Zaporozhets | 2014-11-18 | 1 | -1/+1 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Merge pull request #193 from cirosantilli/tag-branch-rm-double-dash | Dmitriy Zaporozhets | 2014-11-18 | 1 | -2/+2 | |
|\ \ | | | | | | | Delete tags and branches that start with hyphen | |||||
| * | | Delete tags and branches that start with hyphen | Ciro Santilli | 2014-10-31 | 1 | -2/+2 | |
| | | | ||||||
* | | | Merge pull request #186 from cirosantilli/restore-path | Dmitriy Zaporozhets | 2014-11-18 | 7 | -50/+68 | |
|\ \ \ | |_|/ |/| | | Restore hooks PATH before calling ruby. | |||||
| * | | Restore hooks PATH before calling ruby. | Ciro Santilli | 2014-11-17 | 7 | -50/+68 | |
|/ / | ||||||
* | | Bump versionv2.2.0 | Dmitriy Zaporozhets | 2014-11-11 | 1 | -1/+1 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Bump version | Dmitriy Zaporozhets | 2014-11-07 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #196 from dblessing/feature/custom_hooks | Dmitriy Zaporozhets | 2014-11-07 | 1 | -0/+3 | |
|\ \ | | | | | | | Add custom hook support to CHANGELOG | |||||
| * | | Add custom hook support to CHANGELOG | Drew Blessing | 2014-11-07 | 1 | -0/+3 | |
|/ / | ||||||
* | | Merge pull request #190 from dblessing/feature/custom_hooks | Dmitriy Zaporozhets | 2014-11-07 | 6 | -8/+99 | |
|\ \ | |/ |/| | Custom hooks | |||||
| * | Fix the calls to pre- and post-receive custom hooks | jkbzh | 2014-11-06 | 1 | -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 hooks | Drew Blessing | 2014-11-05 | 6 | -8/+72 | |
|/ | ||||||
* | Merge pull request #192 from jkbzh/master | Dmitriy Zaporozhets | 2014-10-31 | 1 | -1/+1 | |
|\ | | | | | fixing broken custom pre-receive calls | |||||
| * | using true instead of 1 | jose | 2014-10-30 | 1 | -1/+1 | |
| | | ||||||
| * | The gitlab pre-receive hook expects the call to exec to return 1 | jose | 2014-10-30 | 1 | -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_path | Dmitriy Zaporozhets | 2014-10-28 | 1 | -3/+8 | |
|\ | | | | | Add optional repo path, remove reference to gitolite repo | |||||
| * | Add optional repo path, remove reference to gitolite repo, fixes #77 | Robert Schilling | 2013-09-13 | 1 | -3/+8 | |
| | | ||||||
* | | Merge pull request #81 from corny/patch-1 | Dmitriy Zaporozhets | 2014-10-28 | 1 | -3/+1 | |
|\ \ | | | | | | | avoid @user_tried | |||||
| * | | Update gitlab_shell.rb | Julian K. | 2013-08-07 | 1 | -3/+1 | |
| | | | | | | | | | using instance_variable_defined to avoid @user_tried | |||||
* | | | Merge pull request #177 from feedhenry/keys_list | Dmitriy Zaporozhets | 2014-10-28 | 4 | -0/+34 | |
|\ \ \ | | | | | | | | | Added list-keys command, with associated spec | |||||
| * | | | Added list-keys command and spec | David Martin | 2014-10-15 | 4 | -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_list | Dmitriy Zaporozhets | 2014-10-28 | 4 | -1/+31 | |
|\ \ \ \ | | | | | | | | | | | Added list-projects command & spec | |||||
| * | | | | Added list-projects command & spec | David Martin | 2014-10-15 | 4 | -1/+31 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | list-projects command usage Single quotes Use single quotes Use single quotes | |||||
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlab-shellv2.1.0 | Dmitriy Zaporozhets | 2014-10-20 | 2 | -1/+4 | |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: .gitignore | |||||
| * | | | Merge pull request #184 from cirosantilli/ignore-bundle | Robert Schilling | 2014-10-04 | 1 | -0/+1 | |
| |\ \ \ | | | | | | | | | | | Ignore .bundle | |||||
| | * | | | Ignore .bundle | Ciro Santilli | 2014-10-04 | 1 | -0/+1 | |
| |/ / / | ||||||
| * | | | Merge pull request #182 from cirosantilli/split-instance-var-defs | Robert Schilling | 2014-10-04 | 1 | -1/+2 | |
| |\ \ \ | | | | | | | | | | | Split one instance variable per line | |||||
| | * | | | Split one instance variable per line | Ciro Santilli | 2014-10-04 | 1 | -1/+2 | |
| | | | | | ||||||
| * | | | | Merge pull request #183 from cirosantilli/ignore-tags | Robert Schilling | 2014-10-04 | 1 | -0/+1 | |
| |\ \ \ \ | | | | | | | | | | | | | Ignore tags file | |||||
| | * | | | | Ignore tags file | Ciro Santilli | 2014-10-04 | 1 | -0/+1 | |
| | |/ / / | ||||||
* | | | | | Modify changelog | Dmitriy Zaporozhets | 2014-10-20 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | | | Fix indentation | Dmitriy Zaporozhets | 2014-10-20 | 2 | -5/+5 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | | | Merge branch 'secret_token' into 'master' | Dmitriy Zaporozhets | 2014-10-20 | 11 | -9/+38 | |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Secret token Part of gitlab/gitlabhq#1528. Required by gitlab/gitlabhq!1185 See merge request !46 | |||||
| * | | | | Bump to minor version | Dmitriy Zaporozhets | 2014-10-16 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | add secret token | Valery Sizov | 2014-10-15 | 11 | -9/+38 | |
|/ / / / | ||||||
* | | | | Bump coveralls gem | Dmitriy Zaporozhets | 2014-09-30 | 1 | -11/+17 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | | Add coveralls support properly | Dmitriy Zaporozhets | 2014-09-30 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | | Merge pull request #172 from bbodenmiller/patch-1 | Dmitriy Zaporozhets | 2014-09-26 | 1 | -0/+1 | |
|\ \ \ \ | |/ / / |/| | | | add note about other HTTPS setup details | |||||
| * | | | add note about other HTTPS setup details | Ben Bodenmiller | 2014-08-23 | 1 | -0/+1 | |
| | | | | ||||||
* | | | | Fix tests | Dmitriy Zaporozhets | 2014-09-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | | Fix bug when changes to post-receive worker was not dumped properlyv2.0.1 | Dmitriy Zaporozhets | 2014-09-25 | 3 | -2/+5 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | | Version 2.0.0v2.0.0 | Marin Jankovski | 2014-09-17 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge branch 'master' of https://github.com/gitlabhq/gitlab-shell | Marin Jankovski | 2014-09-17 | 1 | -0/+3 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge pull request #178 from Razer6/hound_single_quote | Robert Schilling | 2014-09-17 | 1 | -0/+3 | |
| |\ \ \ \ | | | | | | | | | | | | | Let hound prefer single-quote strings | |||||
| | * | | | | Let hound prefer single-quote strings | Robert Schilling | 2014-09-16 | 1 | -0/+3 | |
| |/ / / / | ||||||
* | | | | | Merge branch 'symlink_hooks_directory' into 'master' | Dmitriy Zaporozhets | 2014-09-16 | 2 | -4/+7 | |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | Symlink hooks directory See merge request !44 | |||||
| * | | | | Add '.old' when renaming existing hooks directory | Jacob Vosmaer | 2014-09-16 | 1 | -1/+1 | |
| | | | | |