summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Symlink the whole hooks directoryJacob Vosmaer2014-09-162-4/+7
|/ / / /
* | | | Merge branch 'redis-sockets' into 'master'Dmitriy Zaporozhets2014-09-163-21/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Connect to Redis via sockets by default See merge request !41
| * | | | Improve gitlab config testsDmitriy Zaporozhets2014-09-161-5/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Improve config specs so they dont rely on config.ymlDmitriy Zaporozhets2014-09-161-13/+20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Connect to Redis via sockets by defaultJacob Vosmaer2014-09-162-3/+4
|/ / / /
* | | | Merge branch 'defaults' into 'master'Dmitriy Zaporozhets2014-09-122-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Redis defaults See merge request !42
| * | | | Git remote remove only available in git > 1.7.12Dmitriy Zaporozhets2014-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Make sure user got redis defaults if not setDmitriy Zaporozhets2014-09-121-0/+2
|/ / / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge pull request #174 from UniIsland/redis-custom-databaseDmitriy Zaporozhets2014-09-123-3/+6
|\ \ \ \ | | | | | | | | | | support using custom redis database, fixes #173
| * | | | support using custom redis database, fixes #173Tao2014-09-133-3/+6
|/ / / /
* | | | Merge pull request #91 from raphendyr/patch-1Dmitriy Zaporozhets2014-09-111-2/+6
|\ \ \ \ | | | | | | | | | | Replace build in home folder with environment
| * | | | Replace build in home folder with environmentJaakko Kantojärvi2013-09-131-2/+6
| | |_|/ | |/| | | | | | | | | | | | | | You can't ever assume that user's home is /home/$USERNAME or /home/git Preferable is to assume that user running gitlab-shell has repositories in his home (get from the environment).
* | | | Merge pull request #161 from Aigeruth/fix/gitlab_config_specDmitriy Zaporozhets2014-09-111-2/+4
|\ \ \ \ | | | | | | | | | | Fix spec for GitlabConfig.gitlab_url.
| * | | | Fix spec for GitlabConfig.gitlab_url.Gabor Nagy2014-07-061-2/+4
| | | | |
* | | | | Merge pull request #175 from yglukhov/security-issueDmitriy Zaporozhets2014-09-111-2/+20
|\ \ \ \ \ | | | | | | | | | | | | Security issue: imported URLs are stored along with password.
| * | | | | Security issue: imported URLs are stored along with password.uran2014-08-281-2/+20
| | | | | |
* | | | | | Merge pull request #141 from attiks/support-redis-passwordDmitriy Zaporozhets2014-09-112-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | added support for redis password
| * | | | | | added support for redis passwordPeter2014-03-212-1/+6
| | | | | | |
* | | | | | | Delete .travis.ymlDmitriy Zaporozhets2014-09-091-13/+0
| | | | | | |
* | | | | | | Replace travis with semaphoreappDmitriy Zaporozhets2014-09-091-1/+1
| | | | | | |
* | | | | | | Merge branch 'rescue_enoent' into 'master'Dmitriy Zaporozhets2014-09-092-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore missing repositories in create-hooks When bin/create-hooks is run against a live GitLab server, there is a possibility of race conditions when a user deletes one of their repositories after bin/create-hooks found it. With this change, bin/create-hooks will ignore missing file errors. See merge request !40
| * | | | | | | Ignore missing repositories in create-hooksJacob Vosmaer2014-09-092-1/+6
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When bin/create-hooks is run against a live GitLab server, there is a possibility of race conditions when a user deletes one of their repositories after bin/create-hooks found it. With this change, bin/create-hooks will ignore missing file errors.
* | | | | | | Rebuild vcr cassettesDmitriy Zaporozhets2014-09-037-45/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | 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.