summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge branch 'post-api' into 'master'Dmitriy Zaporozhets2014-09-032-5/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make gitlab-shell work with new /api/allowed method See merge request !39
| * | | | | | | GitLab /api/allowed endpoint requires POST requestDmitriy Zaporozhets2014-09-032-5/+27
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit made changes to GitLab shell to work with huge pushed (ex. 1k branhes) using POST request to API Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'hooks-refactoring' into 'master'Dmitriy Zaporozhets2014-09-0222-147/+191
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hooks refactoring * replace update hook with pre-receive & post-receive hooks * use pre-receive hook for authorisation * use post-receive hook to create background job for GitLab worker Related to https://dev.gitlab.org/gitlab/gitlabhq/issues/1516 See merge request !38
| * | | | | | | Update GitlabNet to match new logicDmitriy Zaporozhets2014-09-019-54/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Version 2.0.0.pre. Requires GitLab 7.3+Dmitriy Zaporozhets2014-09-012-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Remove update hook logicDmitriy Zaporozhets2014-09-015-98/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Add tests for GitlabPostReceiveDmitriy Zaporozhets2014-09-012-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | GitlabAccess and GitlabPostReceive classes addedDmitriy Zaporozhets2014-09-014-3/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab Access handles security check. GitlabPostReceive creates a sidekiq job Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Add new pre-receive and post-receive hooksDmitriy Zaporozhets2014-09-012-0/+34
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlab-shellDmitriy Zaporozhets2014-08-291-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge pull request #164 from liammonahan/masterJeroen van Baarsen2014-08-151-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Match .log* instead of .log.* in .gitignore
| | * | | | | Match .log* instead of .log.* in .gitignoreLiam Monahan2014-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Something like gitlab-shell.log-20140626.gz will not be caught by the original pattern match since '.' is taken as a literal character.
* | | | | | | Merge branch 'wrong_number_of_arguments' into 'master'Dmitriy Zaporozhets2014-08-293-3/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle invalid number of arguments See merge request !37
| * | | | | | | Use a different style of one-line classesJacob Vosmaer2014-08-271-1/+1
| | | | | | | |
| * | | | | | | Handle invalid number of argumentsJacob Vosmaer2014-08-273-3/+17
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a remote user with a valid SSH key runs something like 'ssh git@gitlab.example.com foobar', gitlab-shell would raise an exception in the GitlabShell#escape_path method. With this change, we catch an invalid number of arguments as soon as possible and exit.
* | | | | | | Merge branch 'update-changelog' into 'master'Jacob Vosmaer2014-08-271-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update changelog in light of !35 See merge request !36
| * | | | | | | update changelogJob van der Voort2014-08-271-0/+3
|/ / / / / / /
* | | | | | | Merge branch 'abort-check-path' into 'master'Jacob Vosmaer2014-08-272-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Abort check path Fixes #13 See merge request !35
| * | | | | | use abort isntead of raise when checking pathJob van der Voort2014-08-272-2/+2
|/ / / / / /
* | | | | | Version 1.9.7v1.9.7Dmitriy Zaporozhets2014-08-132-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlab-shellDmitriy Zaporozhets2014-08-131-29/+23
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #169 from cirosantilli/md-styleJeroen van Baarsen2014-08-111-29/+23
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Update README Markdown style to match CONTRIBUTING
| | * | | | | Update README Markdown style to match CONTRIBUTINGCiro Santilli2014-08-111-29/+23
| |/ / / / /
* | | | | | Merge branch 'fix-repo-path' into 'master'Dmitriy Zaporozhets2014-08-135-12/+65
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Fix repository name/path extraction for GitlabUpdate See merge request !34
| * | | | | Fix invalid repo_name/repo_path parsing by GitlabUpdateDmitriy Zaporozhets2014-08-135-12/+65
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge pull request #162 from asedge/annotated_tagsDmitriy Zaporozhets2014-07-153-9/+37
|\ \ \ \ \ | |_|/ / / |/| | | | Adding support+tests for annotated tags.
| * | | | Need to set config for user.name and user.email before creating the ↵Sean Edge2014-07-121-2/+2
| | | | | | | | | | | | | | | | | | | | annotated tag.
| * | | | Hopefully fixing broken CI build by setting user.name and user.email on the ↵Sean Edge2014-07-111-0/+3
| | | | | | | | | | | | | | | | | | | | temporary repo.
| * | | | Adding support+tests for annotated tags.Sean Edge2014-07-093-9/+34
|/ / / /
* | | | Update CHANGELOGDmitriy Zaporozhets2014-07-051-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Fix testsDmitriy Zaporozhets2014-07-041-2/+2
| | | |
* | | | Merge pull request #159 from Aigeruth/improvement/simplecovDmitriy Zaporozhets2014-07-041-0/+3
|\ \ \ \ | | | | | | | | | | Use simplecov for development.
| * | | | Use simplecov for development.Gabor Nagy2014-06-241-0/+3
| | | | |
* | | | | Merge pull request #155 from ssandler/masterDmitriy Zaporozhets2014-07-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | GitlabUpdate: use stripped path for repo_name
| * | | | | GitlabUpdate: use stripped path for repo_nameScott Sandler2014-06-161-1/+1
| |/ / / /
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlab-shellDmitriy Zaporozhets2014-07-048-16/+265
|\ \ \ \ \
| * \ \ \ \ Merge pull request #158 from Aigeruth/improvement/coverageDmitriy Zaporozhets2014-07-048-16/+265
| |\ \ \ \ \ | | |/ / / / | |/| | | | Improve coverage.
| | * | | | Improve coverage.Gabor Nagy2014-06-238-16/+265
| |/ / / /
* | | | | Merge branch 'working_gitlab_url' into 'master'Dmitriy Zaporozhets2014-07-041-1/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a default for gitlab_url that usually works This default lets gitlab-shell connect to Unicorn directly, instead of going through Nginx. This has the following benefits: - the majority of users no longer has to edit the `gitlab_url`; - avoid issues when the external GitLab web address does not resolve on the GitLab server itself; - avoid SSL certificate issues. See merge request !32
| * | | | Mention Unicorn on a domain socket as an exceptionJacob Vosmaer2014-06-201-1/+2
| | | | |
| * | | | Use a default for gitlab_url that usually worksJacob Vosmaer2014-06-201-1/+4
|/ / / /
* | | | Bump versionv1.9.6Dmitriy Zaporozhets2014-06-101-1/+1
| | | |
* | | | Merge branch 'require_timeout' into 'master'Dmitriy Zaporozhets2014-06-102-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | Expliclity require 'timeout' from the stdlib
| * | | | Expliclity require 'timeout' from the stdlibJacob Vosmaer2014-06-102-0/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | This avoids getting the following error on some platforms: NameError: uninitialized constant GitlabKeys::Timeout
* | | | Version 1.9.5v1.9.5Dmitriy Zaporozhets2014-05-311-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'add-key-lock' into 'master'Dmitriy Zaporozhets2014-05-313-3/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Use lock file when add new entries to authorized_keys Fixes #21
| * | | | Create keys fixtures in testDmitriy Zaporozhets2014-05-311-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Use authorized_keys lock when add new key to fileDmitriy Zaporozhets2014-05-312-3/+6
|/ / / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'lock_file_location' into 'master'Dmitriy Zaporozhets2014-05-313-2/+16
|\ \ \ \ | | | | | | | | | | | | | | | Lock file location
| * | | | Put authorized_keys.lock in the .ssh directoryJacob Vosmaer2014-05-303-2/+16
|/ / / /
View Lorry Controller Status